Update change log and spec for wrt-plugins-tizen_0.4.70

[framework/web/wrt-plugins-tizen.git] / src / Bluetooth / JSBluetoothHealthChannel.cpp

diff --git a/src/Bluetooth/JSBluetoothHealthChannel.cpp b/src/Bluetooth/JSBluetoothHealthChannel.cpp
index e1a683c..3ee4bf3 100644 (file)
--- a/src/Bluetooth/JSBluetoothHealthChannel.cpp
+++ b/src/Bluetooth/JSBluetoothHealthChannel.cpp
@@ -148,19 +148,17 @@ JSValueRef JSBluetoothHealthChannel::sendData(JSContextRef context,
 
     TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
 
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("sendData::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_HEALTH_CHANNEL_API_SEND_DATA);
-    TIME_TRACER_ITEM_END("sendData::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
-
     try {
         // Private Object
         BluetoothHealthChannelPtr priv = static_cast<BluetoothHealthChannelPtr>(JSObjectGetPrivate(thisObject));
         if (!priv) {
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
-    
+           // Access Check
+           TIME_TRACER_ITEM_BEGIN("sendData::ACE", 1);;
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_HEALTH_CHANNEL_API_SEND_DATA);           
+           TIME_TRACER_ITEM_END("sendData::ACE", 1);;
+       
         ArgumentValidator validator(context, argumentCount, arguments);
 
         JSObjectRef dataArrayObj  = validator.toArrayObject(0);  // data
@@ -193,13 +191,9 @@ JSValueRef JSBluetoothHealthChannel::close(JSContextRef context,
 {
     LoggerD("Enter");
 
-    TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
+    TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);
     
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("close::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_HEALTH_CHANNEL_API_CLOSE);
-    TIME_TRACER_ITEM_END("close::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+
 
     try {
         // Private Object
@@ -207,6 +201,10 @@ JSValueRef JSBluetoothHealthChannel::close(JSContextRef context,
         if (!priv) {
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
+           // Access Check
+           TIME_TRACER_ITEM_BEGIN("close::ACE", 1);;
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_HEALTH_CHANNEL_API_CLOSE);
+           TIME_TRACER_ITEM_END("close::ACE", 1);;
 
         priv->close();
         TIME_TRACER_ITEM_END(__FUNCTION__, 1);;
@@ -231,11 +229,7 @@ JSValueRef JSBluetoothHealthChannel::setListener(JSContextRef context,
 
     TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
     
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("setListener::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_HEALTH_CHANNEL_API_SET_LISTENER);
-    TIME_TRACER_ITEM_END("setListener::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
+
 
     try {
         // Private Object
@@ -244,6 +238,12 @@ JSValueRef JSBluetoothHealthChannel::setListener(JSContextRef context,
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
 
+               // Access Check
+               TIME_TRACER_ITEM_BEGIN("setListener::ACE", 1);;
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_HEALTH_CHANNEL_API_SET_LISTENER);
+               TIME_TRACER_ITEM_END("setListener::ACE", 1);;
+               
+
         // Validate arguments
         ArgumentValidator validator(context, argumentCount, arguments);
 
@@ -294,11 +294,6 @@ JSValueRef JSBluetoothHealthChannel::unsetListener(JSContextRef context,
 
     TIME_TRACER_ITEM_BEGIN(__FUNCTION__, 1);;
     
-    // Access Check
-    TIME_TRACER_ITEM_BEGIN("unsetListener::ACE", 1);;
-    AceSecurityStatus status = BLUETOOTH_CHECK_ACCESS(BLUETOOTH_HEALTH_CHANNEL_API_UNSET_LISTENER);
-    TIME_TRACER_ITEM_END("unsetListener::ACE", 1);;
-    TIZEN_SYNC_ACCESS_HANDLER(status, context, exception);
 
     try {
         // Private Object
@@ -306,6 +301,11 @@ JSValueRef JSBluetoothHealthChannel::unsetListener(JSContextRef context,
         if (!priv) {
             throw DeviceAPI::Common::UnknownException("Private object is NULL.");
         }
+               // Access Check
+               TIME_TRACER_ITEM_BEGIN("unsetListener::ACE", 1);
+               TIZEN_CHECK_ACCESS(context, exception, priv, BLUETOOTH_HEALTH_CHANNEL_API_UNSET_LISTENER);
+               TIME_TRACER_ITEM_END("unsetListener::ACE", 1);
+
 
         priv->unsetListener();
         TIME_TRACER_ITEM_END(__FUNCTION__, 1);;