Merge branch 'tizen_3.0' into tizen_4.0

Change-Id: Ic220dd064ebbb7187462bf78fde154cea2a19b66

7 files changed, 34 insertions, 12 deletions

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index c90c9775..ec7c388a 100644
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -8,7 +8,7 @@
 %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 
 Name:       webapi-plugins
-Version:    2.24
+Version:    2.25
 Release:    0
 License:    Apache-2.0 and BSD-3-Clause and MIT
 Group:      Development/Libraries
diff --git a/src/bluetooth/bluetooth_adapter.cc b/src/bluetooth/bluetooth_adapter.cc
index 9fbf87ed..0da34d52 100644
--- a/src/bluetooth/bluetooth_adapter.cc
+++ b/src/bluetooth/bluetooth_adapter.cc
@@ -641,6 +641,9 @@ void BluetoothAdapter::SetPowered(const picojson::value& data, picojson::object&
 
 void BluetoothAdapter::SetVisible(const picojson::value& data, picojson::object& out) {
   ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: setVisible() is deprecated and will be removed from next release. "
+      "Let the user change the Bluetooth visibility through the Settings application instead.");
 
   CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothManager,
                                               &out);
diff --git a/src/bluetooth/bluetooth_api.js b/src/bluetooth/bluetooth_api.js
index 09979b31..9fb4266e 100755
--- a/src/bluetooth/bluetooth_api.js
+++ b/src/bluetooth/bluetooth_api.js
@@ -2078,6 +2078,9 @@ BluetoothAdapter.prototype.setPowered = function() {
 // This method is deprecated since Tizen 2.3 and will be removed in Tizen 3.0.
 BluetoothAdapter.prototype.setVisible = function() {
     privUtils_.log('Entered BluetoothAdapter.setVisible()');
+    privUtils_.warn('DEPRECATION WARNING: setVisible() is deprecated and will be removed from next release. '
+        + 'Let the user change the Bluetooth visibility through the Settings application instead.');
+
     var args = AV.validateMethod(arguments, [
         {
             name : 'visible',
diff --git a/src/humanactivitymonitor/humanactivitymonitor_api.js b/src/humanactivitymonitor/humanactivitymonitor_api.js
index 5c7daf64..01da87cf 100755
--- a/src/humanactivitymonitor/humanactivitymonitor_api.js
+++ b/src/humanactivitymonitor/humanactivitymonitor_api.js
@@ -203,12 +203,10 @@ HumanActivityMonitorManager.prototype.getHumanActivityData = function(type, succ
     {name: 'errorCallback', type: types_.FUNCTION, optional: true, nullable: true}
   ]);
 
-  if (args.type === HumanActivityType.WRIST_UP) {
+  if (-1 === [HumanActivityType.HRM, HumanActivityType.PEDOMETER].indexOf(args.type)) {
     throw new WebAPIException(WebAPIException.NOT_SUPPORTED_ERR);
   }
 
-  var listenerId = 'HumanActivityMonitor_'  + args.type;
-
   var data = {
     type: args.type
   };
diff --git a/src/nfc/nfc_api.js b/src/nfc/nfc_api.js
index 20641f29..dc1e25a7 100644
--- a/src/nfc/nfc_api.js
+++ b/src/nfc/nfc_api.js
@@ -347,7 +347,7 @@ function setTagListener() {
         return;
       }
     }
-    args.listener[message.action](tagObject);
+    native_.callIfPossible(args.listener[message.action], tagObject);
   };
 
   // Register (acivate) core listener if not done yet
@@ -380,7 +380,7 @@ function setPeerListener() {
     if ('onattach' === msg.action) {
       data = new NFCPeer(msg.id);
     }
-    args.listener[msg.action](data);
+    native_.callIfPossible(args.listener[msg.action], data);
   };
 
   if (!native_.isListenerSet(PEER_LISTENER)) {
@@ -963,7 +963,7 @@ var toRecordsArray = function(array) {
     var data = new InternalRecordData(array[i].tnf, array[i].type, array[i].payload, array[i].id);
 
     if (array[i].recordType == 'Record') {
-      result.push(new tizen.NDEFRecord(data.tnf_, data.type_, data.payload_, data.id_));
+      result.push(new tizen.NDEFRecord(data.tnf, data.type, data.payload, data.id));
       continue;
     }
 
@@ -979,7 +979,7 @@ var toRecordsArray = function(array) {
     }
 
     if (array[i].recordType == 'RecordMedia') {
-      result.push(new tizen.NDEFRecordMedia(array[i].mimeType, array[i].data, data));
+      result.push(new tizen.NDEFRecordMedia(array[i].mimeType, null, data));
       continue;
     }
   }
@@ -1567,11 +1567,11 @@ tizen.NDEFRecordMedia = function(mimeType, data, internal_) {
   try {
     if (arguments.length >= 2) {
       mimeType_ = converter_.toString(mimeType);
-      data_ = toByteArray(data, Math.pow(2, 32) - 1);
 
       if (!type_.isNullOrUndefined(internal_) && (internal_ instanceof InternalRecordData)) {
         tizen.NDEFRecord.call(this, internal_.tnf, internal_.type, internal_.payload, internal_.id);
       } else {
+        data_ = toByteArray(data, Math.pow(2, 32) - 1);
         var result = native_.callSync(
             'NDEFRecordMedia_constructor', {
               'mimeType': mimeType_,
diff --git a/src/push/push_instance.cc b/src/push/push_instance.cc
index f7b277d3..f05e04ba 100644
--- a/src/push/push_instance.cc
+++ b/src/push/push_instance.cc
@@ -64,6 +64,9 @@ PushInstance::PushInstance() {
 
 void PushInstance::registerService(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: registerService() is deprecated and will be removed from next release. "
+      "Use register() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
   common::PlatformResult result = impl->registerService(args.get("callbackId").get<double>());
@@ -88,6 +91,9 @@ void PushInstance::registerApplication(const picojson::value& args, picojson::ob
 
 void PushInstance::unregisterService(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: unregisterService() is deprecated and will be removed from next "
+      "release. Use unregister() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -114,6 +120,9 @@ void PushInstance::unregisterApplication(const picojson::value& args, picojson::
 
 void PushInstance::connectService(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: connectService() is deprecated and will be removed from next release. "
+      "Use connect() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
@@ -140,6 +149,9 @@ void PushInstance::connect(const picojson::value& args, picojson::object& out) {
 
 void PushInstance::disconnectService(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
+  LoggerW(
+      "DEPRECATION WARNING: disconnectService() is deprecated and will be removed from next "
+      "release. Use disconnect() instead.");
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out);
 
diff --git a/src/systeminfo/systeminfo_api.js b/src/systeminfo/systeminfo_api.js
index 90e370f7..b0628978 100644
--- a/src/systeminfo/systeminfo_api.js
+++ b/src/systeminfo/systeminfo_api.js
@@ -451,6 +451,8 @@ function SystemInfoCpu(data) {
 
 //class SystemInfoStorageUnit ////////////////////////////////////////////////////
 function SystemInfoStorageUnit(data) {
+    var _isRemovable = data.isRemovable;
+
     Object.defineProperties(this, {
         type : {
             value: data.type,
@@ -473,9 +475,13 @@ function SystemInfoStorageUnit(data) {
             enumerable : true
         },
         isRemoveable : {
-            value : data.isRemovable,
-            writable : false,
-            enumerable : true
+            enumerable : true,
+            get: function() {
+                privUtils_.warn('DEPRECATION WARNING: SystemInfoStorageUnit.isRemoveable is is deprecated and will be '
+                    + 'removed from next release. Use SystemInfoStorageUnit.isRemovable instead.');
+                return _isRemovable;
+            },
+            set: function() {}
         }
     });
 }