diff options
| author | Andres Morales <anmorales@google.com> | 2014-05-20 16:22:41 +0000 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2014-05-20 16:59:34 +0000 |
| commit | 62b25a5bf0750483f36ac79c88177ee2ab630f8e (patch) | |
| tree | f69b7a88474a84d726ff55507fe082c272e3c6f2 /core/res | |
| parent | e4ca30503cb428f030fe52f429dac0119acfa170 (diff) | |
| download | frameworks_base-62b25a5bf0750483f36ac79c88177ee2ab630f8e.zip frameworks_base-62b25a5bf0750483f36ac79c88177ee2ab630f8e.tar.gz frameworks_base-62b25a5bf0750483f36ac79c88177ee2ab630f8e.tar.bz2 | |
Revert "Adding INfcUnlockSettings and NfcUnlock interface class."
This will be re-added as a Trustlet in a subsequent CL.
This reverts commit 38a7ed05f8fed0aa81f7214d827875f9876ffbe1.
Change-Id: I5aa36df42a7751f165b4ef184e0cda57e5568b59
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 --> |