prevent setting - bluetooth for emulator

Change-Id: I3e522030dc544e5727f1711afd9dcf7c0c59f6f7
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp b/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp
old mode 100755 (executable)
new mode 100644 (file)
index d4a42a4..393167e
--- a/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp
+++ b/src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp
@@ -73,7 +73,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        msg.AddData(L"launch-type", L"pick");
 
        const String& package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUri, pMime, OnAppControlResult, 0);
 

diff --git a/src/bluetooth-app-control/CMakeLists.txt b/src/bluetooth-app-control/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/browser-app-control/BrowserAppControlDllEntry.cpp b/src/browser-app-control/BrowserAppControlDllEntry.cpp
index 68de892..502f700 100644 (file)
--- a/src/browser-app-control/BrowserAppControlDllEntry.cpp
+++ b/src/browser-app-control/BrowserAppControlDllEntry.cpp
@@ -74,7 +74,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
 
        const String& package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        int pid = _AppControlManager::GetInstance()->LaunchPkg(msg, package, String(SERVICE_OPERATION_VIEW), pActualUri, pMime, NULL, 0);
 

diff --git a/src/calendar-app-control/CalendarAppControlDllEntry.cpp b/src/calendar-app-control/CalendarAppControlDllEntry.cpp
index 6c16ed3..78c0ead 100644 (file)
--- a/src/calendar-app-control/CalendarAppControlDllEntry.cpp
+++ b/src/calendar-app-control/CalendarAppControlDllEntry.cpp
@@ -230,7 +230,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
 
        package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        __req = req; 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, operation, pActualUri, pMime, pCb, 0);

diff --git a/src/call-app-control/PhoneAppControlDllEntry.cpp b/src/call-app-control/PhoneAppControlDllEntry.cpp
index 70d53f8..8782f4c 100644 (file)
--- a/src/call-app-control/PhoneAppControlDllEntry.cpp
+++ b/src/call-app-control/PhoneAppControlDllEntry.cpp
@@ -84,7 +84,7 @@ StartAppControl(int req, const String& aId, const String& operationId, const Str
                        || operationId == L"http://tizen.org/appcontrol/operation/dial");
 
        const String& package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        __req = req;
        int pid = _AppControlManager::GetInstance()->Launch(msg, package, operationId, pActualUri, pMime, (noResult) ? NULL : OnAppControlResult, 0);

diff --git a/src/camera-app-control/CameraAppControlDllEntry.cpp b/src/camera-app-control/CameraAppControlDllEntry.cpp
index f460833..238d7da 100644 (file)
--- a/src/camera-app-control/CameraAppControlDllEntry.cpp
+++ b/src/camera-app-control/CameraAppControlDllEntry.cpp
@@ -90,7 +90,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
                }
 
                const String& package = _AppControlManager::GetAliasAppId(aId);
-               SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+               SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
                __req = req;
                __processId = _AppControlManager::GetInstance()->Launch(msg, package, String(APPSVC_OPERATION_CREATE_CONTENT), pUri, pActualMime, OnAppControlResult, 0);

diff --git a/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp b/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp
index 1cb91d4..17b65b5 100644 (file)
--- a/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp
+++ b/src/filemanager-app-control/FileManagerAppControlDllEntry.cpp
@@ -94,7 +94,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
 
        const String& package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        __req = req;
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pUriData, pActualMime, OnAppControlResult, 0);

diff --git a/src/image-app-control/ImageAppControlDllEntry.cpp b/src/image-app-control/ImageAppControlDllEntry.cpp
index 00be58a..c4aa84b 100644 (file)
--- a/src/image-app-control/ImageAppControlDllEntry.cpp
+++ b/src/image-app-control/ImageAppControlDllEntry.cpp
@@ -87,7 +87,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
 
        const String& package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        if (!isCrop)
        {

diff --git a/src/media-app-control/MediaAppControlDllEntry.cpp b/src/media-app-control/MediaAppControlDllEntry.cpp
index 02a1d65..45ff112 100644 (file)
--- a/src/media-app-control/MediaAppControlDllEntry.cpp
+++ b/src/media-app-control/MediaAppControlDllEntry.cpp
@@ -100,7 +100,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
 
        const String& package = _AppControlManager::GetAliasAppId(aId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, oId, pActualUri, pMime, NULL, 0);
 

diff --git a/src/setting-app-control/SettingAppControlDllEntry.cpp b/src/setting-app-control/SettingAppControlDllEntry.cpp
old mode 100755 (executable)
new mode 100644 (file)
index b5c7aef..d898736
--- a/src/setting-app-control/SettingAppControlDllEntry.cpp
+++ b/src/setting-app-control/SettingAppControlDllEntry.cpp
@@ -164,6 +164,10 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
        else if (isBluetooth)
        {
+               bool isBtSupported = false;
+               r = Tizen::System::_SystemInfoImpl::GetSysInfo(L"http://tizen.org/feature/network.bluetooth", isBtSupported);
+               SysTryReturnResult(NID_APP, (r == E_SUCCESS) && (isBtSupported == true), E_SYSTEM, "[%s] Bluetooth is not supported.", GetErrorMessage(r));
+
                pCb = OnBluetoothAppControlResult;
                providerAppId = "tizen.setting_bluetooth";
        }
@@ -183,7 +187,7 @@ StartAppControl(int req, const String& aId, const String& oId, const String* pUr
        }
        
        const String& package = _AppControlManager::GetAliasAppId(providerAppId);
-       SysLog(NID_APP, "Actual packageId is %ls.", package.GetPointer());
+       SysLog(NID_APP, "Actual app is %ls.", package.GetPointer());
 
        __req = req;
        __processId = _AppControlManager::GetInstance()->Launch(msg, package, operation, pUri, pMime, pCb, 0);