From: Jeongkyun Pu Date: Wed, 12 Oct 2016 04:07:07 +0000 (-0700) Subject: Revert "[SystemInfo] Added ADS property." X-Git-Tag: submit/tizen/20161012.102024~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19269471e7a640c476812384f9af22e1cca8bec8;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Revert "[SystemInfo] Added ADS property." Native ACR is no completed. this make build error. This reverts commit cc424855cb5fba3347d9b4af5d483ee22006ede5. Change-Id: I7248dc2ed7944a23cd62c3a1d9adf37516568825 --- diff --git a/src/systeminfo/systeminfo_api.js b/src/systeminfo/systeminfo_api.js index d6b9634d..dad6383e 100644 --- a/src/systeminfo/systeminfo_api.js +++ b/src/systeminfo/systeminfo_api.js @@ -42,8 +42,7 @@ var SystemInfoPropertyId = { SIM : 'SIM', PERIPHERAL : 'PERIPHERAL', MEMORY : 'MEMORY', - CAMERA_FLASH : 'CAMERA_FLASH', - ADS : 'ADS' + CAMERA_FLASH : 'CAMERA_FLASH' }; //class SystemInfoDeviceCapability //////////////////////////////////////////////////// @@ -709,13 +708,6 @@ function SystemInfoCameraFlash(data) { }); } -//class SystemInfoADS //////////////////////////////////////////////////// -function SystemInfoADS(data) { - Object.defineProperties(this, { - id : {value: data.id, writable: false, enumerable: true}, - }); -} - SystemInfoCameraFlash.prototype.setBrightness = function(brightness) { var args = validator_.validateArgs(arguments, [ {name: 'brightness', type: types_.DOUBLE} @@ -1205,13 +1197,7 @@ var _propertyContainer = { constructor : SystemInfoCameraFlash, broadcastFunction : _systeminfoCameraFlashListenerCallback, signalLabel : 'SystemInfoCameraFlashChangeBroadcast' - }, - 'ADS' : { - callbacks : {}, //adding callbacks for ADS is not possible - constructor : SystemInfoADS, - broadcastFunction : function(){}, - signalLabel : '' - } + } }; /// It common function to be called when listener would be triggered diff --git a/src/systeminfo/systeminfo_properties_manager.cc b/src/systeminfo/systeminfo_properties_manager.cc index 8a0fef8f..33b639dc 100644 --- a/src/systeminfo/systeminfo_properties_manager.cc +++ b/src/systeminfo/systeminfo_properties_manager.cc @@ -181,8 +181,6 @@ PlatformResult SysteminfoPropertiesManager::ReportProperty(const std::string& pr return ReportMemory(res_obj); } else if ("CAMERA_FLASH" == property) { return ReportCameraFlash(res_obj, index); - } else if ("ADS" == property) { - return ReportAds(res_obj); } return LogAndCreateResult( ErrorCode::NOT_SUPPORTED_ERR, "Property with given id is not supported"); @@ -1231,19 +1229,6 @@ PlatformResult SysteminfoPropertiesManager::ReportCameraFlash(picojson::object* return PlatformResult(ErrorCode::NO_ERROR); } -/// ADS -PlatformResult SysteminfoPropertiesManager::ReportAds(picojson::object* out) { - LoggerD("Entered"); - std::string ads_id = ""; - PlatformResult ret = SysteminfoUtils::GetRuntimeInfoString( - SYSTEM_SETTINGS_KEY_ADS_ID, &ads_id); - if (ret.IsError()) { - return ret; - } - - out->insert(std::make_pair("id", picojson::value(ads_id))); - return PlatformResult(ErrorCode::NO_ERROR); -} } // namespace systeminfo } // namespace webapi diff --git a/src/systeminfo/systeminfo_properties_manager.h b/src/systeminfo/systeminfo_properties_manager.h index d16116f5..c18078a7 100644 --- a/src/systeminfo/systeminfo_properties_manager.h +++ b/src/systeminfo/systeminfo_properties_manager.h @@ -53,7 +53,6 @@ class SysteminfoPropertiesManager { common::PlatformResult ReportCameraFlash(picojson::object* out, unsigned long count); common::PlatformResult ReportMemory(picojson::object* out); common::PlatformResult ReportStorage(picojson::object* out); - common::PlatformResult ReportAds(picojson::object* out); common::PlatformResult FetchIsAutoRotation(bool* result); common::PlatformResult FetchStatus(std::string* result);