diff options
| author | Rubin Xu <rubinxu@google.com> | 2015-06-22 15:44:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-22 15:44:51 +0000 |
| commit | c54bcade1b7ec7e044aca7fe9c60357ad957a8c2 (patch) | |
| tree | d5878f592ca2c0b221b386d2ac90541ba584f80f | |
| parent | b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c (diff) | |
| parent | 1213487aa7dc32d392cb5f2489f0c76321f02430 (diff) | |
| download | frameworks_base-c54bcade1b7ec7e044aca7fe9c60357ad957a8c2.zip frameworks_base-c54bcade1b7ec7e044aca7fe9c60357ad957a8c2.tar.gz frameworks_base-c54bcade1b7ec7e044aca7fe9c60357ad957a8c2.tar.bz2 | |
Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 5b40d30..b1b772a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2427,6 +2427,13 @@ <permission android:name="android.permission.LOCAL_MAC_ADDRESS" android:protectionLevel="signatureOrSystem" /> + <!-- 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. + @hide --> + <permission android:name="android.permission.DISPATCH_NFC_MESSAGE" + android:protectionLevel="signatureOrSystem" /> + <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/> |