summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2015-04-03 20:52:12 +0900
committerJiyoung Yun <jy910.yun@samsung.com>2015-04-07 19:33:49 +0900
commit1755bafdcddb7514b87a1ca49ce23abe95f5b6eb (patch)
treeed529d8dabe182c9c0caf345b86ee30cb9401a93
parent1e42bfe9023291ebc29829ec6a8ee432506fd276 (diff)
downloaddeviced-1755bafdcddb7514b87a1ca49ce23abe95f5b6eb.tar.gz
deviced-1755bafdcddb7514b87a1ca49ce23abe95f5b6eb.tar.bz2
deviced-1755bafdcddb7514b87a1ca49ce23abe95f5b6eb.zip
deviced: Remove unused vconf key and logics
Removed vconf key list: VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED VCONFKEY_STARTER_SEQUENCE VCONFKEY_SETAPPL_PWRSV_CUSTMODE_CPU VCONFKEY_LCD_BRIGHTNESS_INIT VCONFKEY_INTERNAL_PRIVATE_MMC_ID VCONFKEY_DEVICED_BOOT_POWER_ON_STATUS VCONFKEY_SETAPPL_ACCESSIBILITY_TTS Change-Id: Ia256ac802c65ca6c0725f1bbe690beca6802ffaf Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
-rwxr-xr-xpackaging/deviced.spec12
-rw-r--r--src/battery/lowbat-handler.c22
-rw-r--r--src/cpu/cpu-handler.c552
-rw-r--r--src/display/core.c36
-rw-r--r--src/display/display-dbus.c7
-rw-r--r--src/display/setting.c11
-rw-r--r--src/display/setting.h2
-rw-r--r--src/mmc/ext4.c11
-rw-r--r--src/mmc/mmc-handler.c19
-rw-r--r--src/shared/dbus.h1
-rwxr-xr-xsrc/storage/storage.c5
11 files changed, 6 insertions, 672 deletions
diff --git a/packaging/deviced.spec b/packaging/deviced.spec
index cfa986ac..aa02ccb2 100755
--- a/packaging/deviced.spec
+++ b/packaging/deviced.spec
@@ -234,35 +234,23 @@ users_gid=$(getent group %{TZ_SYS_USER_GROUP} | cut -f3 -d':')
vconftool set -t int memory/sysman/usbhost_status -1 -i
vconftool set -t int memory/sysman/mmc -1 -i
vconftool set -t int memory/sysman/earjack_key 0 -i
-vconftool set -t int memory/sysman/added_usb_storage 0 -i
-vconftool set -t int memory/sysman/removed_usb_storage 0 -i
vconftool set -t int memory/sysman/charger_status -1 -i
vconftool set -t int memory/sysman/charge_now -1 -i
vconftool set -t int memory/sysman/battery_status_low -1 -i
vconftool set -t int memory/sysman/battery_capacity -1 -i
vconftool set -t int memory/sysman/usb_status -1 -i
vconftool set -t int memory/sysman/earjack -1 -i
-vconftool set -t int memory/sysman/low_memory 1 -i
-vconftool set -t int memory/sysman/sliding_keyboard -1 -i
vconftool set -t int memory/sysman/mmc_mount -1 -i
-vconftool set -t int memory/sysman/mmc_unmount -1 -i
vconftool set -t int memory/sysman/mmc_format -1 -i
vconftool set -t int memory/sysman/mmc_format_progress 0 -i
-vconftool set -t int memory/sysman/mmc_err_status 0 -i
vconftool set -t int memory/sysman/power_off 0 -g "$users_gid" -i -f
vconftool set -t int memory/sysman/battery_level_status -1 -i
-vconftool set -t string memory/private/sysman/added_storage_uevent "" -i
-vconftool set -t string memory/private/sysman/removed_storage_uevent "" -g "$users_gid" -i
vconftool set -t int memory/sysman/hdmi 0 -i
vconftool set -t int memory/sysman/stime_changed 0 -i
-#db type vconf key init
-vconftool set -t int db/sysman/mmc_dev_changed 0
-
vconftool set -t int memory/pm/state 0 -i -g "$users_gid"
vconftool set -t int memory/pm/battery_timetofull -1 -i
vconftool set -t int memory/pm/battery_timetoempty -1 -i
-vconftool set -t int memory/pm/sip_status 0 -i -g "$users_gid"
vconftool set -t int memory/pm/custom_brightness_status 0 -i -g "$users_gid"
vconftool set -t bool memory/pm/brt_changed_lpm 0 -i
vconftool set -t int memory/pm/current_brt 60 -i -g "$users_gid"
diff --git a/src/battery/lowbat-handler.c b/src/battery/lowbat-handler.c
index ede215d9..cd7df779 100644
--- a/src/battery/lowbat-handler.c
+++ b/src/battery/lowbat-handler.c
@@ -173,7 +173,7 @@ out:
static int lowbat_popup(char *option)
{
- int ret, state=0;
+ int ret;
int r_disturb, s_disturb, r_block, s_block;
int lowbat_popup_option = -1;
char *value;
@@ -205,8 +205,7 @@ static int lowbat_popup(char *option)
return -1;
_D("%s", value);
- ret = vconf_get_int(VCONFKEY_STARTER_SEQUENCE, &state);
- if (state == 1 || ret != 0 || booting_done(NULL)) {
+ if (booting_done(NULL)) {
r_disturb = vconf_get_int("memory/shealth/sleep/do_not_disturb", &s_disturb);
r_block = vconf_get_bool("db/setting/blockmode_wearable", &s_block);
if ((r_disturb != 0 && r_block != 0) ||
@@ -470,23 +469,6 @@ void lowbat_monitor(void *data)
lowbat_process(bat_percent, NULL);
}
-static int check_power_save_mode(void)
-{
- int ret = 0;
- int power_saving_cpu_stat = -1;
-
- ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_CPU,
- &power_saving_cpu_stat);
- if (ret < 0) {
- _E("failed to get vconf key");
- return ret;
- }
-
- if (power_saving_cpu_stat == 1)
- ret = 1;
- return ret;
-}
-
static int lowbat_monitor_init(void *data)
{
int status = 1;
diff --git a/src/cpu/cpu-handler.c b/src/cpu/cpu-handler.c
deleted file mode 100644
index 87243394..00000000
--- a/src/cpu/cpu-handler.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/*
- * deviced
- *
- * Copyright (c) 2012 - 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include <fcntl.h>
-#include <device-node.h>
-#include <vconf.h>
-
-#include "core/list.h"
-#include "core/log.h"
-#include "core/devices.h"
-#include "core/edbus-handler.h"
-#include "core/common.h"
-#include "core/device-notifier.h"
-#include "proc/proc-handler.h"
-
-#define SET_MAX_FREQ "set_max_frequency"
-#define SET_MIN_FREQ "set_min_frequency"
-#define SET_FREQ_LEN 17
-
-#define RELEASE_MAX_FREQ "release_max_frequency"
-#define RELEASE_MIN_FREQ "release_min_frequency"
-#define RELEASE_FREQ_LEN 21
-
-#define POWER_SAVING_CPU_FREQ_RATE (0.7)
-
-#define DEFAULT_MAX_CPU_FREQ 1200000
-#define DEFAULT_MIN_CPU_FREQ 100000
-
-enum emergency_type {
- EMERGENCY_UNLOCK = 0,
- EMERGENCY_LOCK = 1,
-};
-
-static int max_cpu_freq_limit = -1;
-static int min_cpu_freq_limit = -1;
-static int cur_max_cpu_freq = INT_MAX;
-static int cur_min_cpu_freq = INT_MIN;
-static int power_saving_freq = -1;
-
-static dd_list *max_cpu_freq_list;
-static dd_list *min_cpu_freq_list;
-
-static int cpu_number_limit = -1;
-static int cur_cpu_number = INT_MAX;
-static dd_list *cpu_number_list;
-
-struct cpu_freq_entry {
- int pid;
- int freq;
-};
-
-struct cpu_number_entry {
- int pid;
- int number;
-};
-
-static int is_entry_enable(int pid)
-{
- char pid_path[PATH_MAX];
-
- snprintf(pid_path, PATH_MAX, "/proc/%d", pid);
- if (access(pid_path, F_OK) < 0) {
- return 0;
- }
-
- return 1;
-}
-
-static int write_min_cpu_freq(int freq)
-{
- int ret;
-
- ret = device_set_property(DEVICE_TYPE_CPU, PROP_CPU_SCALING_MIN_FREQ, freq);
- if (ret < 0) {
- _E("set cpufreq min freq write error: %s", strerror(errno));
- return ret;
- }
-
- return 0;
-}
-
-static int write_max_cpu_freq(int freq)
-{
- int ret;
-
- ret = device_set_property(DEVICE_TYPE_CPU, PROP_CPU_SCALING_MAX_FREQ, freq);
- if (ret < 0) {
- _E("set cpufreq max freq write error: %s", strerror(errno));
- return ret;
- }
-
- return 0;
-}
-
-static int remove_entry_from_min_cpu_freq_list(int pid)
-{
- dd_list *tmp;
- struct cpu_freq_entry *entry;
-
- cur_min_cpu_freq = INT_MIN;
-
- DD_LIST_FOREACH(min_cpu_freq_list, tmp, entry) {
- if ((!is_entry_enable(entry->pid)) || (entry->pid == pid)) {
- DD_LIST_REMOVE(min_cpu_freq_list, entry);
- free(entry);
- continue;
- }
- if (entry->freq > cur_min_cpu_freq) {
- cur_min_cpu_freq = entry->freq;
- }
- }
-
- return 0;
-}
-
-static int remove_entry_from_max_cpu_freq_list(int pid)
-{
- dd_list *tmp;
- struct cpu_freq_entry *entry;
-
- cur_max_cpu_freq = INT_MAX;
-
- DD_LIST_FOREACH(max_cpu_freq_list, tmp, entry) {
- if ((!is_entry_enable(entry->pid)) || (entry->pid == pid)) {
- DD_LIST_REMOVE(max_cpu_freq_list, entry);
- free(entry);
- continue;
- }
- if (entry->freq < cur_max_cpu_freq) {
- cur_max_cpu_freq = entry->freq;
- }
- }
-
- return 0;
-}
-
-int release_max_frequency_action(int argc, char **argv)
-{
- int r;
-
- if (argc < 1)
- return -EINVAL;
-
- r = remove_entry_from_max_cpu_freq_list(atoi(argv[0]));
- if (r < 0) {
- _E("Remove entry failed");
- return r;
- }
-
- if (cur_max_cpu_freq == INT_MAX)
- cur_max_cpu_freq = max_cpu_freq_limit;
-
- r = write_max_cpu_freq(cur_max_cpu_freq);
- if (r < 0) {
- _E("Write freq failed");
- return r;
- }
-
- return 0;
-}
-
-int release_min_frequency_action(int argc, char **argv)
-{
- int r;
-
- if (argc < 1)
- return -EINVAL;
-
- r = remove_entry_from_min_cpu_freq_list(atoi(argv[0]));
- if (r < 0) {
- _E("Remove entry failed");
- return r;
- }
-
- if (cur_min_cpu_freq == INT_MIN)
- cur_min_cpu_freq = min_cpu_freq_limit;
-
- r = write_min_cpu_freq(cur_min_cpu_freq);
- if (r < 0) {
- _E("Write entry failed");
- return r;
- }
-
- return 0;
-}
-
-static int add_entry_to_max_cpu_freq_list(int pid, int freq)
-{
- int r;
- struct cpu_freq_entry *entry;
-
- r = remove_entry_from_max_cpu_freq_list(pid);
- if (r < 0) {
- _E("Remove duplicated entry failed");
- }
-
- entry = malloc(sizeof(struct cpu_freq_entry));
- if (!entry) {
- _E("Malloc failed");
- return -ENOMEM;
- }
-
- entry->pid = pid;
- entry->freq = freq;
-
- DD_LIST_PREPEND(max_cpu_freq_list, entry);
- if (!max_cpu_freq_list) {
- _E("eina_list_prepend failed");
- return -ENOSPC;
- }
- if (freq < cur_max_cpu_freq) {
- cur_max_cpu_freq = freq;
- }
- return 0;
-}
-
-static int add_entry_to_min_cpu_freq_list(int pid, int freq)
-{
- int r;
- struct cpu_freq_entry *entry;
-
- r = remove_entry_from_min_cpu_freq_list(pid);
- if (r < 0) {
- _E("Remove duplicated entry failed");
- }
-
- entry = malloc(sizeof(struct cpu_freq_entry));
- if (!entry) {
- _E("Malloc failed");
- return -ENOMEM;
- }
-
- entry->pid = pid;
- entry->freq = freq;
-
- DD_LIST_PREPEND(min_cpu_freq_list, entry);
- if (!min_cpu_freq_list) {
- _E("eina_list_prepend failed");
- return -ENOSPC;
- }
- if (freq > cur_min_cpu_freq) {
- cur_min_cpu_freq = freq;
- }
- return 0;
-}
-
-int set_max_frequency_action(int argc, char **argv)
-{
- int r;
-
- if (argc < 2)
- return -EINVAL;
-
- r = add_entry_to_max_cpu_freq_list(atoi(argv[0]), atoi(argv[1]));
- if (r < 0) {
- _E("Add entry failed");
- return r;
- }
-
- r = write_max_cpu_freq(cur_max_cpu_freq);
- if (r < 0) {
- _E("Write entry failed");
- return r;
- }
-
- return 0;
-}
-
-int set_min_frequency_action(int argc, char **argv)
-{
- int r;
-
- if (argc < 2)
- return -EINVAL;
-
- r = add_entry_to_min_cpu_freq_list(atoi(argv[0]), atoi(argv[1]));
- if (r < 0) {
- _E("Add entry failed");
- return r;
- }
-
- r = write_min_cpu_freq(cur_min_cpu_freq);
- if (r < 0) {
- _E("Write entry failed");
- return r;
- }
-
- return 0;
-}
-
-static int power_saving_cpu_cb(keynode_t *key_nodes, void *data)
-{
- int ret = 0;
- int val = 0;
- int power_saving_cpu_stat = -1;
-
- power_saving_cpu_stat = vconf_keynode_get_bool(key_nodes);
- if (power_saving_cpu_stat == 1) {
- val = 1;
- ret = add_entry_to_max_cpu_freq_list(getpid(), power_saving_freq);
- if (ret < 0) {
- _E("Add entry failed");
- goto out;
- }
- } else {
- ret = remove_entry_from_max_cpu_freq_list(getpid());
- if (ret < 0) {
- _E("Remove entry failed");
- goto out;
- }
- if (cur_max_cpu_freq == INT_MAX)
- cur_max_cpu_freq = max_cpu_freq_limit;
- }
- ret = write_max_cpu_freq(cur_max_cpu_freq);
- if (ret < 0)
- _E("Write failed");
-out:
- device_notify(DEVICE_NOTIFIER_PMQOS_POWERSAVING, (void*)val);
- return ret;
-}
-
-static void set_emergency_limit(void)
-{
- int ret, val;
-
- ret = vconf_get_int(VCONFKEY_SETAPPL_PSMODE, &val);
- if (ret < 0) {
- _E("failed to get vconf key");
- return;
- }
- if (val == SETTING_PSMODE_EMERGENCY) {
- val = EMERGENCY_LOCK;
- device_notify(DEVICE_NOTIFIER_PMQOS_EMERGENCY, (void*)val);
- }
-}
-
-static int emergency_cpu_cb(keynode_t *key_nodes, void *data)
-{
- int val;
-
- val = vconf_keynode_get_int(key_nodes);
- if (val == SETTING_PSMODE_EMERGENCY)
- val = EMERGENCY_LOCK;
- else
- val = EMERGENCY_UNLOCK;
-
- device_notify(DEVICE_NOTIFIER_PMQOS_EMERGENCY, (void*)val);
- return 0;
-}
-
-static void set_freq_limit(void)
-{
- int ret = 0;
- int val = 0;
- int power_saving_stat = -1;
- int power_saving_cpu_stat = -1;
-
- ret = device_get_property(DEVICE_TYPE_CPU, PROP_CPU_CPUINFO_MAX_FREQ,
- &max_cpu_freq_limit);
- if (ret < 0) {
- _E("get cpufreq cpuinfo max readerror: %s", strerror(errno));
- max_cpu_freq_limit = DEFAULT_MAX_CPU_FREQ;
- }
-
- ret = device_get_property(DEVICE_TYPE_CPU, PROP_CPU_CPUINFO_MIN_FREQ,
- &min_cpu_freq_limit);
- if (ret < 0) {
- _E("get cpufreq cpuinfo min readerror: %s", strerror(errno));
- min_cpu_freq_limit = DEFAULT_MIN_CPU_FREQ;
- }
- power_saving_freq = (int)(max_cpu_freq_limit * POWER_SAVING_CPU_FREQ_RATE);
- _I("max(%d) , ps(%d), min(%d)",
- max_cpu_freq_limit,
- power_saving_freq,
- min_cpu_freq_limit);
-
- ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_CPU,
- &power_saving_cpu_stat);
- if (ret < 0) {
- _E("failed to get vconf key");
- return;
- }
- if (power_saving_cpu_stat != 1)
- return;
- val = 1;
- ret = add_entry_to_max_cpu_freq_list(getpid(), power_saving_freq);
- if (ret < 0) {
- _E("Add entry failed");
- goto out;
- }
- ret = write_max_cpu_freq(cur_max_cpu_freq);
- if (ret < 0)
- _E("Write entry failed");
-out:
- _I("init");
- device_notify(DEVICE_NOTIFIER_PMQOS_POWERSAVING, (void*)val);
-}
-
-static int remove_entry_from_cpu_number_list(int pid)
-{
- dd_list *tmp;
- struct cpu_number_entry *entry;
-
- cur_cpu_number = INT_MAX;
-
- DD_LIST_FOREACH(cpu_number_list, tmp, entry) {
- if ((!is_entry_enable(entry->pid)) || (entry->pid == pid)) {
- DD_LIST_REMOVE(cpu_number_list, entry);
- free(entry);
- continue;
- }
- if (entry->number < cur_cpu_number) {
- cur_cpu_number = entry->number;
- }
- }
-
- return 0;
-}
-
-static int add_entry_to_cpu_number_list(int pid, int number)
-{
- int r;
- struct cpu_number_entry *entry;
-
- r = remove_entry_from_cpu_number_list(pid);
- if (r < 0) {
- _E("Remove duplicated entry failed");
- }
-
-
-
- entry = malloc(sizeof(struct cpu_number_entry));
- if (!entry) {
- _E("Malloc failed");
- return -ENOMEM;
- }
-
- entry->pid = pid;
- entry->number = number;
-
- DD_LIST_PREPEND(cpu_number_list, entry);
- if (!cpu_number_list) {
- _E("eina_list_prepend failed");
- return -ENOSPC;
- }
- if (number < cur_cpu_number) {
- cur_cpu_number = number;
- }
- return 0;
-}
-
-static int booting_done(void *data)
-{
- set_freq_limit();
- set_emergency_limit();
- return 0;
-}
-
-static DBusMessage *dbus_cpu_handler(E_DBus_Object *obj, DBusMessage *msg)
-{
- DBusError err;
- DBusMessageIter iter;
- DBusMessage *reply;
- pid_t pid;
- int ret;
- int argc;
- char *type_str;
- char *argv[2];
-
- dbus_error_init(&err);
-
- if (!dbus_message_get_args(msg, &err,
- DBUS_TYPE_STRING, &type_str,
- DBUS_TYPE_INT32, &argc,
- DBUS_TYPE_STRING, &argv[0],
- DBUS_TYPE_STRING, &argv[1], DBUS_TYPE_INVALID)) {
- _E("there is no message");
- ret = -EINVAL;
- goto out;
- }
-
- if (argc < 0) {
- _E("message is invalid!");
- ret = -EINVAL;
- goto out;
- }
-
- pid = get_edbus_sender_pid(msg);
- if (kill(pid, 0) == -1) {
- _E("%d process does not exist, dbus ignored!", pid);
- ret = -ESRCH;
- goto out;
- }
-
- if (!strncmp(type_str, SET_MAX_FREQ, SET_FREQ_LEN))
- ret = set_max_frequency_action(argc, (char **)&argv);
- else if (!strncmp(type_str, SET_MIN_FREQ, SET_FREQ_LEN))
- ret = set_min_frequency_action(argc, (char **)&argv);
- else if (!strncmp(type_str, RELEASE_MAX_FREQ, RELEASE_FREQ_LEN))
- ret = release_max_frequency_action(argc, (char **)&argv);
- else if (!strncmp(type_str, RELEASE_MIN_FREQ, RELEASE_FREQ_LEN))
- ret = release_min_frequency_action(argc, (char **)&argv);
-out:
- reply = dbus_message_new_method_return(msg);
- dbus_message_iter_init_append(reply, &iter);
- dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &ret);
-
- return reply;
-}
-
-static const struct edbus_method edbus_methods[] = {
- { SET_MAX_FREQ, "siss", "i", dbus_cpu_handler },
- { SET_MIN_FREQ, "siss", "i", dbus_cpu_handler },
- { RELEASE_MAX_FREQ, "siss", "i", dbus_cpu_handler },
- { RELEASE_MIN_FREQ, "siss", "i", dbus_cpu_handler },
-};
-
-static void cpu_init(void *data)
-{
- int ret;
-
- register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
- ret = register_edbus_method(DEVICED_PATH_SYSNOTI, edbus_methods, ARRAY_SIZE(edbus_methods));
- if (ret < 0)
- _E("fail to init edbus method(%d)", ret);
-
- vconf_notify_key_changed(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_CPU, (void *)power_saving_cpu_cb, NULL);
- vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE, (void *)emergency_cpu_cb, NULL);
-}
-
-static const struct device_ops cpu_device_ops = {
- .name = "cpu",
- .init = cpu_init,
-};
-
-DEVICE_OPS_REGISTER(&cpu_device_ops)
diff --git a/src/display/core.c b/src/display/core.c
index 61e9cb28..610a56bf 100644
--- a/src/display/core.c
+++ b/src/display/core.c
@@ -95,7 +95,6 @@ static int (*basic_action) (int);
static bool hallic_open = true;
static Ecore_Timer *lock_timeout_id;
static int lock_screen_timeout = LOCK_SCREEN_INPUT_TIMEOUT;
-static int tts_state = false;
static struct timeval lcdon_tv;
static int lcd_paneloff_mode = false;
static int stay_touchscreen_off = false;
@@ -262,17 +261,6 @@ void broadcast_lcd_off(void)
SIGNAL_LCD_OFF, NULL, NULL);
}
-void tts_lcd_off(void)
-{
- int ret;
-
- ret = dbus_method_sync(POPUP_BUS_NAME, POPUP_PATH_SERVANT,
- POPUP_IFACE_SERVANT, POPUP_METHOD_SCREENOFF_TTS, NULL, NULL);
-
- if (ret < 0)
- _E("Failed to tts(%d)", ret);
-}
-
static unsigned long get_lcd_on_flags(void)
{
unsigned long flags = NORMAL_MODE;
@@ -334,9 +322,6 @@ inline void lcd_off_procedure(void)
EINA_LIST_REVERSE_FOREACH(lcdon_ops, l, ops)
ops->stop(flags);
-
- if (tts_state)
- tts_lcd_off();
}
void set_stay_touchscreen_off(int val)
@@ -1943,27 +1928,12 @@ static int update_setting(int key_idx, int val)
break;
}
break;
- case SETTING_BOOT_POWER_ON_STATUS:
- /*
- * Unlock lcd off after booting is done.
- * deviced guarantees all booting script is executing.
- * Last script of booting unlocks this suspend blocking state.
- */
- if (val == VCONFKEY_DEVICED_BOOT_POWER_ON_DONE) {
- _I("booting done");
- pm_unlock_internal(INTERNAL_LOCK_BOOTING, LCD_OFF, PM_SLEEP_MARGIN);
- }
- break;
case SETTING_POWER_CUSTOM_BRIGHTNESS:
if (val == VCONFKEY_PM_CUSTOM_BRIGHTNESS_ON)
backlight_ops.set_custom_status(true);
else
backlight_ops.set_custom_status(false);
break;
- case SETTING_ACCESSIBILITY_TTS:
- tts_state = val;
- _I("TTS is %s", (val ? "ON" : "OFF"));
- break;
default:
return -1;
@@ -2015,12 +1985,6 @@ static void check_seed_status(void)
" for lock screen", lock_screen_timeout);
}
- /* TTS state */
- ret = vconf_get_bool(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &tts_state);
- if (ret < 0)
- _E("Failed to get TTS setting! (%d)", ret);
- _I("TTS is %s", (tts_state ? "ON" : "OFF"));
-
return;
}
diff --git a/src/display/display-dbus.c b/src/display/display-dbus.c
index fedddda3..7f6c442f 100644
--- a/src/display/display-dbus.c
+++ b/src/display/display-dbus.c
@@ -41,8 +41,6 @@
#define SIGNAL_SIM_STATUS "Status"
#define SIM_CARD_NOT_PRESENT (0x01)
-#define VCONFKEY_LCD_BRIGHTNESS_INIT "db/private/deviced/lcd_brightness_init"
-
#define SIGNAL_HOMESCREEN "HomeScreen"
#define SIGNAL_EXTREME "Extreme"
#define SIGNAL_NOTEXTREME "NotExtreme"
@@ -998,10 +996,6 @@ static void sim_signal_handler(void *data, DBusMessage *msg)
return;
}
- ret = vconf_get_bool(VCONFKEY_LCD_BRIGHTNESS_INIT, &state);
- if (ret < 0 || state)
- return;
-
dbus_error_init(&err);
ret = dbus_message_get_args(msg, &err, DBUS_TYPE_INT32, &val,
@@ -1014,7 +1008,6 @@ static void sim_signal_handler(void *data, DBusMessage *msg)
if (val != SIM_CARD_NOT_PRESENT) {
/* change setting : autobrightness on */
state = true;
- vconf_set_bool(VCONFKEY_LCD_BRIGHTNESS_INIT, state);
vconf_set_int(VCONFKEY_SETAPPL_BRIGHTNESS_AUTOMATIC_INT,
SETTING_BRIGHTNESS_AUTOMATIC_ON);
vconf_set_int(VCONFKEY_SETAPPL_LCD_BRIGHTNESS,
diff --git a/src/display/setting.c b/src/display/setting.c
index 74b43a06..4fc32b82 100644
--- a/src/display/setting.c
+++ b/src/display/setting.c
@@ -34,9 +34,7 @@ static const char *setting_keys[SETTING_GET_END] = {
[SETTING_TO_NORMAL] = VCONFKEY_SETAPPL_LCD_TIMEOUT_NORMAL,
[SETTING_BRT_LEVEL] = VCONFKEY_SETAPPL_LCD_BRIGHTNESS,
[SETTING_LOCK_SCREEN] = VCONFKEY_IDLE_LOCK_STATE,
- [SETTING_BOOT_POWER_ON_STATUS] = VCONFKEY_DEVICED_BOOT_POWER_ON_STATUS,
[SETTING_POWER_CUSTOM_BRIGHTNESS] = VCONFKEY_PM_CUSTOM_BRIGHTNESS_STATUS,
- [SETTING_ACCESSIBILITY_TTS] = VCONFKEY_SETAPPL_ACCESSIBILITY_TTS,
};
static int lock_screen_state = VCONFKEY_IDLE_UNLOCK;
@@ -212,14 +210,7 @@ static int setting_cb(keynode_t *key_nodes, void *data)
return -1;
}
if (update_pm_setting != NULL) {
- switch(index) {
- case SETTING_ACCESSIBILITY_TTS:
- update_pm_setting(index, vconf_keynode_get_bool(tmp));
- break;
- default:
- update_pm_setting(index, vconf_keynode_get_int(tmp));
- break;
- }
+ update_pm_setting(index, vconf_keynode_get_int(tmp));
}
return 0;
diff --git a/src/display/setting.h b/src/display/setting.h
index 8294f04b..dd0133dc 100644
--- a/src/display/setting.h
+++ b/src/display/setting.h
@@ -36,9 +36,7 @@ enum {
SETTING_TO_NORMAL = SETTING_BEGIN,
SETTING_BRT_LEVEL,
SETTING_LOCK_SCREEN,
- SETTING_BOOT_POWER_ON_STATUS,
SETTING_POWER_CUSTOM_BRIGHTNESS,
- SETTING_ACCESSIBILITY_TTS,
SETTING_GET_END,
SETTING_PM_STATE = SETTING_GET_END,
SETTING_LOW_BATT,
diff --git a/src/mmc/ext4.c b/src/mmc/ext4.c
index 1b3ccc12..c4430165 100644
--- a/src/mmc/ext4.c
+++ b/src/mmc/ext4.c
@@ -114,15 +114,10 @@ static int mmc_check_smack(const char *mount_point)
static int check_smack_popup(void)
{
int ret = -1;
- int val = -1;
- ret = vconf_get_int(VCONFKEY_STARTER_SEQUENCE, &val);
- if (val == 1 || ret != 0) {
-
- ret = manage_notification("MMC", "Check smack");
- if (ret == -1)
- return -1;
- }
+ ret = manage_notification("MMC", "Check smack");
+ if (ret == -1)
+ return -1;
return 0;
}
diff --git a/src/mmc/mmc-handler.c b/src/mmc/mmc-handler.c
index e7ca722f..b3a85d67 100644
--- a/src/mmc/mmc-handler.c
+++ b/src/mmc/mmc-handler.c
@@ -44,8 +44,6 @@
#include "core/list.h"
#include "core/config-parser.h"
-#define VCONFKEY_INTERNAL_PRIVATE_MMC_ID "db/private/sysman/mmc_device_id"
-
#define MMC_PARENT_PATH tzplatform_getenv(TZ_SYS_STORAGE)
#define MMC_DEV "/dev/mmcblk"
#define MMC_PATH "*/mmcblk[0-9]"
@@ -273,23 +271,6 @@ int get_block_number(void)
_E("%s read error: %s", buf,strerror(errno));
}
close(fd);
- pre_mmc_device_id = vconf_get_str(VCONFKEY_INTERNAL_PRIVATE_MMC_ID);
- if (pre_mmc_device_id) {
- if (strcmp(pre_mmc_device_id, "") == 0) {
- vconf_set_str(VCONFKEY_INTERNAL_PRIVATE_MMC_ID, buf);
- } else if (strncmp(pre_mmc_device_id,buf,33) == 0) {
- if ( vconf_get_int(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED,&mmc_dev_changed) == 0
- && mmc_dev_changed != VCONFKEY_SYSMAN_MMC_NOT_CHANGED) {
- vconf_set_int(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED, VCONFKEY_SYSMAN_MMC_NOT_CHANGED);
- }
- } else if (strncmp(pre_mmc_device_id,buf,32) != 0) {
- vconf_set_str(VCONFKEY_INTERNAL_PRIVATE_MMC_ID, buf);
- vconf_set_int(VCONFKEY_SYSMAN_MMC_DEVICE_CHANGED, VCONFKEY_SYSMAN_MMC_CHANGED);
- }
- free(pre_mmc_device_id);
- } else {
- _E("failed to get pre_mmc_device_id");
- }
return mmcblk_num;
}
}
diff --git a/src/shared/dbus.h b/src/shared/dbus.h
index 2976cb36..6d9c762c 100644
--- a/src/shared/dbus.h
+++ b/src/shared/dbus.h
@@ -188,7 +188,6 @@
#define POPUP_METHOD_LAUNCH "PopupLaunch"
#define POPUP_METHOD_TERMINATE "AppTerminateByPid"
#define POPUP_KEY_CONTENT "_SYSPOPUP_CONTENT_"
-#define POPUP_METHOD_SCREENOFF_TTS "ScreenOffTts"
/*
* Crash daemon
diff --git a/src/storage/storage.c b/src/storage/storage.c
index 87060be1..2d772e73 100755
--- a/src/storage/storage.c
+++ b/src/storage/storage.c
@@ -125,7 +125,6 @@ static void memnoti_level_broadcast(enum memnoti_level level)
static int memnoti_popup(enum memnoti_level level)
{
int ret = -1;
- int val = -1;
char *value = NULL;
if (level != MEMNOTI_LEVEL_WARNING && level != MEMNOTI_LEVEL_CRITICAL) {
@@ -139,10 +138,6 @@ static int memnoti_popup(enum memnoti_level level)
value = "Critical";
}
- ret = vconf_get_int(VCONFKEY_STARTER_SEQUENCE, &val);
- if (val == 0 || ret != 0)
- return 0;
-
ret = manage_notification("Low memory", value);
if (ret == -1)
return -1;