From 1c06bbdf66704cf916f25b6830534707fb90e5c2 Mon Sep 17 00:00:00 2001 From: "tawhwan.son" Date: Wed, 27 Mar 2013 08:57:49 +0900 Subject: [PATCH] apply ACR for wake-up feature exception Change-Id: Id80d0555efdce12b77c2fa754c7e9cc26ae530a8 Signed-off-by: tawhwan.son --- inc/FUixSensorSensorManager.h | 22 ++++++++++++++-------- src/FUixSensor_ISensorCore.cpp | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/inc/FUixSensorSensorManager.h b/inc/FUixSensorSensorManager.h index 3de6882..29eb905 100644 --- a/inc/FUixSensorSensorManager.h +++ b/inc/FUixSensorSensorManager.h @@ -2,11 +2,11 @@ // Open Service Platform // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Apache License, Version 2.0 (the License); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.tizenopensource.org/license +// http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an AS IS BASIS, @@ -614,7 +614,8 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The sensor type is invalid. * @exception E_OPERATION_FAILED The operation has failed. - * @exception E_UNSUPPORTED_OPERATION The target device does not support the specific sensor. + * @exception E_UNSUPPORTED_OPERATION The target device does not support the specific sensor,or @n + * the target device does not support wake-up feature originally or based on the specific sensor. * @remarks The specific error code can be accessed using the GetLastResult() method. * @remarks This method cannot be tested on the Emulator. It always returns true on the Emulator. */ @@ -625,7 +626,8 @@ public: * @page CompSensorManagerIsWakeupSupportedPage Compatibility for IsWakeupSupported() * @section CompSensorManagerIsWakeupSupportedIssueSection Issues * Implementing this method in OSP compatible applications has the following issues: @n - * -# The method returns E_DEVICE_UNAVAILABLE if the target device does not support the specific sensor. + * -# The method returns E_DEVICE_UNAVAILABLE if the target device does not support the specific sensorl,or @n + * the target device does not support wake-up feature originally or based on the specific sensor. * * @section CompSensorManagerIsWakeupSupportedSolutionSection Resolutions * This issue has been resolved in Tizen. @n @@ -654,7 +656,8 @@ public: * @exception E_INVALID_STATE There is no sensor listener registered for this type. * @exception E_INVALID_ARG The sensor type is invalid. * @exception E_OPERATION_FAILED The operation has failed. - * @exception E_UNSUPPORTED_OPERATION The target device does not support the specific sensor. + * @exception E_UNSUPPORTED_OPERATION The target device does not support the specific sensor,or @n + * the target device does not support wake-up feature originally or based on the specific sensor. * @remarks The wake up feature is automatically disabled by the system as soon as the calling application is terminated. * @remarks This method cannot be tested on the Emulator. It always returns @c E_SUCCESS on the Emulator. */ @@ -665,7 +668,8 @@ public: * @page CompSensorManagerSetWakeupEnabledPage Compatibility for SetWakeupEnabled() * @section CompSensorManagerSetWakeupEnabledIssueSection Issues * Implementing this method in OSP compatible applications has the following issues: @n - * -# The method returns E_DEVICE_UNAVAILABLE if the target device does not support the specific sensor. + * -# The method returns E_DEVICE_UNAVAILABLE if the target device does not support the specific sensor,or @n + * the target device does not support wake-up feature originally or based on the specific sensor. * * @section CompSensorManagerSetWakeupEnabledSolutionSection Resolutions * This issue has been resolved in Tizen. @n @@ -691,7 +695,8 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The sensor type is invalid. * @exception E_OPERATION_FAILED The operation has failed. - * @exception E_UNSUPPORTED_OPERATION The target device does not support the specific sensor. + * @exception E_UNSUPPORTED_OPERATION The target device does not support the specific sensor,or @n + * the target device does not support wake-up feature originally or based on the specific sensor. * @remarks The specific error code can be accessed using the GetLastResult() method. * @remarks This method cannot be tested on the Emulator. It always returns @c true on the Emulator. */ @@ -702,7 +707,8 @@ public: * @page CompSensorManagerIsWakeupEnabledPage Compatibility for IsWakeupEnabled() * @section CompSensorManagerIsWakeupEnabledIssueSection Issues * Implementing this method in OSP compatible applications has the following issues: @n - * -# The method returns E_DEVICE_UNAVAILABLE if the target device does not support the specific sensor. + * -# The method returns E_DEVICE_UNAVAILABLE if the target device does not support the specific sensor,or @n + * the target device does not support wake-up feature originally or based on the specific sensor. * * @section CompSensorManagerIsWakeupEnabledSolutionSection Resolutions * This issue has been resolved in Tizen. @n diff --git a/src/FUixSensor_ISensorCore.cpp b/src/FUixSensor_ISensorCore.cpp index a5bfb20..953d07e 100644 --- a/src/FUixSensor_ISensorCore.cpp +++ b/src/FUixSensor_ISensorCore.cpp @@ -953,7 +953,7 @@ _ISensorCore::IsWakeupSupported(SensorType sensorType) else { SysAssertf(false, "IsWakeupSupported() > sensor_get_delay_boundary() failed. [sensorTypeE:%d, result:%d]", sensorTypeE, sensorResult); - SetLastResult(E_OPERATION_FAILED); + SetLastResult(E_UNSUPPORTED_OPERATION); return false; } } -- 2.7.4