Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b71a922b authored by weichinweng's avatar weichinweng Committed by android-build-merger
Browse files

Merge "BLE: Don't start scan if the same Pi scan is running." am: bec5b1c5 am: a2c9f3bc

am: bc892d5a

Change-Id: Idb9eeddd7c2cf9407f60cb4bab92cb3816915fe7
parents b58e7fe8 bc892d5a
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -1989,6 +1989,13 @@ public class GattService extends ProfileService {
        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);