commit 7db5b29e4575662ec410f27c5c9ce168c0917851
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 21 19:41:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 21 19:41:35 2017 +0000
tree 49425aa151e7bfab16a402eddf4b922a03d711fe
parent 0e80ffec3fcc79f5a52fd9e22b9738c7dc3f9aa3
parent 58a41fc32debf78416826c96c83e1d4294decc2c

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

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

diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index a7c16c3..f6c7b98 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -122,6 +122,7 @@
     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 =
@@ -1446,6 +1447,7 @@
 
      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();