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

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

Merge "Fix permission check for access to the Bluetooth device address" 

am: 7db5b29e

Change-Id: I44f5819231f61961354b3e6e256905724bb20fe0
parents 4784885a 7db5b29e

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

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

    public static final String BLUETOOTH_PRIVILEGED =

                android.Manifest.permission.BLUETOOTH_PRIVILEGED;

                android.Manifest.permission.BLUETOOTH_PRIVILEGED;

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

    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;

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





    private static final String PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE =

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




     String getAddress() {

     String getAddress() {

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(BLUETOOTH_PERM, "Need BLUETOOTH permission");

        enforceCallingOrSelfPermission(LOCAL_MAC_ADDRESS_PERM, "Need LOCAL_MAC_ADDRESS permission");





        String addrString = null;

        String addrString = null;

        byte[] address = mAdapterProperties.getAddress();

        byte[] address = mAdapterProperties.getAddress();