projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unnecessary BLE code related to u_arraylist_t
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
connectivity
/
src
/
bt_le_adapter
/
android
/
caleserver.c
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
(file)
--- 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);
(*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);
ca_mutex_unlock(g_connectedDeviceListMutex);
- return
res
;
+ return
CA_STATUS_FAILED
;
}
ca_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_OK;
}
ca_mutex_unlock(g_connectedDeviceListMutex);
return CA_STATUS_OK;
@@
-2041,19
+2040,6
@@
CAResult_t CALEServerRemoveDevice(JNIEnv *env, jstring address)
return CA_STATUS_FAILED;
}
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)
JNIEXPORT void JNICALL
Java_org_iotivity_ca_CaLeServerInterface_caLeRegisterGattServerCallback(JNIEnv *env, jobject obj,
jobject callback)