Update _IpcServer APIs

Change-Id: I65b9cd4d48d18e4846703caba248126565b87817
Signed-off-by: Sunwook Bae <sunwook45.bae@samsung.com>

diff --git a/src/BluetoothConnectivityIpcStub.cpp b/src/BluetoothConnectivityIpcStub.cpp
index 114dad5..47743b0 100755 (executable)
--- a/src/BluetoothConnectivityIpcStub.cpp
+++ b/src/BluetoothConnectivityIpcStub.cpp
@@ -105,7 +105,7 @@ BluetoothConnectivityIpcStub::OnIpcClientDisconnected(const Tizen::Io::_IpcServe
 
        if (__pBtService != null)
        {
-               __pBtService->ProcessAppTermination(__pIpcServer->GetClientAppId());
+               __pBtService->ProcessAppTermination(__pIpcServer->GetClientPackageId());
        }
 }
 
@@ -124,7 +124,7 @@ BluetoothConnectivityIpcStub::OnGetBluetoothLocalDeviceName(Tizen::Base::String*
 {
 #if !defined (_OSP_EMUL_)
        SysSecureLog(NID_NET_BT, "Received the request of getting the local device name with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pBtService == null)
        {
@@ -144,7 +144,7 @@ void
 BluetoothConnectivityIpcStub::OnSetBluetoothLocalDeviceName(Tizen::Base::String localName, unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_BT, "Received the request of setting the local device name with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -167,7 +167,7 @@ void
 BluetoothConnectivityIpcStub::OnSetBluetoothDiscoverableMode(int mode, int seconds, unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_BT, "Received the request of setting the discoverable mode with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());

diff --git a/src/NetConnectivityIpcStub.cpp b/src/NetConnectivityIpcStub.cpp
index 4a4e03c..1b46be2 100644 (file)
--- a/src/NetConnectivityIpcStub.cpp
+++ b/src/NetConnectivityIpcStub.cpp
@@ -115,13 +115,13 @@ NetConnectivityIpcStub::OnIpcRequestReceived(Tizen::Io::_IpcServer& server, cons
 void
 NetConnectivityIpcStub::OnGetAppNetAccountId(const String& profileName, int* pNetAccountId, unsigned long* pResult)
 {
-    SysSecureLog(NID_NET, "Received the request of getting application specific account id with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysSecureLog(NID_NET, "Received the request of getting application specific account id with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
+    String pkgId = __pIpcServer->GetClientPackageId();
     int netAccountId = INVALID_HANDLE;
 
-     *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_CUSTOMNETACCOUNT);
+     *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_CUSTOMNETACCOUNT);
 
     if (*pResult != E_SUCCESS)
     {
@@ -139,13 +139,13 @@ NetConnectivityIpcStub::OnGetAppNetAccountId(const String& profileName, int* pNe
 void
 NetConnectivityIpcStub::OnSetNetAccountId(int netAccountId, int* pNetAccountId2, unsigned long* pResult)
 {
-       SysSecureLog(NID_NET, "Received the request of setting network account id with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+       SysSecureLog(NID_NET, "Received the request of setting network account id with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
+    String pkgId = __pIpcServer->GetClientPackageId();
     int netAccountId2 = INVALID_HANDLE;
 
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_CUSTOMNETACCOUNT);
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_CUSTOMNETACCOUNT);
 
     if (*pResult != E_SUCCESS)
     {
@@ -164,12 +164,12 @@ void
 NetConnectivityIpcStub::OnUpdateSystemNetAccount(const String& profileName, const NetAccountInfo& netAccountInfo, int bearerType,
                unsigned long* pResult)
 {
-       SysSecureLog(NID_NET, "Received the request of updating system network account with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+       SysSecureLog(NID_NET, "Received the request of updating system network account with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
+    String pkgId = __pIpcServer->GetClientPackageId();
 
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_NETWORKMANAGER);
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_NETWORKMANAGER);
 
     if (*pResult != E_SUCCESS)
     {
@@ -235,12 +235,12 @@ NetConnectivityIpcStub::OnUpdateSystemNetAccount(const String& profileName, cons
 void
 NetConnectivityIpcStub::OnResetNetStatistics(int bearerType, int statType, unsigned long* pResult)
 {
-       SysSecureLog(NID_NET, "Received to reset network statistics with bearer: %d, statType : %d, clientId : %d, AppId : %ls",
-                       bearerType, statType, __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+       SysSecureLog(NID_NET, "Received to reset network statistics with bearer: %d, statType : %d, clientId : %d, PkgId : %ls",
+                       bearerType, statType, __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-       String appId = __pIpcServer->GetClientAppId();
+       String pkgId = __pIpcServer->GetClientPackageId();
 
-       *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_NETSTATISTICSMANAGER);
+       *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_NETSTATISTICSMANAGER);
 
        if (*pResult != E_SUCCESS)
        {
@@ -257,12 +257,12 @@ NetConnectivityIpcStub::OnResetNetStatistics(int bearerType, int statType, unsig
 void
 NetConnectivityIpcStub::OnResetAllNetStatistics(int bearerType, unsigned long* pResult)
 {
-       SysSecureLog(NID_NET, "Received to reset all network statistics with bearer: %d, clientId : %d, AppId : %ls",
-                       bearerType, __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+       SysSecureLog(NID_NET, "Received to reset all network statistics with bearer: %d, clientId : %d, PkgId : %ls",
+                       bearerType, __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-       String appId = __pIpcServer->GetClientAppId();
+       String pkgId = __pIpcServer->GetClientPackageId();
 
-       *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_NETSTATISTICSMANAGER);
+       *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_NETSTATISTICSMANAGER);
 
        if (*pResult != E_SUCCESS)
        {

diff --git a/src/NfcConnectivityIpcStub.cpp b/src/NfcConnectivityIpcStub.cpp
index 7a4e5ae..c905746 100644 (file)
--- a/src/NfcConnectivityIpcStub.cpp
+++ b/src/NfcConnectivityIpcStub.cpp
@@ -105,7 +105,7 @@ NfcConnectivityIpcStub::OnIpcClientDisconnected(const Tizen::Io::_IpcServer&serv
 
        if (__pNfcService != null)
        {
-               __pNfcService->ProcessAppTermination(__pIpcServer->GetClientAppId());
+               __pNfcService->ProcessAppTermination(__pIpcServer->GetClientPackageId());
        }
 }
 
@@ -129,7 +129,7 @@ NfcConnectivityIpcStub::OnIpcRequestReceived(Tizen::Io::_IpcServer& server, cons
 void
 NfcConnectivityIpcStub::OnInitializeNfc(unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of initializing the NFC with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -147,7 +147,7 @@ NfcConnectivityIpcStub::OnInitializeNfc(unsigned long* pResult)
 void
 NfcConnectivityIpcStub::OnSetNfcLaunchPopupEnabled(bool enable, unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of setting the launch popup enabled with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -166,7 +166,7 @@ void
 NfcConnectivityIpcStub::OnRegisterNfcPushMessage(const Tizen::Base::ByteBuffer& pushMessageBuffer,
                const Tizen::Base::String& description, unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of registering the NFC push message with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -184,7 +184,7 @@ NfcConnectivityIpcStub::OnRegisterNfcPushMessage(const Tizen::Base::ByteBuffer&
 void
 NfcConnectivityIpcStub::OnUnregisterNfcPushMessage(unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of unregistering the NFC push message with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -202,7 +202,7 @@ NfcConnectivityIpcStub::OnUnregisterNfcPushMessage(unsigned long* pResult)
 void
 NfcConnectivityIpcStub::OnActivateReservedPush(unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of activating the NFC Reserved Push with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -228,7 +228,7 @@ NfcConnectivityIpcStub::OnActivateReservedPush(unsigned long* pResult)
 void
 NfcConnectivityIpcStub::OnDeactivateReservedPush(unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of deactivating the NFC Reserved Push with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -255,7 +255,7 @@ void
 NfcConnectivityIpcStub::OnIsReservedPushActivated(bool* pIsActivated)
 {
        SysLog(NID_NET_NFC, "Received the request of checking the NFC Reserved Push is activated with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pNfcService == null)
        {
@@ -271,7 +271,7 @@ void
 NfcConnectivityIpcStub::OnGetReservedPushCandidates(Tizen::Base::Collection::HashMap* pCandidates, unsigned long* pResult)
 {
        SysLog(NID_NET_NFC, "Received the request of getting the NFC Reserved Push candidate list with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pNfcService == null)
        {
@@ -286,7 +286,7 @@ NfcConnectivityIpcStub::OnGetReservedPushCandidates(Tizen::Base::Collection::Has
 void
 NfcConnectivityIpcStub::OnPickReservedPushMessage(const Tizen::Base::String& appId, unsigned long* pResult)
 {
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysLog(NID_NET_NFC, "Received the request of picking the NFC Reserved Push message with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -313,7 +313,7 @@ void
 NfcConnectivityIpcStub::OnGetPickedReservedPushMessage(Tizen::Base::String* pAppId, unsigned long* pResult)
 {
        SysLog(NID_NET_NFC, "Received the request of getting the picked Reserved Push message with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pNfcService == null)
        {

diff --git a/src/TelephonyConnectivityIpcStub.cpp b/src/TelephonyConnectivityIpcStub.cpp
index fe11dfa..9562b5d 100755 (executable)
--- a/src/TelephonyConnectivityIpcStub.cpp
+++ b/src/TelephonyConnectivityIpcStub.cpp
@@ -127,12 +127,12 @@ TelephonyConnectivityIpcStub::OnIpcRequestReceived(Tizen::Io::_IpcServer& server
 void
 TelephonyConnectivityIpcStub::OnGetTelephonyImsi(Tizen::Base::String* pImsi, unsigned long* pResult)
 {
-    SysSecureLog(NID_TEL, "Received the request of getting the telephony imsi with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysSecureLog(NID_TEL, "Received the request of getting the telephony imsi with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
+    String pkgId = __pIpcServer->GetClientPackageId();
 
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_USERIDENTITY, _PRV_SYSTEMMANAGER);
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_USERIDENTITY, _PRV_SYSTEMMANAGER);
 
     if (*pResult != E_SUCCESS)
     {
@@ -149,11 +149,11 @@ TelephonyConnectivityIpcStub::OnGetTelephonyImsi(Tizen::Base::String* pImsi, uns
 void
 TelephonyConnectivityIpcStub::OnHasTelephonySystemPrivilege(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request of checking system privilege with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request of checking system privilege with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_TELEPHONYMANAGER);
+    String pkgId = __pIpcServer->GetClientPackageId();
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_TELEPHONYMANAGER);
 
     if (*pResult != E_SUCCESS)
     {
@@ -166,14 +166,14 @@ TelephonyConnectivityIpcStub::OnHasTelephonySystemPrivilege(unsigned long* pResu
 void
 TelephonyConnectivityIpcStub::OnGetTelephonyNetworkSelectionMode(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request of getting the network selected mode with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request of getting the network selected mode with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
     SysLog(NID_TEL, "ipcserver : %d",__pIpcServer);
 
-    String appId = __pIpcServer->GetClientAppId();
+    String pkgId = __pIpcServer->GetClientPackageId();
 
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_TELEPHONYMANAGER);
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_TELEPHONYMANAGER);
 
     if (*pResult != E_SUCCESS)
     {
@@ -190,11 +190,11 @@ TelephonyConnectivityIpcStub::OnGetTelephonyNetworkSelectionMode(unsigned long*
 void
 TelephonyConnectivityIpcStub::OnSelectTelephonyNetworkManual(const Tizen::Base::String& plmn, const int networkType, unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request for selecting network manually with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request for selecting network manually with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_TELEPHONYMANAGER);
+    String pkgId = __pIpcServer->GetClientPackageId();
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_TELEPHONYMANAGER);
 
     if (*pResult != E_SUCCESS)
     {
@@ -211,11 +211,11 @@ TelephonyConnectivityIpcStub::OnSelectTelephonyNetworkManual(const Tizen::Base::
 void
 TelephonyConnectivityIpcStub::OnSelectTelephonyNetworkAutomatic(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request for selecting network automatically with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request for selecting network automatically with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_TELEPHONYMANAGER);
+    String pkgId = __pIpcServer->GetClientPackageId();
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_TELEPHONYMANAGER);
 
 
     if (*pResult != E_SUCCESS)
@@ -234,11 +234,11 @@ TelephonyConnectivityIpcStub::OnSelectTelephonyNetworkAutomatic(unsigned long* p
 void
 TelephonyConnectivityIpcStub::OnSearchTelephonyNetwork(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request for searching network with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request for searching network with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_TELEPHONYMANAGER);
+    String pkgId = __pIpcServer->GetClientPackageId();
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_TELEPHONYMANAGER);
 
     if (*pResult != E_SUCCESS)
     {
@@ -255,11 +255,11 @@ TelephonyConnectivityIpcStub::OnSearchTelephonyNetwork(unsigned long* pResult)
 void
 TelephonyConnectivityIpcStub::OnHasCallForwardPrivilege(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request of checking call forward privilege with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request of checking call forward privilege with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-    String appId = __pIpcServer->GetClientAppId();
-    *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_CALLFORWARD);
+    String pkgId = __pIpcServer->GetClientPackageId();
+    *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_CALLFORWARD);
 
     if (*pResult != E_SUCCESS)
     {
@@ -272,11 +272,11 @@ TelephonyConnectivityIpcStub::OnHasCallForwardPrivilege(unsigned long* pResult)
 void
 TelephonyConnectivityIpcStub::OnRequestCallForward(const String& phoneNumber, unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request for requesting call forward with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request for requesting call forward with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-       String appId = __pIpcServer->GetClientAppId();
-       *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_CALLFORWARD);
+       String pkgId = __pIpcServer->GetClientPackageId();
+       *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_CALLFORWARD);
 
     if (*pResult != E_SUCCESS)
     {
@@ -293,11 +293,11 @@ TelephonyConnectivityIpcStub::OnRequestCallForward(const String& phoneNumber, un
 void
 TelephonyConnectivityIpcStub::OnStopCallForward(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request for stopping call forward with clientId : %d, AppId : %ls",
-            __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request for stopping call forward with clientId : %d, PkgId : %ls",
+            __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-       String appId = __pIpcServer->GetClientAppId();
-       *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_CALLFORWARD);
+       String pkgId = __pIpcServer->GetClientPackageId();
+       *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_CALLFORWARD);
 
     if (*pResult != E_SUCCESS)
     {
@@ -314,11 +314,11 @@ TelephonyConnectivityIpcStub::OnStopCallForward(unsigned long* pResult)
 void
 TelephonyConnectivityIpcStub::OnGetCallForwardNumber(unsigned long* pResult)
 {
-    SysLog(NID_TEL, "Received the request for getting call forward number with clientId : %d, AppId : %ls",
-          __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+    SysLog(NID_TEL, "Received the request for getting call forward number with clientId : %d, PkgId : %ls",
+          __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
-       String appId = __pIpcServer->GetClientAppId();
-       *pResult = _AccessController::CheckSystemPrivilege(appId, _PRV_CALLFORWARD);
+       String pkgId = __pIpcServer->GetClientPackageId();
+       *pResult = _AccessController::CheckSystemPrivilege(pkgId, _PRV_CALLFORWARD);
 
     if (*pResult != E_SUCCESS)
     {

diff --git a/src/WifiConnectivityIpcStub.cpp b/src/WifiConnectivityIpcStub.cpp
index 52d2a57..849725c 100644 (file)
--- a/src/WifiConnectivityIpcStub.cpp
+++ b/src/WifiConnectivityIpcStub.cpp
@@ -126,7 +126,7 @@ WifiConnectivityIpcStub::OnIpcClientDisconnected(const Tizen::Io::_IpcServer&ser
 
        if (__pWifiService != null)
        {
-               __pWifiService->ProcessAppTermination(__pIpcServer->GetClientAppId());
+               __pWifiService->ProcessAppTermination(__pIpcServer->GetClientPackageId());
        }
 
        if (__pWifiProximityService != null)
@@ -157,7 +157,7 @@ void
 WifiConnectivityIpcStub::OnSetWifiSystemScanMode(int mode, unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_WIFI, "Received the request of setting the Wi-Fi system scan mode with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -188,7 +188,7 @@ void
 WifiConnectivityIpcStub::OnCheckWifiSystemSettingPrivilege(unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_WIFI, "Received the request of checking the Wi-Fi system setting privilege with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -211,7 +211,7 @@ void
 WifiConnectivityIpcStub::OnUpdateWifiBssInfo(const Tizen::Net::Wifi::WifiBssInfo& bssInfo, unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_WIFI, "Received the request of updating the Wi-Fi BSS info with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -242,7 +242,7 @@ void
 WifiConnectivityIpcStub::OnInitializeWifiDirect(unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_WIFI, "Received the request of initializing the Wi-Fi Direct with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -266,7 +266,7 @@ WifiConnectivityIpcStub::OnGetWifiDirectLocalDeviceName(Tizen::Base::String* pLo
 {
 #if !defined (_OSP_EMUL_)
        SysSecureLog(NID_NET_WIFI, "Received the request of getting the local device name with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pWifiService == null)
        {
@@ -286,7 +286,7 @@ void
 WifiConnectivityIpcStub::OnSetWifiDirectLocalDeviceName(Tizen::Base::String localName, unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
-       String packageId = __pIpcServer->GetClientAppId();
+       String packageId = __pIpcServer->GetClientPackageId();
 
        SysSecureLog(NID_NET_WIFI, "Received the request of setting the local device name with clientId : %d, AppPkgId : %ls",
                                __pIpcServer->GetClientId(), packageId.GetPointer());
@@ -312,7 +312,7 @@ WifiConnectivityIpcStub::OnRegisterBssId(const Tizen::Base::String& bssId, unsig
        int clientId = __pIpcServer->GetClientId();
 
        SysLog(NID_NET_WIFI, "OnRegisterBssId with clientId : %d, AppPkgId : %ls",
-                               clientId, __pIpcServer->GetClientAppId().GetPointer());
+                               clientId, __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pWifiService == null)
        {
@@ -335,7 +335,7 @@ WifiConnectivityIpcStub::OnUnregisterBssId(const Tizen::Base::String& bssId, uns
        int clientId = __pIpcServer->GetClientId();
 
        SysLog(NID_NET_WIFI, "OnUnregisterBssId with clientId : %d, AppPkgId : %ls",
-                               clientId, __pIpcServer->GetClientAppId().GetPointer());
+                               clientId, __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pWifiService == null)
        {
@@ -356,7 +356,7 @@ WifiConnectivityIpcStub::OnProximityCheckActivated(unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
        SysLog(NID_NET_WIFI, "OnProximityCheckActivated with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pWifiService == null)
        {
@@ -377,7 +377,7 @@ WifiConnectivityIpcStub::OnProximityCheckDeactivated(unsigned long* pResult)
 {
 #if !defined (_OSP_EMUL_)
        SysLog(NID_NET_WIFI, "OnProximityCheckDeactivated with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pWifiService == null)
        {
@@ -398,7 +398,7 @@ WifiConnectivityIpcStub::OnIsProximityCheckActivated(bool* isActivated, unsigned
 {
 #if !defined (_OSP_EMUL_)
        SysLog(NID_NET_WIFI, "OnIsProximityCheckActivated with clientId : %d, AppPkgId : %ls",
-                               __pIpcServer->GetClientId(), __pIpcServer->GetClientAppId().GetPointer());
+                               __pIpcServer->GetClientId(), __pIpcServer->GetClientPackageId().GetPointer());
 
        if (__pWifiService == null)
        {