Fix setting framework

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

diff --git a/src/system-server/setting/FSys_SettingInfo.cpp b/src/system-server/setting/FSys_SettingInfo.cpp
index 39f8633..70b2e15 100644 (file)
--- a/src/system-server/setting/FSys_SettingInfo.cpp
+++ b/src/system-server/setting/FSys_SettingInfo.cpp
@@ -216,7 +216,7 @@ result
 _SettingInfo::GetValue(const String& key, String& value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->GetValue(key, value);
 }
 
@@ -224,7 +224,7 @@ result
 _SettingInfo::GetValue(const String& key, int& value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->GetValue(key, value);
 }
 
@@ -232,21 +232,23 @@ result
 _SettingInfo::GetValue(const String& key, bool& value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->GetValue(key, value);
 }
 
 bool
 _SettingInfo::HasKey(const String& key)
-{
-       return false;
+{      
+       _ISettingProvider* provider = GetProvider(key);
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
+       return provider->HasKey(key);
 }
 
 result
 _SettingInfo::SetValue(const String& key, bool value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValue(key, value);
 }
 
@@ -254,7 +256,7 @@ result
 _SettingInfo::SetValue(const String& key, int value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValue(key, value);
 }
 
@@ -262,7 +264,7 @@ result
 _SettingInfo::SetValue(const String& key, String value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValue(key, value);
 }
 
@@ -306,7 +308,7 @@ result
 _SettingInfo::GetValueForPrivilegedKey(const String& key, bool& value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->GetValueForPrivilegedKey(key, value);
 }
 
@@ -314,7 +316,7 @@ result
 _SettingInfo::SetValueForPrivilegedKey(const String& key, bool value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValueForPrivilegedKey(key, value);
 }
 
@@ -322,7 +324,7 @@ result
 _SettingInfo::SetValueAsyncForPrivilegedKey(const String& key, bool value, ISettingInfoSetValueAsyncResultListener* listener)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValueAsyncForPrivilegedKey(key, value, listener);
 }
 
@@ -330,7 +332,7 @@ result
 _SettingInfo::SetValueAsync(const String& key, bool value, ISettingInfoSetValueAsyncResultListener* listener)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValueAsync(key, value, listener);
 }
 
@@ -338,7 +340,7 @@ result
 _SettingInfo::SetValueForPrivilegedKey(const String& key, String value)
 {
        _ISettingProvider* provider = GetProvider(key);
-       SysTryReturnResult(NID_SYS, provider != null, E_SYSTEM, "It is failed to find provider.");
+       SysTryReturnResult(NID_SYS, provider != null, E_OBJ_NOT_FOUND, "It is failed to find provider.");
        return provider->SetValueForPrivilegedKey(key, value);
 }
 

diff --git a/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp b/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp
index 423a48b..9969e59 100755 (executable)
--- a/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp
+++ b/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp
@@ -915,6 +915,7 @@ _SettingNetworkProvider::SettingWifiActivateCallBack(wifi_error_e errorCode, voi
        SysTryReturnVoidResult(NID_SYS, (pSettingInfo != null && pProvider != null), E_SYSTEM, "There is no values of args.");
        SysTryCatch(NID_SYS, pProvider->__stateOfWifi == 1, E_SYSTEM, E_SYSTEM, "Wi-Fi processing is under way.");
 
+       SysLog(NID_SYS, "Wi-Fi result is called. %d", errorCode);
        if(errorCode != WIFI_ERROR_NONE)
        {
                switch(errorCode)
@@ -961,9 +962,14 @@ _SettingNetworkProvider::SettingWifiActivateCallBack(wifi_error_e errorCode, voi
                }
        }
 
-       if(pProvider->__pWifiDirectListener != null)
+       if(pProvider->__pWifiListener != null)
        {
-               pProvider->__pWifiDirectListener->OnResultReceivedForSetValueAsync(settingKey, E_SUCCESS);
+               SysLog(NID_SYS, "Wi-Fi result is forwarded.");
+               pProvider->__pWifiListener->OnResultReceivedForSetValueAsync(settingKey, E_SUCCESS);
+       }
+       else
+       {
+               SysLog(NID_SYS, "There is no listener.");
        }
 CATCH:
        pProvider->__stateOfWifi = 0;

diff --git a/src/system/FSys_SettingClientEx.cpp b/src/system/FSys_SettingClientEx.cpp
index b7877c6..eae8503 100644 (file)
--- a/src/system/FSys_SettingClientEx.cpp
+++ b/src/system/FSys_SettingClientEx.cpp
@@ -496,7 +496,7 @@ _SettingClientEx::SetOnService(String commandId, String key, String value)
 {
        result r = E_SUCCESS;
 
-       SysTryReturnResult(NID_SYS, commandId.GetLength() > 0 && key.GetLength() > 0 && value.GetLength() > 0, E_INVALID_ARG, "There are invalid parameters.");
+       SysTryReturnResult(NID_SYS, commandId.GetLength() > 0 && key.GetLength() > 0, E_INVALID_ARG, "There are invalid parameters.");
        String requestKey = ConvertKeyOspToTizen(key);
        String* pResult = null;
 
@@ -654,7 +654,7 @@ _SettingClientEx::SetValueForPrivilegedKey(const String& key, bool value)
 {
        String requestValue;
        requestValue = Boolean::ToString(value);
-       return SetOnService(SETTING_SERVICE_COMMAND_SET_BOOL, key, requestValue);
+       return SetOnService(SETTING_SERVICE_COMMAND_SET_PRIV_BOOL, key, requestValue);
 }
 
 result