X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Futil%2Fsrc%2Fcamanager%2Fbt_le_manager%2Fandroid%2Fcaleconnectionmanager.c;fp=resource%2Fcsdk%2Fconnectivity%2Futil%2Fsrc%2Fcamanager%2Fandroid%2Fcaleconnectionmanager.c;h=532ee7013eaac92b3f707a3dfa6d4b692436a806;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=fcecd59f400dc17bb27a516817ea36bed2a3f60a;hpb=edcfc3d2329da7b914771c0dcff5f42c9b74fd93;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
similarity index 95%
rename from resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
rename to resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
index fcecd59..532ee70 100644
--- a/resource/csdk/connectivity/util/src/camanager/android/caleconnectionmanager.c
+++ b/resource/csdk/connectivity/util/src/camanager/bt_le_manager/android/caleconnectionmanager.c
@@ -286,6 +286,38 @@ void CAManagerLESetScanInterval(jint interval, jint count)
     CALERestartScanWithInterval(interval, count, BLE_SCAN_ENABLE);
 }
 
+void CAManagerLEStopScan()
+{
+    OIC_LOG(DEBUG, TAG, "CAManagerLEStopScan");
+    CALERestartScanWithInterval(0, 0, BLE_SCAN_DISABLE);
+}
+
+void CAManagerSetConfigure(CAUtilConfig_t config)
+{
+    OIC_LOG_V(INFO, TAG, "set configure for bleFlags : %d", config.bleFlags);
+    caglobals.bleFlags = config.bleFlags;
+}
+
+CAResult_t CAManagerLEStartAdvertising()
+{
+    CAResult_t ret = CALEServerStartAdvertise();
+    if (CA_STATUS_OK != ret)
+    {
+        OIC_LOG(ERROR, TAG, "CALEServerStartAdvertise has failed");
+    }
+    return ret;
+}
+
+CAResult_t CAManagerLEStopAdvertising()
+{
+    CAResult_t ret = CALEServerStopAdvertise();
+    if (CA_STATUS_OK != ret)
+    {
+        OIC_LOG(ERROR, TAG, "CAManagerLEStopAdvertising has failed");
+    }
+    return ret;
+}
+
 JNIEXPORT void JNICALL
 Java_org_iotivity_ca_CaLeClientInterface_caManagerAdapterStateChangedCallback(
         JNIEnv *env, jobject obj, jint state)
@@ -403,9 +435,6 @@ JNIEXPORT void JNICALL
 Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB(
         JNIEnv *env, jobject obj, jobject gatt, jint status, jint newState)
 {
-    OIC_LOG_V(INFO, TAG, "caManagerLeGattConnectionStateChangeCB - status %d, newState %d",
-              status, newState);
-
     VERIFY_NON_NULL_VOID(env, TAG, "env");
     VERIFY_NON_NULL_VOID(obj, TAG, "obj");
     VERIFY_NON_NULL_VOID(gatt, TAG, "gatt");
@@ -428,12 +457,8 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB(
         return;
     }
 
-    OIC_LOG_V(DEBUG, TAG, "caManagerLeGattConnectionStateChangeCB - address [%s]", address);
-
     if (GATT_SUCCESS == status && state_connected == newState) // le connected
     {
-        OIC_LOG(DEBUG, TAG, "LE is connected");
-
         CAResult_t res = CAManagerReadRemoteRssi(env, gatt);
         if (CA_STATUS_OK != res)
         {
@@ -443,8 +468,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeGattConnectionStateChangeCB(
     }
     else if (state_disconnected == newState)// le disconnected
     {
-        OIC_LOG(DEBUG, TAG, "LE is disconnected");
-
         if (LINK_LOSS == status || REMOTE_DISCONNECT == status)
         {
             if (!CAManagerIsInACDataList(env, jni_address))
@@ -485,7 +508,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
                                                                                jobject gatt,
                                                                                jint status)
 {
-    OIC_LOG_V(INFO, TAG, "caManagerLeServicesDiscoveredCallback - status %d", status);
     VERIFY_NON_NULL_VOID(env, TAG, "env");
     VERIFY_NON_NULL_VOID(obj, TAG, "obj");
     VERIFY_NON_NULL_VOID(gatt, TAG, "gatt");
@@ -494,7 +516,8 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
     {
         if (!g_connectedDeviceSet)
         {
-            OIC_LOG(ERROR, TAG, "g_connectedDeviceSet is null");
+            OIC_LOG(INFO, TAG, "g_connectedDeviceSet is needed for CM. "
+                    "please call CAManagerLEClientInitialize");
             return;
         }
 
@@ -513,8 +536,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
             return;
         }
 
-        OIC_LOG_V(DEBUG, TAG, "ServicesDiscovered device : %s", address);
-
         if (CAManagerIsConnectedDeviceAddress(env, g_context, jni_address, g_connectedDeviceSet))
         {
             OIC_LOG(INFO, TAG, "AC list - the address will be added to ACData list");
@@ -532,8 +553,6 @@ Java_org_iotivity_ca_CaLeClientInterface_caManagerLeServicesDiscoveredCallback(J
 
         (*env)->ReleaseStringUTFChars(env, jni_address, address);
         (*env)->DeleteLocalRef(env, jni_address);
-
-        OIC_LOG(INFO, TAG, "ServicesDiscovery is successful");
     }
     else
     {