From: Piotr Kosko
Date: Wed, 10 May 2017 09:21:01 +0000 (+0200)
Subject: [Application] Wrapped code for context API with ifdef
X-Git-Tag: submit/tizen/20170512.112145~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd1002caac22c6c570f73a2927570966645b3ea0;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git
[Application] Wrapped code for context API with ifdef
[Verification] Code compiles without errors.
Feature checked in chrome console.
Change-Id: I6e88d5d8da383e1f0d227e11905eeffb3235d1ba
Signed-off-by: Piotr Kosko
---
diff --git a/src/application/application_instance.cc b/src/application/application_instance.cc
index 0d05a287..eb4ee2dd 100755
--- a/src/application/application_instance.cc
+++ b/src/application/application_instance.cc
@@ -163,15 +163,9 @@ void ApplicationInstance::GetAppMetaData(const picojson::value& args, picojson::
void ApplicationInstance::GetBatteryUsageInfo(const picojson::value& args, picojson::object& out) {
LoggerD("Entered");
-#ifdef TIZEN_MOBILE
CHECK_PRIVILEGE_ACCESS(kPrivilegeAppHistoryRead, &out);
manager_.GetBatteryUsageInfo(args, &out);
-#else
- LogAndReportError(PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "This feature is not supported on this profile."), &out,
- ("NOT_SUPPORTED_ERR: This feature is not supported on this profile"));
- return;
-#endif
}
void ApplicationInstance::AddAppInfoEventListener(const picojson::value& args, picojson::object& out) {
diff --git a/src/application/application_manager.cc b/src/application/application_manager.cc
index 8a33081c..8af357a9 100755
--- a/src/application/application_manager.cc
+++ b/src/application/application_manager.cc
@@ -29,7 +29,9 @@
#include
#include
#include
+#ifdef TIZEN_MOBILE
#include
+#endif
#include "common/current_application.h"
#include "common/logger.h"
@@ -1159,6 +1161,7 @@ void ApplicationManager::GetAppSharedUri(const std::string& app_id, picojson::ob
void ApplicationManager::GetBatteryUsageInfo(const picojson::value& args, picojson::object* out) {
LoggerD("Entered");
+#ifdef TIZEN_MOBILE
context_history_list_h list = nullptr;
context_history_h handle = nullptr;
context_history_filter_h filter = nullptr;
@@ -1274,6 +1277,11 @@ void ApplicationManager::GetBatteryUsageInfo(const picojson::value& args, picojs
}
}
ReportSuccess(result_array, *out);
+#else
+ // 20170510 Context API is supported only for mobile profile, other ones would result with NotSupportedError
+ LogAndReportError(PlatformResult(ErrorCode::NOT_SUPPORTED_ERR, "This feature is not supported on this profile."), out,
+ ("NOT_SUPPORTED_ERR: This feature is not supported on this profile"));
+#endif
}
void ApplicationManager::GetAppMetaData(const std::string& app_id, picojson::object* out) {