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

Commit fb8046f0 authored by Martin Brabham's avatar Martin Brabham
Browse files

Check for null address before doing permission requirements check 

If the address is null, then we do not need to enforce at all.

@SystemApi caller should not be able to pass null address due to the checks in the API.

Only setDeviceAddress(String address may accept a null

Bug: 189231649
Test: Manual test app; atest CtsBluetoothTestCases:android.bluetooth.cts.BluetoothLeScanTest#testBasicBleScan -- --abi arm64-v8a
Tag: #feature
Change-Id: I82f1effaa9259bfd2fe944fa45a8ed33b221b3aa
parent 818323fa

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

+16 −4
Original line number Diff line number Diff line
@@ -3283,14 +3283,26 @@ public class GattService extends ProfileService { 
        // Some 3p API cases may have null filters, need to allow

        if (filters != null) {

            for (ScanFilter filter : filters) {

                if (filter.getDeviceAddress() != null && filter.getAddressType()

                // The only case to enforce here is if there is an address

                // If there is an address, enforce if the correct combination criteria is met.

                if (filter.getDeviceAddress() != null) {

                    // At this point we have an address, that means a caller used the

                    // setDeviceAddress(address) public API for the ScanFilter

                    // We don't want to enforce if the type is PUBLIC and the IRK is null

                    // However, if we have a different type that means the caller used a new

                    // @SystemApi such as setDeviceAddress(address, type) or

                    // setDeviceAddress(address, type, irk) which are both @SystemApi and require

                    // permissions to be enforced

                    if (filter.getAddressType()

                            == BluetoothDevice.ADDRESS_TYPE_PUBLIC && filter.getIrk() == null) {

                        // Do not enforce

                    } else {

                        enforcePrivilegedPermission();

                    }

                }

            }

        }

    }



    // Enforce caller has BLUETOOTH_PRIVILEGED permission. A {@link SecurityException} will be

    // thrown if the caller app does not have BLUETOOTH_PRIVILEGED permission.