From: Andrzej Popowski Date: Tue, 14 Jul 2015 07:50:04 +0000 (+0200) Subject: [NFC] - setPowered based on Settings aplication X-Git-Tag: submit/tizen_tv/20150720.124123^2^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24cfffbd241738f0187f0c70ce2b5e55db8ab4c8;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [NFC] - setPowered based on Settings aplication Change-Id: I2a8647d84a65d84f334ac5dda8f0cc2ce02833f4 Signed-off-by: Andrzej Popowski --- diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec index 90810a12..29e8251a 100755 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@ -24,101 +24,102 @@ Source0: %{name}-%{version}.tar.gz #################################################################### %if "%{?tizen_profile_name}" == "mobile" -%define tizen_privilege_engine ACE - -%define tizen_feature_account_support 1 -%define tizen_feature_alarm_support 1 -%define tizen_feature_application_support 1 -%define tizen_feature_archive_support 1 -%define tizen_feature_badge_support 1 +%define tizen_privilege_engine ACE + +%define tizen_feature_account_support 1 +%define tizen_feature_alarm_support 1 +%define tizen_feature_app_control_settings_support 1 +%define tizen_feature_application_support 1 +%define tizen_feature_archive_support 1 +%define tizen_feature_badge_support 1 %ifarch %{arm} # ARM -%define tizen_feature_bluetooth_support 1 +%define tizen_feature_bluetooth_support 1 %else # I586 -%define tizen_feature_bluetooth_support 0 -%endif -%define tizen_feature_bookmark_support 1 -%define tizen_feature_calendar_support 1 -%define tizen_feature_contact_support 1 -%define tizen_feature_content_support 1 -%define tizen_feature_datacontrol_support 1 -%define tizen_feature_datasync_support 0 -%define tizen_feature_download_support 1 -%define tizen_feature_exif_support 1 -%define tizen_feature_filesystem_support 1 -%define tizen_feature_fm_radio_support 1 +%define tizen_feature_bluetooth_support 0 +%endif +%define tizen_feature_bookmark_support 1 +%define tizen_feature_calendar_support 1 +%define tizen_feature_contact_support 1 +%define tizen_feature_content_support 1 +%define tizen_feature_datacontrol_support 1 +%define tizen_feature_datasync_support 0 +%define tizen_feature_download_support 1 +%define tizen_feature_exif_support 1 +%define tizen_feature_filesystem_support 1 +%define tizen_feature_fm_radio_support 1 %ifarch %{arm} # ARM -%define tizen_feature_ham_support 0 +%define tizen_feature_ham_support 0 %else # I586 -%define tizen_feature_ham_support 1 +%define tizen_feature_ham_support 1 %endif -%define tizen_feature_location_batch 0 -%define tizen_feature_key_manager_support 0 -%define tizen_feature_media_controller_support 1 +%define tizen_feature_location_batch 0 +%define tizen_feature_key_manager_support 0 +%define tizen_feature_media_controller_support 1 %ifarch %{arm} # ARM -%define tizen_feature_media_key_support 1 +%define tizen_feature_media_key_support 1 %else # I586 -%define tizen_feature_media_key_support 0 +%define tizen_feature_media_key_support 0 %endif -%define tizen_feature_message_port_support 1 -%define tizen_feature_messaging_support 1 +%define tizen_feature_message_port_support 1 +%define tizen_feature_messaging_support 1 %if 0%{?model_build_feature_nfc} -%define tizen_feature_nfc_emulation_support 0 -%define tizen_feature_nfc_support 1 +%define tizen_feature_nfc_emulation_support 1 +%define tizen_feature_nfc_support 1 %else -%define tizen_feature_nfc_emulation_support 0 -%define tizen_feature_nfc_support 0 +%define tizen_feature_nfc_emulation_support 1 +%define tizen_feature_nfc_support 1 %endif -%define tizen_feature_notification_support 1 -%define tizen_feature_package_support 1 -%define tizen_feature_power_support 1 -%define tizen_feature_push_support 1 +%define tizen_feature_notification_support 1 +%define tizen_feature_package_support 1 +%define tizen_feature_power_support 1 +%define tizen_feature_push_support 1 %ifarch %{arm} # ARM -%define tizen_feature_se_support 1 +%define tizen_feature_se_support 1 %else # I586 -%define tizen_feature_se_support 0 +%define tizen_feature_se_support 0 %endif -%define tizen_feature_sensor_support 1 -%define tizen_feature_sound_support 1 -%define tizen_feature_system_info_support 1 -%define tizen_feature_system_setting_support 1 +%define tizen_feature_sensor_support 1 +%define tizen_feature_sound_support 1 +%define tizen_feature_system_info_support 1 +%define tizen_feature_system_setting_support 1 %ifarch %{arm} # ARM -%define tizen_feature_telephony_support 1 +%define tizen_feature_telephony_support 1 %else # I586 -%define tizen_feature_telephony_support 0 +%define tizen_feature_telephony_support 0 %endif -%define tizen_feature_time_support 1 -%define tizen_feature_web_setting_support 1 +%define tizen_feature_time_support 1 +%define tizen_feature_web_setting_support 1 %ifarch %{arm} # ARM -%define tizen_feature_wi_fi_support 1 +%define tizen_feature_wi_fi_support 1 %else # I586 -%define tizen_feature_wi_fi_support 0 +%define tizen_feature_wi_fi_support 0 %endif -%define tizen_feature_tvaudio_support 0 -%define tizen_feature_tvchannel_support 0 -%define tizen_feature_tv_display_support 0 -%define tizen_feature_tvinputdevice_support 0 -%define tizen_feature_inputdevice_support 1 -%define tizen_feature_tvwindow_support 0 +%define tizen_feature_tvaudio_support 0 +%define tizen_feature_tvchannel_support 0 +%define tizen_feature_tv_display_support 0 +%define tizen_feature_tvinputdevice_support 0 +%define tizen_feature_inputdevice_support 1 +%define tizen_feature_tvwindow_support 0 %if 0%{?tizen_feature_telephony_support} -%define tizen_feature_callhistory_support 1 -%define tizen_feature_nbs_support 1 +%define tizen_feature_callhistory_support 1 +%define tizen_feature_nbs_support 1 %else -%define tizen_feature_callhistory_support 0 -%define tizen_feature_nbs_support 0 +%define tizen_feature_callhistory_support 0 +%define tizen_feature_nbs_support 0 %endif %endif # tizen_profile_mobile @@ -128,96 +129,97 @@ Source0: %{name}-%{version}.tar.gz #################################################################### %if "%{?tizen_profile_name}" == "wearable" -%define tizen_privilege_engine ACE +%define tizen_privilege_engine ACE # Account API is optional in Tizen Wearable Profile. -%define tizen_feature_account_support 0 +%define tizen_feature_account_support 0 -%define tizen_feature_alarm_support 1 -%define tizen_feature_application_support 1 +%define tizen_feature_alarm_support 1 +%define tizen_feature_app_control_settings_support 0 +%define tizen_feature_application_support 1 # Archive API is optional in Tizen Wearable Profile. -%define tizen_feature_archive_support 1 +%define tizen_feature_archive_support 1 # Badge API is mandatory in Tizen Wearable Profile. -%define tizen_feature_badge_support 1 +%define tizen_feature_badge_support 1 -%define tizen_feature_bluetooth_support 1 +%define tizen_feature_bluetooth_support 1 # Bookmark API is optional in Tizen Wearable Profile. -%define tizen_feature_bookmark_support 0 +%define tizen_feature_bookmark_support 0 # Calendar API is mandatory in Tizen Wearable Profile. -%define tizen_feature_calendar_support 0 -%define tizen_feature_contact_support 0 -%define tizen_feature_content_support 1 -%define tizen_feature_datacontrol_support 0 -%define tizen_feature_datasync_support 0 +%define tizen_feature_calendar_support 0 +%define tizen_feature_contact_support 0 +%define tizen_feature_content_support 1 +%define tizen_feature_datacontrol_support 0 +%define tizen_feature_datasync_support 0 %ifarch %{arm} -%define tizen_feature_download_support 0 +%define tizen_feature_download_support 0 %else -%define tizen_feature_download_support 1 +%define tizen_feature_download_support 1 %endif -%define tizen_feature_exif_support 1 -%define tizen_feature_filesystem_support 1 -%define tizen_feature_fm_radio_support 0 -%define tizen_feature_ham_support 1 -%define tizen_feature_location_batch 0 -%define tizen_feature_media_controller_support 1 +%define tizen_feature_exif_support 1 +%define tizen_feature_filesystem_support 1 +%define tizen_feature_fm_radio_support 0 +%define tizen_feature_ham_support 1 +%define tizen_feature_location_batch 0 +%define tizen_feature_media_controller_support 1 # MediayKey API is optional in Tizen Wearable Profile. # tizen.org/feature/network.bluetooth.audio.media is required for MediayKey API %ifarch %{arm} # ARM -%define tizen_feature_media_key_support 1 +%define tizen_feature_media_key_support 1 %else # I586 -%define tizen_feature_media_key_support 0 +%define tizen_feature_media_key_support 0 %endif -%define tizen_feature_key_manager_support 0 -%define tizen_feature_message_port_support 1 -%define tizen_feature_messaging_support 0 +%define tizen_feature_key_manager_support 0 +%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 1 -%define tizen_feature_nfc_support 1 +%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 +%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 -%define tizen_feature_push_support 1 +%define tizen_feature_notification_support 1 +%define tizen_feature_package_support 1 +%define tizen_feature_power_support 1 +%define tizen_feature_push_support 1 %if 0%{?model_build_feature_smartcard } -%define tizen_feature_se_support 1 +%define tizen_feature_se_support 1 %else -%define tizen_feature_se_support 0 -%endif -%define tizen_feature_sensor_support 1 -%define tizen_feature_sound_support 1 -%define tizen_feature_system_info_support 1 -%define tizen_feature_system_setting_support 1 -%define tizen_feature_telephony_support 0 -%define tizen_feature_time_support 1 -%define tizen_feature_web_setting_support 0 -%define tizen_feature_wi_fi_support 1 -%define tizen_feature_tvaudio_support 0 -%define tizen_feature_tvchannel_support 0 -%define tizen_feature_tv_display_support 0 -%define tizen_feature_tvinputdevice_support 0 -%define tizen_feature_inputdevice_support 1 -%define tizen_feature_tvwindow_support 0 +%define tizen_feature_se_support 0 +%endif +%define tizen_feature_sensor_support 1 +%define tizen_feature_sound_support 1 +%define tizen_feature_system_info_support 1 +%define tizen_feature_system_setting_support 1 +%define tizen_feature_telephony_support 0 +%define tizen_feature_time_support 1 +%define tizen_feature_web_setting_support 0 +%define tizen_feature_wi_fi_support 1 +%define tizen_feature_tvaudio_support 0 +%define tizen_feature_tvchannel_support 0 +%define tizen_feature_tv_display_support 0 +%define tizen_feature_tvinputdevice_support 0 +%define tizen_feature_inputdevice_support 1 +%define tizen_feature_tvwindow_support 0 #- telephony related APIs # CallHistory API is optional in Tizen Wearable Profile. # NetworkBearerSelection API is optional in Tizen Wearable Profile. %if 0%{?tizen_feature_telephony_support} -%define tizen_feature_callhistory_support 1 -%define tizen_feature_nbs_support 1 +%define tizen_feature_callhistory_support 1 +%define tizen_feature_nbs_support 1 %else -%define tizen_feature_callhistory_support 0 -%define tizen_feature_nbs_support 0 +%define tizen_feature_callhistory_support 0 +%define tizen_feature_nbs_support 0 %endif %endif # tizen_profile_wearable @@ -227,56 +229,57 @@ Source0: %{name}-%{version}.tar.gz #################################################################### %if "%{?tizen_profile_name}" == "tv" -%define tizen_privilege_engine ACE - -%define tizen_feature_account_support 0 -%define tizen_feature_alarm_support 1 -%define tizen_feature_application_support 1 -%define tizen_feature_archive_support 1 -%define tizen_feature_badge_support 0 -%define tizen_feature_bluetooth_support 0 -%define tizen_feature_bookmark_support 0 -%define tizen_feature_calendar_support 0 -%define tizen_feature_callhistory_support 0 -%define tizen_feature_contact_support 0 -%define tizen_feature_content_support 1 -%define tizen_feature_datacontrol_support 0 -%define tizen_feature_datasync_support 0 -%define tizen_feature_download_support 1 -%define tizen_feature_exif_support 1 -%define tizen_feature_filesystem_support 1 -%define tizen_feature_fm_radio_support 0 -%define tizen_feature_ham_support 0 -%define tizen_feature_key_manager_support 0 -%define tizen_feature_media_controller_support 1 -%define tizen_feature_media_key_support 1 -%define tizen_feature_message_port_support 1 -%define tizen_feature_messaging_support 0 -%define tizen_feature_nbs_support 0 -%define tizen_feature_nfc_emulation_support 0 -%define tizen_feature_nfc_support 0 -%define tizen_feature_notification_support 0 -%define tizen_feature_package_support 1 -%define tizen_feature_power_support 0 -%define tizen_feature_push_support 0 -%define tizen_feature_se_support 0 -%define tizen_feature_sensor_support 0 -%define tizen_feature_sound_support 0 -%define tizen_feature_system_info_support 1 -%define tizen_feature_system_setting_support 0 -%define tizen_feature_telephony_support 0 -%define tizen_feature_time_support 1 -%define tizen_feature_web_setting_support 1 -%define tizen_feature_wi_fi_support 1 +%define tizen_privilege_engine ACE + +%define tizen_feature_account_support 0 +%define tizen_feature_alarm_support 1 +%define tizen_feature_app_control_settings_support 0 +%define tizen_feature_application_support 1 +%define tizen_feature_archive_support 1 +%define tizen_feature_badge_support 0 +%define tizen_feature_bluetooth_support 0 +%define tizen_feature_bookmark_support 0 +%define tizen_feature_calendar_support 0 +%define tizen_feature_callhistory_support 0 +%define tizen_feature_contact_support 0 +%define tizen_feature_content_support 1 +%define tizen_feature_datacontrol_support 0 +%define tizen_feature_datasync_support 0 +%define tizen_feature_download_support 1 +%define tizen_feature_exif_support 1 +%define tizen_feature_filesystem_support 1 +%define tizen_feature_fm_radio_support 0 +%define tizen_feature_ham_support 0 +%define tizen_feature_key_manager_support 0 +%define tizen_feature_media_controller_support 1 +%define tizen_feature_media_key_support 1 +%define tizen_feature_message_port_support 1 +%define tizen_feature_messaging_support 0 +%define tizen_feature_nbs_support 0 +%define tizen_feature_nfc_emulation_support 0 +%define tizen_feature_nfc_support 0 +%define tizen_feature_notification_support 0 +%define tizen_feature_package_support 1 +%define tizen_feature_power_support 0 +%define tizen_feature_push_support 0 +%define tizen_feature_se_support 0 +%define tizen_feature_sensor_support 0 +%define tizen_feature_sound_support 0 +%define tizen_feature_system_info_support 1 +%define tizen_feature_system_setting_support 0 +%define tizen_feature_telephony_support 0 +%define tizen_feature_time_support 1 +%define tizen_feature_web_setting_support 1 +%define tizen_feature_wi_fi_support 1 #off for tizen 3.0 (no libavoc) -%define tizen_feature_tvaudio_support 0 +%define tizen_feature_tvaudio_support 0 #off for tizen 3.0 (no tvs-api) -%define tizen_feature_tvchannel_support 0 +%define tizen_feature_tvchannel_support 0 #off for tizen 3.0 (no systeminfo definitions) -%define tizen_feature_tv_display_support 0 -%define tizen_feature_tvinputdevice_support 1 -%define tizen_feature_inputdevice_support 1 -%define tizen_feature_tvwindow_support 0 +%define tizen_feature_tv_display_support 0 +%define tizen_feature_tvinputdevice_support 1 +%define tizen_feature_inputdevice_support 1 +%define tizen_feature_tvwindow_support 0 %endif # tizen_profile_tv @@ -473,6 +476,7 @@ GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=x11" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_is_emulator=%{?tizen_is_emulator}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_account_support=%{?tizen_feature_account_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_alarm_support=%{?tizen_feature_alarm_support}" +GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_app_control_settings_support=%{?tizen_feature_app_control_settings_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_application_support=%{?tizen_feature_application_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_archive_support=%{?tizen_feature_archive_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_badge_support=%{?tizen_feature_badge_support}" diff --git a/src/nfc/nfc.gyp b/src/nfc/nfc.gyp index 886a51bf..25b02f9e 100644 --- a/src/nfc/nfc.gyp +++ b/src/nfc/nfc.gyp @@ -38,6 +38,9 @@ ] }, }], + ['tizen_feature_app_control_settings_support == 1', { + 'defines': ['APP_CONTROL_SETTINGS_SUPPORT'], + }], ], }, ], diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc index 5dbb7bfa..f183c1cd 100644 --- a/src/nfc/nfc_adapter.cc +++ b/src/nfc/nfc_adapter.cc @@ -212,7 +212,7 @@ bool NFCAdapter::GetPowered() { return nfc_manager_is_activated(); } -#ifndef APP_CONTROL_SETTING_SUPPORT +#ifndef APP_CONTROL_SETTINGS_SUPPORT static void NFCSetActivationCompletedCallback(nfc_error_e error, void* user_data) { @@ -299,7 +299,7 @@ static void transaction_event_callback(nfc_se_type_e type, NFCAdapter::GetInstance()->RespondAsync(response.serialize().c_str()); } -#ifdef APP_CONTROL_SETTING_SUPPORT +#ifdef APP_CONTROL_SETTINGS_SUPPORT static void PostMessage(double* callbackId) { picojson::value event = CreateEventError(*callbackId, PlatformResult(ErrorCode::UNKNOWN_ERR, @@ -326,7 +326,7 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) { return PlatformResult(ErrorCode::NO_ERROR); } -#ifdef APP_CONTROL_SETTING_SUPPORT +#ifdef APP_CONTROL_SETTINGS_SUPPORT app_control_h service = NULL; int ret = app_control_create(&service); @@ -337,8 +337,7 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) { return PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed."); } - ret = app_control_set_operation(service, - "http://tizen.org/appcontrol/operation/setting/nfc"); + ret = app_control_set_operation(service, "http://tizen.org/appcontrol/operation/setting/nfc"); if (ret != APP_CONTROL_ERROR_NONE) { LoggerE("app_control_set_operation failed: %d", ret); app_control_destroy(service); diff --git a/src/nfc/nfc_adapter.h b/src/nfc/nfc_adapter.h index 7c95d1ce..cec14c91 100644 --- a/src/nfc/nfc_adapter.h +++ b/src/nfc/nfc_adapter.h @@ -17,7 +17,7 @@ #ifndef NFC_NFC_ADAPTER_H_ #define NFC_NFC_ADAPTER_H_ -#ifdef APP_CONTROL_SETTING_SUPPORT +#ifdef APP_CONTROL_SETTINGS_SUPPORT #include #endif #include