From 87fc7c19d9dc85a0e8c2943a2714c187e21ef0f4 Mon Sep 17 00:00:00 2001 From: Hyunjin Park Date: Mon, 28 Mar 2016 15:25:23 +0900 Subject: [PATCH] [wearable] enable NFC feature Change-Id: I93aef6f0dfd43cbada6c04640c1cb8e4cb327ede --- packaging/webapi-plugins.spec | 11 +++-------- src/nfc/nfc_adapter.cc | 1 + src/nfc/nfc_api.js | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec index 818c4919..05d1a780 100644 --- 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 130af60a..55d2f28a 100644 --- 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 259852a1..641a4ee6 100644 --- 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); }; -- 2.34.1