[wearable] enable NFC feature

Change-Id: I93aef6f0dfd43cbada6c04640c1cb8e4cb327ede

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 818c4919b38662a7bed2677e9b62baadee8598f9..05d1a7807413a7d539abe04e29c5de14849a233f 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -10,7 +10,7 @@
 %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 
 Name:       webapi-plugins
-Version:    0.59
+Version:    0.60
 Release:    0
 License:    Apache-2.0 and BSD-2.0 and MIT
 Group:      Development/Libraries
@@ -26,7 +26,7 @@ Source0:    %{name}-%{version}.tar.gz
 %endif
 
 ####################################################################
-#       Mobile Profile :  Redwood(SM-Z910F), KIRAN(Z130H)          #
+#       Mobile Profile :  TM1, Redwood(SM-Z910F), KIRAN(Z130H)          #
 ####################################################################
 %if "%{?profile}" == "mobile"
 
@@ -115,7 +115,7 @@ Source0:    %{name}-%{version}.tar.gz
 %endif # tizen_profile_mobile
 
 ####################################################################
-#       Wearable Profile :  B2                          #
+#       Wearable Profile :  B2 / TW1                      #
 ####################################################################
 %if "%{?profile}" == "wearable"
 
@@ -173,13 +173,8 @@ Source0:    %{name}-%{version}.tar.gz
 %define tizen_feature_message_port_support            1
 %define tizen_feature_messaging_support               0
 
-%if 0%{?model_build_feature_nfc}
 %define tizen_feature_nfc_emulation_support           0
 %define tizen_feature_nfc_support                     1
-%else
-%define tizen_feature_nfc_emulation_support           0
-%define tizen_feature_nfc_support                     0
-%endif
 %define tizen_feature_notification_support            1
 %define tizen_feature_package_support                 1
 %define tizen_feature_power_support                   1

diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc
index 130af60ad9ceac783a213b27cd87854730af81f1..55d2f28a9afcb04c2be75e992e4696ef72df9014 100644 (file)
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@ -26,6 +26,7 @@
 #include "common/extension.h"
 #include "common/logger.h"
 #include "common/platform_exception.h"
+#include "common/tools.h"
 #include "nfc/aid_data.h"
 #include "nfc/defs.h"
 #include "nfc/nfc_message_utils.h"

diff --git a/src/nfc/nfc_api.js b/src/nfc/nfc_api.js
index 259852a1f39d45ce989735a4b60bb37ad2c06fc4..641a4ee6fd21adadda7a0b3b274a5ae3ed58cb9a 100644 (file)
--- a/src/nfc/nfc_api.js
+++ b/src/nfc/nfc_api.js
@@ -438,7 +438,7 @@ function addCardEmulationModeChangeListener() {
   return cardEmulationModeListener.addListener(args.callback);
 };
 
-NFCAdapter.prototype.addCardEmulationModeChangeListener = function()_ {
+NFCAdapter.prototype.addCardEmulationModeChangeListener = function() {
   return addCardEmulationModeChangeListener.apply(this, arguments);
 };