am c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev

* commit 'c54bcade1b7ec7e044aca7fe9c60357ad957a8c2':
  New internal permission to protect apps against rogue Nfc message.
This commit is contained in:
Rubin Xu
2015-06-22 15:57:52 +00:00
committed by Android Git Automerger

View File

@@ -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"/>