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

Commit 05b856a2 authored by Wei Wang's avatar Wei Wang Committed by Android Git Automerger
Browse files

am 584bc650: am 5d84367a: Merge "Enforce permission check in BLE scan only mode." into mnc-dev 

* commit '584bc650':
  Enforce permission check in BLE scan only mode.
parents be534a67 584bc650

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

+8 −6
Original line number Diff line number Diff line
@@ -2087,14 +2087,16 @@ public class GattService extends ProfileService { 
    }



    private boolean needsPrivilegedPermissionForScan(ScanSettings settings) {

        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();

        // BLE scan only mode needs special permission.

        if (adapter.getState() != BluetoothAdapter.STATE_ON) return true;



        // Regular scan, no special permission.

        if (settings == null) {

            return false;

        }

        if (settings == null) return false;



        // Regular scan, no special permission.

        if (settings.getReportDelayMillis() == 0) {

            return false;

        }

        if (settings.getReportDelayMillis() == 0) return false;



        // Batch scan, truncated mode needs permission.

        return settings.getScanResultType() == ScanSettings.SCAN_RESULT_TYPE_ABBREVIATED;

    }