commit 7023824e385fe5222831902e7ef1abb6a36a6661
author Jakub Pawlowski <jpawlowski@google.com> Wed Dec 14 14:52:52 2016 -0800
committer gitbuildkicker <android-build@google.com> Wed Dec 14 15:36:10 2016 -0800
tree 30186d943ad666e73498c19a07d3accf5643131b
parent 818acdd7951f1dde8a7909fcb4afafb3d184b0a1

Fix BT stack crashing on GATT discovery

Bug: 33577836
Test: manual test
Change-Id: I3b00490cb087b6da709332c30c2e50cba9d5e1a8
(cherry picked from commit 43ce695b516f2b824ea628246b0e925d800618bb)

jni/com_android_bluetooth_gatt.cpp

diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp
index ce23f3d..880d81c 100644
--- a/jni/com_android_bluetooth_gatt.cpp
+++ b/jni/com_android_bluetooth_gatt.cpp
@@ -500,7 +500,7 @@
 
     jobject uuid = env->NewObject(uuidClazz, uuidConstructor,
                                   uuid_msb(&curr.uuid), uuid_lsb(&curr.uuid));
-    fid = env->GetFieldID(gattDbElementClazz, "uuid", "java/util/UUID");
+    fid = env->GetFieldID(gattDbElementClazz, "uuid", "Ljava/util/UUID;");
     env->SetObjectField(element, fid, uuid);
     env->DeleteLocalRef(uuid);
 
@@ -1521,7 +1521,7 @@
     fid = env->GetFieldID(gattDbElementClazz, "id", "I");
     curr.id = env->GetIntField(element, fid);
 
-    fid = env->GetFieldID(gattDbElementClazz, "uuid", "java/util/UUID");
+    fid = env->GetFieldID(gattDbElementClazz, "uuid", "Ljava/util/UUID;");
     jobject uuid = env->GetObjectField(element, fid);
 
     jlong uuid_msb = env->CallLongMethod(uuid, uuidGetMsb);