From: Rafal Galka Date: Tue, 30 Jun 2015 07:40:25 +0000 (+0200) Subject: Merge branch 'tizen_2.4' into tizen_3.0 X-Git-Tag: submit/tizen/20150702.103311^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fe9f7f249e4be1d320a349074e0d6f893bc0e9c;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Merge branch 'tizen_2.4' into tizen_3.0 Change-Id: I0d6bd8d574e27473e84d8fe407b112957c18bf2f --- 4fe9f7f249e4be1d320a349074e0d6f893bc0e9c diff --cc packaging/webapi-plugins.spec index d12d2d47,03a4c5c9..af67bb3d --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@@ -50,10 -53,10 +57,10 @@@ Source0: %{name}-%{version}.tar.g %define tizen_feature_ham_support 0 %else # I586 -%define tizen_feature_ham_support 1 +%define tizen_feature_ham_support 0 %endif %define tizen_feature_location_batch 0 - %define tizen_feature_key_manager_support 1 + %define tizen_feature_key_manager_support 0 %define tizen_feature_media_controller_support 1 %ifarch %{arm} # ARM @@@ -229,8 -232,8 +236,8 @@@ %define tizen_feature_application_support 1 %define tizen_feature_archive_support 1 %define tizen_feature_badge_support 1 --%define tizen_feature_bluetooth_support 0 -%define tizen_feature_bookmark_support 0 ++%define tizen_feature_bluetooth_support 1 +%define tizen_feature_bookmark_support 1 %define tizen_feature_calendar_support 0 %define tizen_feature_callhistory_support 0 %define tizen_feature_contact_support 0 @@@ -250,9 -253,9 +257,9 @@@ %define tizen_feature_nbs_support 0 %define tizen_feature_nfc_emulation_support 0 %define tizen_feature_nfc_support 0 -%define tizen_feature_notification_support 1 +%define tizen_feature_notification_support 0 %define tizen_feature_package_support 1 --%define tizen_feature_power_support 0 ++%define tizen_feature_power_support 1 %define tizen_feature_push_support 0 %define tizen_feature_se_support 0 %define tizen_feature_sensor_support 0 @@@ -458,10 -464,11 +475,11 @@@ webapi-plugins development header %build export GYP_GENERATORS='ninja' -GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Debug -Dextension_host_os=%{tizen_profile_name} -Dprivilege_engine=%{tizen_privilege_engine}" -GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=x11" +GYP_OPTIONS="--depth=. -Dtizen=1 -Dextension_build_type=Debug -Dextension_host_os=%{profile} -Dprivilege_engine=%{tizen_privilege_engine}" +GYP_OPTIONS="$GYP_OPTIONS -Ddisplay_type=%{display_type}" # feature flags + 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_application_support=%{?tizen_feature_application_support}" diff --cc src/sound/sound_manager.cc index 188f9635,58a2bd72..c0d02c18 --- a/src/sound/sound_manager.cc +++ b/src/sound/sound_manager.cc @@@ -582,10 -582,10 +582,11 @@@ void DeviceActivationChangeCB(sound_dev void *user_data) { LoggerD("Entered"); - if (SOUND_DEVICE_CAHNGED_INFO_STATE == changed_info) { - if (SOUND_DEVICE_CHANGED_INFO_STATE == changed_info) { ++ // TODO(r.galka) SOUND_DEVICE_CHANGED_INFO_STATE is not defined in platform (deprecated?) ++ /*if (SOUND_DEVICE_CHANGED_INFO_STATE == changed_info) { SoundManager* h = static_cast(user_data); h->DeviceChangeCB(device, false, true); -- } ++ }*/ } PlatformResult SoundManager::AddDeviceStateChangeListener() { diff --cc src/utils/utils_instance.cc index 102eadae,45b0fb32..6945c65c --- a/src/utils/utils_instance.cc +++ b/src/utils/utils_instance.cc @@@ -26,6 -36,69 +36,69 @@@ UtilsInstance::UtilsInstance() #undef REGISTER_ASYNC } + void UtilsInstance::GetPkgApiVersion(const picojson::value& args, picojson::object& out) { + LoggerD("Entered"); + + char* app_id = nullptr; + char* pkgid = nullptr; + app_info_h app_handle = nullptr; + pkgmgrinfo_pkginfo_h pkginfo_handle = nullptr; + char *api_version = nullptr; + + SCOPE_EXIT { + if (app_id) { + free(app_id); + } + if (pkgid) { + free(pkgid); + } + if (app_handle) { + app_info_destroy(app_handle); + } + if (pkginfo_handle) { + pkgmgrinfo_pkginfo_destroy_pkginfo(pkginfo_handle); + } + }; + + pid_t pid = getpid(); + int ret = app_manager_get_app_id(pid, &app_id); + if (ret != APP_MANAGER_ERROR_NONE) { + LoggerE("Failed to get app id"); + ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get app id"), &out); + return; + } + + ret = app_info_create(app_id, &app_handle); + if (ret != APP_MANAGER_ERROR_NONE) { + LoggerE("Fail to get app info"); + ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Fail to get app info"), &out); + return; + } + + ret = app_info_get_package(app_handle, &pkgid); + if ((ret != APP_MANAGER_ERROR_NONE) || (pkgid == nullptr)) { + LoggerE("Fail to get pkg id"); + ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Fail to get pkg id"), &out); + return; + } + + ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &pkginfo_handle); + if (ret != PMINFO_R_OK) { + LoggerE("Fail to get pkginfo_h"); + ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Fail to get pkginfo_h"), &out); + return; + } + - ret = pkgmgrinfo_pkginfo_get_api_version(pkginfo_handle, &api_version); ++ ret = pkgmgrinfo_pkginfo_get_version(pkginfo_handle, &api_version); + if (ret != PMINFO_R_OK) { + LoggerE("Fail to get api version"); + ReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Fail to get api version"), &out); + return; + } + + ReportSuccess(picojson::value(api_version), out); + } + void UtilsInstance::CheckPrivilegeAccess(const picojson::value& args, picojson::object& out) { LoggerD("Entered"); const auto& privilege = args.get("privilege").to_str();