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 d6b9634dbfa2db5c65c24e072004598741a1c763..dad6383ea47465e815057dbea33a070fe9ba55bb 100644 (file)
--- 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 8a0fef8fec6afeba0bdca826ca866ffaaa0fa26c..33b639dcd21bcfcee644ab15dc7d516f58ac9684 100644 (file)
--- 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 d16116f5f1fc0a92cec409e33a890d5b1f0eca22..c18078a7c02b4ae36743918b285907d16ee903bf 100644 (file)
--- 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);