summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2015-07-27 12:20:18 -0700
committerFyodor Kupolov <fkupolov@google.com>2015-07-27 12:33:43 -0700
commit136a2e7fc94098f762cd3d9bd092b4c4d5bf4c70 (patch)
tree950bf042cf7976d4ebd5ae43f126720db5f11725 /core/res
parentc174de0ab353e2ecaf6e1728e6899bffcfefe48e (diff)
downloadframeworks_base-136a2e7fc94098f762cd3d9bd092b4c4d5bf4c70.zip
frameworks_base-136a2e7fc94098f762cd3d9bd092b4c4d5bf4c70.tar.gz
frameworks_base-136a2e7fc94098f762cd3d9bd092b4c4d5bf4c70.tar.bz2
Introduced android.permission.PEERS_MAC_ADDRESS permission
Introduced signature-level permission android.permission.PEERS_MAC_ADDRESS. It allows access to MAC addresses of WiFi and Bluetooth peer devices, without having location permission or even if location is turned off. Bug: 21852542 Bug: 22728628 Change-Id: If0ff80636e57b38dbedc8fcf5f520a3a6d6f734e
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3e22e09..f9cdd72 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -960,9 +960,7 @@
android:label="@string/permlab_changeWimaxState"
android:protectionLevel="normal" />
- <!--@SystemApi Allows applications to the the local WiFi and Bluetooth MAC address.
- @hide
- -->
+ <!-- Allows applications to act as network scorers. @hide @SystemApi-->
<permission android:name="android.permission.SCORE_NETWORKS"
android:protectionLevel="signature|privileged" />
@@ -2582,10 +2580,16 @@
<permission android:name="android.permission.KILL_UID"
android:protectionLevel="signature|installer" />
- <!-- Allows applications to act as network scorers. @hide @SystemApi-->
+ <!-- @SystemApi Allows applications to read the local WiFi and Bluetooth MAC address.
+ @hide -->
<permission android:name="android.permission.LOCAL_MAC_ADDRESS"
android:protectionLevel="signature|privileged" />
+ <!-- @SystemApi Allows access to MAC addresses of WiFi and Bluetooth peer devices.
+ @hide -->
+ <permission android:name="android.permission.PEERS_MAC_ADDRESS"
+ android:protectionLevel="signature" />
+
<!-- Allows the Nfc stack to dispatch Nfc messages to applications. Applications
can use this permission to ensure incoming Nfc messages are from the Nfc stack
and not simulated by another application.