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

Commit 0c7a7446 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Fix ScannerMap leak" am: 4f01da1b 

am: 9643f1ef

Change-Id: Iadcb0359bde1b3292b63f73b7c6f7586bb75d7c8
parents 2ae4028e 9643f1ef

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

+1 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,6 @@ public class GattService extends ProfileService { 
            enforceImpersonatationPermission();

        }



        mScannerMap.add(uuid, workSource, callback, null, this);

        AppScanStats app = mScannerMap.getAppScanStatsByUid(Binder.getCallingUid());

        if (app != null && app.isScanningTooFrequently()

                && checkCallingOrSelfPermission(BLUETOOTH_PRIVILEGED) != PERMISSION_GRANTED) {
@@ -1586,6 +1585,7 @@ public class GattService extends ProfileService { 
            return;

        }



        mScannerMap.add(uuid, workSource, callback, null, this);

        mScanManager.registerScanner(uuid);

    }