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

Commit 477e6230 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Check permission before sending batch scan result am: 77a75559 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/13063897

Change-Id: I87622ce9dce02fab58b59e4adb12fc9fdfa317a9
parents ed5eb9f4 77a75559

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

+28 −0
Original line number Diff line number Diff line
@@ -1219,6 +1219,15 @@ public class GattService extends ProfileService { 
        mScanManager.callbackDone(clientIf, status);

    }



    ScanClient findBatchScanClientById(int scannerId) {

        for (ScanClient client : mScanManager.getBatchScanQueue()) {

            if (client.scannerId == scannerId) {

                return client;

            }

        }

        return null;

    }



    void onBatchScanReports(int status, int scannerId, int reportType, int numRecords,

            byte[] recordData) throws RemoteException {

        if (DBG) {
@@ -1231,6 +1240,18 @@ public class GattService extends ProfileService { 
            // We only support single client for truncated mode.

            ScannerMap.App app = mScannerMap.getById(scannerId);

            if (app == null) return;



            ScanClient client = findBatchScanClientById(scannerId);

            if (client == null) {

                return;

            }



            // Do no report if location mode is OFF or the client has no location permission

            // PEERS_MAC_ADDRESS permission holders always get results

            if (!hasScanResultPermission(client)) {

                return;

            }



            if (app.callback != null) {

                app.callback.onBatchScanResults(new ArrayList<ScanResult>(results));

            } else {
@@ -1270,6 +1291,13 @@ public class GattService extends ProfileService { 
            RemoteException {

        ScannerMap.App app = mScannerMap.getById(client.scannerId);

        if (app == null) return;



        // Do no report if location mode is OFF or the client has no location permission

        // PEERS_MAC_ADDRESS permission holders always get results

        if (!hasScanResultPermission(client)) {

            return;

        }



        if (client.filters == null || client.filters.isEmpty()) {

            sendBatchScanResults(app, client, new ArrayList<ScanResult>(allResults));

            // TODO: Question to reviewer: Shouldn't there be a return here?