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

Commit aaa67f4b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update permission enforcement for BluetoothDevice SystemApis" into rvc-dev

parents de0fe0f2 78d61bc1

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+6 −6
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothAdminPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp != null) {
@@ -1443,7 +1443,7 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothAdminPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {
@@ -1478,7 +1478,7 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            return deviceProp != null && deviceProp.isBondingInitiatedLocally();
@@ -1754,7 +1754,7 @@ public class AdapterService extends Service { 
                return BluetoothDevice.ACCESS_UNKNOWN;

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            return service.getDeviceAccessFromPrefs(device, PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE);

        }
@@ -1779,7 +1779,7 @@ public class AdapterService extends Service { 
                return BluetoothDevice.ACCESS_UNKNOWN;

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            return service.getDeviceAccessFromPrefs(device, MESSAGE_ACCESS_PERMISSION_PREFERENCE_FILE);

        }
@@ -1855,7 +1855,7 @@ public class AdapterService extends Service { 
                return BluetoothDevice.BATTERY_LEVEL_UNKNOWN;

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp == null) {