commit 63ef1ff4e0a35a6f7d0b2851687dc97511f45c62
author android-build-team Robot <android-build-team-robot@google.com> Wed Nov 13 02:15:04 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Nov 13 02:15:04 2019 +0000
tree 96b79cebeec80a0c68eddfc7bb1a20d14d688c8f
parent 46af0c2a48d100348a11ced3ef6476103c279dc2
parent 6f3c5b7a7ed3489948816de2149b304c13e227f9

Snap for 6004191 from 6f3c5b7a7ed3489948816de2149b304c13e227f9 to qt-qpr2-release

Change-Id: I14890437b60c7df8b1a2ca3582248d7e22096d11

src/com/android/bluetooth/gatt/GattService.java

diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index 8a3a1aa..42c0bd7 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -1989,6 +1989,13 @@
         piInfo.settings = settings;
         piInfo.filters = filters;
         piInfo.callingPackage = callingPackage;
+
+        // Don't start scan if the Pi scan already in mScannerMap.
+        if (mScannerMap.getByContextInfo(piInfo) != null) {
+            Log.d(TAG, "Don't startScan(PI) since the same Pi scan already in mScannerMap.");
+            return;
+        }
+
         ScannerMap.App app = mScannerMap.add(uuid, null, null, piInfo, this);
         app.mUserHandle = UserHandle.of(UserHandle.getCallingUserId());
         mAppOps.checkPackage(Binder.getCallingUid(), callingPackage);