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

Commit aa0442c1 authored by Stanley Tng's avatar Stanley Tng Committed by android-build-merger
Browse files

Fix permission check for access to the Bluetooth device address 

am: f1229e7f

Change-Id: I4e8f2bfdffd0f1141834b47e6660fb1be50acc2f
parents 5ccc8a33 f1229e7f

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

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ public class AdapterService extends Service { 
    public static final String BLUETOOTH_PRIVILEGED =

                android.Manifest.permission.BLUETOOTH_PRIVILEGED;

    static final String BLUETOOTH_PERM = android.Manifest.permission.BLUETOOTH;

    static final String LOCAL_MAC_ADDRESS_PERM = android.Manifest.permission.LOCAL_MAC_ADDRESS;

    static final String RECEIVE_MAP_PERM = android.Manifest.permission.RECEIVE_BLUETOOTH_MAP;



    private static final String PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE =
@@ -1438,6 +1439,7 @@ public class AdapterService extends Service { 


     String getAddress() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(LOCAL_MAC_ADDRESS_PERM, "Need LOCAL_MAC_ADDRESS permission");



        String addrString = null;

        byte[] address = mAdapterProperties.getAddress();