diff options
| author | Andres Morales <anmorales@google.com> | 2014-05-20 23:40:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-20 23:40:37 +0000 |
| commit | 94a17b5f184a4443e320aa2bf66d959119d8bfef (patch) | |
| tree | afb75af5c9ed799fa110ab95dbd58ad53923db9f /core/res | |
| parent | 47a7d61e70230bbed030e8795a17bf43c479616f (diff) | |
| parent | 62b25a5bf0750483f36ac79c88177ee2ab630f8e (diff) | |
| download | frameworks_base-94a17b5f184a4443e320aa2bf66d959119d8bfef.zip frameworks_base-94a17b5f184a4443e320aa2bf66d959119d8bfef.tar.gz frameworks_base-94a17b5f184a4443e320aa2bf66d959119d8bfef.tar.bz2 | |
Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class.""
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/AndroidManifest.xml | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a97d5fc..7b200c4 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -833,15 +833,8 @@ <!-- Allows access to the loop radio (Android@Home mesh network) device. @hide --> <permission android:name="android.permission.LOOP_RADIO" - android:permissionGroup="android.permission-group.NETWORK" - android:protectionLevel="signature|system" /> - - <!-- Allows for the NFC process to unlock the device - @hide This should only be used by the Nfc apk - --> - <permission android:name="android.permission.NFC_UNLOCK" - android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="signature" /> + android:permissionGroup="android.permission-group.NETWORK" + android:protectionLevel="signature|system" /> <!-- ================================== --> <!-- Permissions for accessing accounts --> |