commit 61334588ce5851e102dd2f476a3660cf64798e2b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 23 18:00:36 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 23 18:00:36 2023 +0000
tree 1bd9bab2af6e728e512273066682465e15c91116
parent 883c34981f23d48cf3c72e42e164ba3717efc29e
parent 5ae74fcfc69402458ba6cdc42c17d855273e0d6c

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24946343'] into sc-v2-platform-release.

Change-Id: If28221b85b2d074655f4433a472de317433848c5

jni/com_android_bluetooth_btservice_AdapterService.cpp

diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 62c7d52..e26171e 100644
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -582,6 +582,7 @@
     }
     vm->DetachCurrentThread();
     sHaveCallbackThread = false;
+    callbackEnv = NULL;
   }
 }