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

Commit 488ef0e4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "We now enforce the BLUETOOTH_PRIVILEGED permission on... 

Merge "We now enforce the BLUETOOTH_PRIVILEGED permission on AdapterService#connectAllEnabledProfiles and AdapterService#disconnectAllEnabledProfiles as they are implementations of SystemApis" am: bfe22a28 am: 5f820a1e am: 62cc79f4

Change-Id: Icf68dce53060279932fea9f81842d7b6d6a048b5
parents 3f3e35d0 62cc79f4

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

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

            }



            enforceBluetoothAdminPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            return service.connectAllEnabledProfiles(device);

        }
@@ -1530,7 +1530,7 @@ public class AdapterService extends Service { 
                return false;

            }



            enforceBluetoothAdminPermission(service);

            enforceBluetoothPrivilegedPermission(service);



            return service.disconnectAllEnabledProfiles(device);

        }