From 7f60976c27a38b1061c23278141603014a21fef1 Mon Sep 17 00:00:00 2001 From: Dongjin Choi Date: Mon, 24 Jun 2013 19:31:17 +0900 Subject: [PATCH] Update change log and spec for wrt-plugins-tizen_0.4.46 [model] REDWOOD [binary_type] PDA [customer] OPEN [Systeminfo] Remove 'inputKeyMenu', 'inputKeyBack' attribute [team] WebAPI [request] N/A [horizontal_expansion] N/A --- packaging/wrt-plugins-tizen.spec | 2 +- src/SystemSetting/SystemSetting.cpp | 9 +++++---- src/Systeminfo/JSDeviceCapabilitiesInfo.cpp | 20 -------------------- src/Systeminfo/SysteminfoListener.cpp | 4 ++-- src/Systeminfo/SysteminfoPropertyInfo.h | 4 ---- 5 files changed, 8 insertions(+), 31 deletions(-) mode change 100644 => 100755 src/SystemSetting/SystemSetting.cpp mode change 100644 => 100755 src/Systeminfo/SysteminfoListener.cpp diff --git a/packaging/wrt-plugins-tizen.spec b/packaging/wrt-plugins-tizen.spec index 57d58a9..fe8f0e1 100755 --- a/packaging/wrt-plugins-tizen.spec +++ b/packaging/wrt-plugins-tizen.spec @@ -1,6 +1,6 @@ Name: wrt-plugins-tizen Summary: JavaScript plugins for WebRuntime -Version: 0.4.44 +Version: 0.4.46 Release: 0 Group: Development/Libraries License: Apache License, Version 2.0 diff --git a/src/SystemSetting/SystemSetting.cpp b/src/SystemSetting/SystemSetting.cpp old mode 100644 new mode 100755 index 774f75c..72abe42 --- a/src/SystemSetting/SystemSetting.cpp +++ b/src/SystemSetting/SystemSetting.cpp @@ -259,6 +259,8 @@ void SystemSetting::OnRequestReceived(const EventGetSettingPtr &event) { LoggerD("success"); event->setExceptionCode(ExceptionCodes::None); + settingValue = value; + event->setSettingValue(settingValue); } else { @@ -266,12 +268,11 @@ void SystemSetting::OnRequestReceived(const EventGetSettingPtr &event) event->setExceptionCode(ExceptionCodes::PlatformException); } - settingValue = value; - event->setSettingValue(settingValue); - + if (value) { + free(value); + } LoggerD("end"); } - } } diff --git a/src/Systeminfo/JSDeviceCapabilitiesInfo.cpp b/src/Systeminfo/JSDeviceCapabilitiesInfo.cpp index b6cf382..4bd2c52 100755 --- a/src/Systeminfo/JSDeviceCapabilitiesInfo.cpp +++ b/src/Systeminfo/JSDeviceCapabilitiesInfo.cpp @@ -106,8 +106,6 @@ const char* DEVICE_CAPABILITIES_VISION_QRCODE_RECOGNITION = "visionQrcodeRecogni const char* DEVICE_CAPABILITIES_VISION_FACE_RECOGNITION = "visionFaceRecognition"; const char* DEVICE_CAPABILITIES_SECURE_ELEMENT = "secureElement"; const char* DEVICE_CAPABILITIES_NATIVE_OSP_COMPATIBLE = "nativeOspCompatible"; -const char* DEVICE_CAPABILITIES_INPUT_KEY_BACK = "inputKeyBack"; -const char* DEVICE_CAPABILITIES_INPUT_KEY_OPTION = "inputKeyMenu"; const char* DEVICE_CAPABILITIES_PROFILE = "profile"; } @@ -201,8 +199,6 @@ JSStaticValue JSDeviceCapabilitiesInfo::m_properties[] = { { DEVICE_CAPABILITIES_VISION_FACE_RECOGNITION, getProperty, NULL, kJSPropertyAttributeReadOnly }, { DEVICE_CAPABILITIES_SECURE_ELEMENT, getProperty, NULL, kJSPropertyAttributeReadOnly }, { DEVICE_CAPABILITIES_NATIVE_OSP_COMPATIBLE, getProperty, NULL, kJSPropertyAttributeReadOnly }, - { DEVICE_CAPABILITIES_INPUT_KEY_BACK, getProperty, NULL, kJSPropertyAttributeReadOnly }, - { DEVICE_CAPABILITIES_INPUT_KEY_OPTION, getProperty, NULL, kJSPropertyAttributeReadOnly }, { DEVICE_CAPABILITIES_PROFILE, getProperty, NULL, kJSPropertyAttributeReadOnly }, { 0, 0, 0, 0 } }; @@ -788,22 +784,6 @@ JSValueRef JSDeviceCapabilitiesInfo::getProperty(JSContextRef context, JSObjectR deviceCapabilitiesInfo->nativeOspCompatible = getRegistry("platform.native.osp_compatible"); LoggerD("nativeOspCompatible : " << deviceCapabilitiesInfo->nativeOspCompatible); return convert.toJSValueRef(deviceCapabilitiesInfo->nativeOspCompatible); - } else if (JSStringIsEqualToUTF8CString(propertyName, DEVICE_CAPABILITIES_INPUT_KEY_BACK)) { - bool inputKeyBack = false; - if(system_info_get_platform_bool("tizen.org/feature/input.keys.back", &inputKeyBack) == SYSTEM_INFO_ERROR_NONE) { - deviceCapabilitiesInfo->inputKeyBack = inputKeyBack; - } else { - return JSValueMakeUndefined(context); - } - return convert.toJSValueRef(deviceCapabilitiesInfo->inputKeyBack); - } else if (JSStringIsEqualToUTF8CString(propertyName, DEVICE_CAPABILITIES_INPUT_KEY_OPTION)) { - bool inputKeyMenu = false; - if(system_info_get_platform_bool("tizen.org/feature/input.keys.menu", &inputKeyMenu) == SYSTEM_INFO_ERROR_NONE) { - deviceCapabilitiesInfo->inputKeyMenu = inputKeyMenu; - } else { - return JSValueMakeUndefined(context); - } - return convert.toJSValueRef(deviceCapabilitiesInfo->inputKeyMenu); } else if (JSStringIsEqualToUTF8CString(propertyName, DEVICE_CAPABILITIES_PROFILE)) { deviceCapabilitiesInfo->profile = DEVICE_PROFILE; return convert.toJSValueRef(deviceCapabilitiesInfo->profile); diff --git a/src/Systeminfo/SysteminfoListener.cpp b/src/Systeminfo/SysteminfoListener.cpp old mode 100644 new mode 100755 index e0b33a4..287d13f --- a/src/Systeminfo/SysteminfoListener.cpp +++ b/src/Systeminfo/SysteminfoListener.cpp @@ -34,8 +34,8 @@ SysteminfoListener& SysteminfoListener::getInstance() } SysteminfoListener::SysteminfoListener() : - EventGetSysteminfoAnswerReceiver(WrtDeviceApis::Commons::ThreadEnum::SYSTEMINFO_THREAD), - EventWatchSysteminfoAnswerReceiver(WrtDeviceApis::Commons::ThreadEnum::SYSTEMINFO_THREAD) + EventGetSysteminfoAnswerReceiver(WrtDeviceApis::Commons::ThreadEnum::NULL_THREAD), + EventWatchSysteminfoAnswerReceiver(WrtDeviceApis::Commons::ThreadEnum::NULL_THREAD) { } diff --git a/src/Systeminfo/SysteminfoPropertyInfo.h b/src/Systeminfo/SysteminfoPropertyInfo.h index 726ae2a..bb154f6 100755 --- a/src/Systeminfo/SysteminfoPropertyInfo.h +++ b/src/Systeminfo/SysteminfoPropertyInfo.h @@ -104,8 +104,6 @@ struct DeviceCapabilitiesProperties bool visionFaceRecognition; bool secureElement; bool nativeOspCompatible; - bool inputKeyBack; - bool inputKeyMenu; std::string profile; DeviceCapabilitiesProperties() : @@ -176,8 +174,6 @@ struct DeviceCapabilitiesProperties visionFaceRecognition(false), secureElement(false), nativeOspCompatible(false), - inputKeyBack(false), - inputKeyMenu(false), profile("") { } -- 2.7.4