X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=resource%2Fcsdk%2Fconnectivity%2Fsrc%2Fbt_le_adapter%2Fandroid%2Fcaleserver.c;h=8f8ec3460cbe691100618c8a06fe39c70ddf1a57;hb=c0d343ad461c6506b2e9ddcb729151740a5e87b3;hp=52df9eca62bfa0ff1dcadfbb11ba0ac496634fd2;hpb=7e4a6362267752ce68bef6f7d9bcfa9f7c3e108b;p=platform%2Fupstream%2Fiotivity.git

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
index 52df9ec..8f8ec34 100644
--- a/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/android/caleserver.c
@@ -2018,12 +2018,11 @@ CAResult_t CALEServerRemoveDevice(JNIEnv *env, jstring address)
                 (*env)->ReleaseStringUTFChars(env, address, remoteAddress);
                 (*env)->DeleteGlobalRef(env, jarrayObj);
 
-                CAResult_t res = CALEServerReorderinglist(index);
-                if (CA_STATUS_OK != res)
+                if (NULL == u_arraylist_remove(g_connectedDeviceList, index))
                 {
-                    OIC_LOG(ERROR, TAG, "CALEServerReorderinglist has failed");
+                    OIC_LOG(ERROR, TAG, "List removal failed.");
                     ca_mutex_unlock(g_connectedDeviceListMutex);
-                    return res;
+                    return CA_STATUS_FAILED;
                 }
                 ca_mutex_unlock(g_connectedDeviceListMutex);
                 return CA_STATUS_OK;
@@ -2041,19 +2040,6 @@ CAResult_t CALEServerRemoveDevice(JNIEnv *env, jstring address)
     return CA_STATUS_FAILED;
 }
 
-CAResult_t CALEServerReorderinglist(uint32_t index)
-{
-    if (u_arraylist_remove(g_connectedDeviceList, index) == NULL)
-    {
-        OIC_LOG(ERROR, TAG, "List removal failed.");
-        return CA_STATUS_FAILED;
-    }
-    else
-    {
-        return CA_STATUS_OK;
-    }
-}
-
 JNIEXPORT void JNICALL
 Java_org_iotivity_ca_CaLeServerInterface_caLeRegisterGattServerCallback(JNIEnv *env, jobject obj,
                                                                         jobject callback)