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

Commit a90ca9f3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Enforce BLUETOOTH_PRIVILEGED permission in... 

Merge "Enforce BLUETOOTH_PRIVILEGED permission in AdapterService#setRemoteAlias" am: e0bd6d25 am: 74e7bda6

Change-Id: I974427c63a166fb63d378b29a3fa3483c8a6be97
parents af597fec 74e7bda6

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

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

            }



            enforceBluetoothPermission(service);

            enforceBluetoothPrivilegedPermission(service);



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

            if (deviceProp == null) {