diff options
| author | Fyodor Kupolov <fkupolov@google.com> | 2015-07-30 20:58:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-30 20:58:29 +0000 |
| commit | f9fdb08caae30e789d573ab3260fc87e9d43041b (patch) | |
| tree | cbc5703683c2778051297e24888bb8507d640dc6 /core/res | |
| parent | ccaf066d6d441b108bab711ae36d8bddce66edee (diff) | |
| parent | 4988378cd0f1bb6cdd83f797d10fd45105672296 (diff) | |
| download | frameworks_base-f9fdb08caae30e789d573ab3260fc87e9d43041b.zip frameworks_base-f9fdb08caae30e789d573ab3260fc87e9d43041b.tar.gz frameworks_base-f9fdb08caae30e789d573ab3260fc87e9d43041b.tar.bz2 | |
am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit '4988378cd0f1bb6cdd83f797d10fd45105672296':
Introduced android.permission.PEERS_MAC_ADDRESS permission
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 1f49929..1f47ce3 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -961,9 +961,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" /> @@ -2583,10 +2581,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. |