Update system

Change-Id: I5cfff6c263abb2928716c44144c1e859f92c6b3b
Signed-off-by: Joohyun Kim <joohyune.kim@samsung.com>

diff --git a/src/system/FSys_PowerManagerImpl.cpp b/src/system/FSys_PowerManagerImpl.cpp
index 209d466..1aced1c 100644 (file)
--- a/src/system/FSys_PowerManagerImpl.cpp
+++ b/src/system/FSys_PowerManagerImpl.cpp
@@ -603,8 +603,9 @@ _PowerManagerImpl::TurnScreenOn(void)
 {
        result r = E_SUCCESS;
        int ret = power_wakeup(true);
-
        SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It failed to unlock the normal screen state");
+       ret = pm_change_state(LCD_NORMAL);
+       SysTryReturnResult(NID_SYS, ret == 0, E_SYSTEM, "It failed to change to the normal screen state");
 
        return r;
 }

diff --git a/src/system/FSys_SettingClient.cpp b/src/system/FSys_SettingClient.cpp
index 13d9412..bfefa64 100644 (file)
--- a/src/system/FSys_SettingClient.cpp
+++ b/src/system/FSys_SettingClient.cpp
@@ -121,6 +121,8 @@ static const wchar_t* _SILENT_MODE = L"SilentMode";
 static const wchar_t* _TOUCH_VIBRATION_LEVEL = L"TouchVibrationLevel";
 static const wchar_t* _VIBRATOR_LEVEL = L"http://tizen.org/setting/vibrator.level";
 
+static const wchar_t* _SETTING_COMMAND_FACTORY_RESET = L"osp.setting.command.factory.reset";
+
 //USB
 static const wchar_t* _USBMODE = L"UsbMode";
 static const wchar_t* _USBMODE_MTP = L"MTP";
@@ -921,7 +923,12 @@ _SettingClient::HasKey(const String& key)
 result
 _SettingClient::ResetToFactoryDefault(void)
 {
-       return E_SUCCESS;
+       String value;
+       String response;
+       value = "none";
+       result r = GetOnService(_SETTING_COMMAND_FACTORY_RESET, value, response);
+       SysLog(NID_SYS, "Reset result is %s[%ls].", GetErrorMessage(r), response.GetPointer());
+       return r;
 }
 
 //For OSP_COMPAT mode