From: Rafal Galka Date: Mon, 20 Jul 2015 09:23:20 +0000 (+0200) Subject: Merge branch 'tizen_2.4' into tizen_3.0 X-Git-Tag: submit/tizen_tv/20150720.124123^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0febf945597a85f4f6fbc9a47dc615988f44f096;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Merge branch 'tizen_2.4' into tizen_3.0 Change-Id: I2c8742df9c176e578de04da9da414ed99636cb64 --- 0febf945597a85f4f6fbc9a47dc615988f44f096 diff --cc packaging/webapi-plugins.spec index 2e45fc7e,02389230..5b37f23a --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@@ -26,103 -22,104 +26,104 @@@ Source0: %{name}-%{version}.tar.g #################################################################### # Mobile Profile : Redwood(SM-Z910F), KIRAN(Z130H) # #################################################################### -%if "%{?tizen_profile_name}" == "mobile" +%if "%{?profile}" == "mobile" - %define tizen_privilege_engine CYNARA -%define tizen_privilege_engine ACE ++%define tizen_privilege_engine CYNARA - %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_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 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 0 + %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_push_support 0 %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 0 - %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 @@@ -130,88 -127,89 +131,89 @@@ #################################################################### # Wearable Profile : B2 # #################################################################### -%if "%{?tizen_profile_name}" == "wearable" +%if "%{?profile}" == "wearable" - %define tizen_privilege_engine CYNARA -%define tizen_privilege_engine ACE ++%define tizen_privilege_engine CYNARA # 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 0 + %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_push_support 0 %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 0 - %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. @@@ -229,58 -227,59 +231,59 @@@ #################################################################### # TV Profile # #################################################################### -%if "%{?tizen_profile_name}" == "tv" +%if "%{?profile}" == "tv" - %define tizen_privilege_engine CYNARA - - %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_privilege_engine CYNARA + + %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 @@@ -554,7 -546,7 +558,9 @@@ install -p -m 644 src/common/XW_Extensi mkdir -p %{buildroot}%{_includedir}/%{name}/tools install -p -m 644 tools/generate_api.py %{buildroot}%{_includedir}/%{name}/tools install -p -m 644 tools/mergejs.py %{buildroot}%{_includedir}/%{name}/tools ++install -p -m 644 tools/js_minimize.py %{buildroot}%{_includedir}/%{name}/tools cp -a tools/gyp %{buildroot}%{_includedir}/%{name}/tools/gyp ++cp -a tools/slimit %{buildroot}%{_includedir}/%{name}/tools/slimit %if 0%{?tizen_feature_tvaudio_support} # tv audio beep files: diff --cc src/application/application_manager.cc index 7955155e,bf29e8ab..cb8bb4ea --- a/src/application/application_manager.cc +++ b/src/application/application_manager.cc @@@ -1099,31 -1085,14 +1085,18 @@@ class ApplicationListChangedBroker kUninstalled, }; - #if defined(TIZEN_TV) - static int ClientStatusListener(unsigned int target_uid, int id, const char* type, const char* package, const char* key, - const char* val, const void* msg, void* data) { - LoggerD("Entered"); - ApplicationListChangedBroker* that = static_cast(data); - - if (0 == strcasecmp(key, kStartKey)) { - that->HandleStart(val, package); - } else if (0 == strcasecmp(key, kEndKey) && 0 == strcasecmp(val, kOkValue)) { - that->HandleEnd(package); - } else { - LoggerD("Ignored key: %s", key); - } - - return 0; - } - #else -- static int ClientStatusListener(int id, const char* type, const char* package, const char* key, -- const char* val, const void* msg, void* data) { ++ static int ClientStatusListener(unsigned int target_uid, int id, ++ const char* type, const char* package, ++ const char* key, ++ const char* val, const void* msg, ++ void* data) { LoggerD("Entered"); ApplicationListChangedBroker* that = static_cast(data); if (0 == strcasecmp(key, kStartKey)) { that->HandleStart(val, package); -- } else if (0 == strcasecmp(key, kEndKey) && 0 == strcasecmp(val, kOkValue)) { ++ } else if (0 == strcasecmp(key, kEndKey) && ++ 0 == strcasecmp(val, kOkValue)) { that->HandleEnd(package); } else { LoggerD("Ignored key: %s", key);