Removed unnecessary EDR code related to u_arraylist_t

It is about the code after Change 2205 merged.
https://gerrit.iotivity.org/gerrit/#/c/2205/

Change-Id: I65920d410f209998a1525bc5a2434ee09e789791
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2217
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
index e874a7f..5a8a231 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.c
@@ -525,7 +525,7 @@ void CAEDRNativeRemoveDevice(const char *remoteAddress)
             OIC_LOG_V(DEBUG, TAG, "[EDR][Native] remove state : %s", remoteAddress);
             OICFree(state);
 
-            CAEDRReorderingDeviceList(index);
+            u_arraylist_remove(g_deviceStateList, index);
             break;
         }
     }
@@ -569,11 +569,6 @@ CAConnectedState_t CAEDRIsConnectedDevice(const char *remoteAddress)
     return STATE_DISCONNECTED;
 }
 
-void CAEDRReorderingDeviceList(uint32_t index)
-{
-    u_arraylist_remove(g_deviceStateList, index);
-}
-
 /**
  * Device Socket Object List
  */
@@ -796,7 +791,7 @@ void CAEDRNativeRemoveDeviceSocket(JNIEnv *env, jobject deviceSocket)
             (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
             (*env)->ReleaseStringUTFChars(env, jni_remoteAddress, remoteAddress);
 
-            CAEDRReorderingDeviceSocketList(index);
+            u_arraylist_remove(g_deviceObjectList, index);
             break;
         }
         (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
@@ -844,7 +839,7 @@ void CAEDRNativeRemoveDeviceSocketBaseAddr(JNIEnv *env, jstring address)
             (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
             (*env)->ReleaseStringUTFChars(env, address, remoteAddress);
 
-            CAEDRReorderingDeviceSocketList(index);
+            u_arraylist_remove(g_deviceObjectList, index);
             break;
         }
         (*env)->ReleaseStringUTFChars(env, jni_setAddress, setAddress);
@@ -927,8 +922,3 @@ uint32_t CAEDRGetSocketListLength()
 
     return length;
 }
-
-void CAEDRReorderingDeviceSocketList(uint32_t index)
-{
-    u_arraylist_remove(g_deviceObjectList, index);
-}

diff --git a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
index 00ddffc..ec12615 100644 (file)
--- a/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
+++ b/resource/csdk/connectivity/src/bt_edr_adapter/android/caedrutils.h
@@ -130,12 +130,6 @@ void CAEDRNativeRemoveDevice(const char *remoteAddress);
 CAConnectedState_t CAEDRIsConnectedDevice(const char *remoteAddress);
 
 /**
- * Reordering for the list.
- * @param[in]   index           index of device list that want to reordering.
- */
-void CAEDRReorderingDeviceList(uint32_t index);
-
-/**
  * This function will create the device socket list.
  */
 void CAEDRNativeCreateDeviceSocketList();
@@ -196,11 +190,6 @@ jobject CAEDRNativeGetDeviceSocketBaseAddr(JNIEnv *env, const char* remoteAddres
  */
 uint32_t CAEDRGetSocketListLength();
 
-/**
- * Reordering for the list.
- * @param[in]   index           index of device list that want to reordering.
- */
-void CAEDRReorderingDeviceSocketList(uint32_t index);
 #ifdef __cplusplus
 } /* extern "C" */
 #endif