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

Commit 08c8b977 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: afa7a39b

Change-Id: If56e2af15bb66b10279df1a6810231a70f16b5cc
parents c1d4f9c0 afa7a39b

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

+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);