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

Commit 6b18acb8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update permission enforcement for BluetoothDevice SystemApis"

parents d84c0b54 b4789cf0

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

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

            }



            enforceBluetoothAdminPermission(service);

            enforceBluetoothPrivilegedPermission(service);



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

            if (deviceProp != null) {
@@ -1421,7 +1421,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) {
@@ -1456,7 +1456,7 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



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

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

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            return service.getDeviceAccessFromPrefs(device, PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE);

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

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            return service.getDeviceAccessFromPrefs(device, MESSAGE_ACCESS_PERMISSION_PREFERENCE_FILE);

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

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



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

            if (deviceProp == null) {