diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-17 19:05:47 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-10-18 10:04:40 -0700 |
| commit | e47150e933e6f610546f57183477f324566e521e (patch) | |
| tree | 5a415c5b9fdae883bf4dc507c516dd52ce20db67 /core/res/AndroidManifest.xml | |
| parent | d1f7f4a68375f879671d300510f23d3ee78a500e (diff) | |
| download | frameworks_base-e47150e933e6f610546f57183477f324566e521e.zip frameworks_base-e47150e933e6f610546f57183477f324566e521e.tar.gz frameworks_base-e47150e933e6f610546f57183477f324566e521e.tar.bz2 | |
Fix up NFC permissions.
The initial (vendor) implementation had 4 perms, replace with 1.
Requires no permissions:
- Viewing UID, type of discovered tags and cards.
- Viewing the NDEF message contents of NDEF formatted tags and cards.
Requires android.permission.NFC
- Get/Set the local tag "MyTag"
- Creating or using a RawTagConnection (transceive())
- Creating or using a NdefTagConnection (write()/read())
Change-Id: I1b585c7d91738bed6261277061a48cf7c939482a
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index ef4ee11..a22c827 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -341,29 +341,12 @@ android:description="@string/permdesc_bluetooth" android:label="@string/permlab_bluetooth" /> - <!-- Allows applications to access remote NFC devices - @hide --> - <permission android:name="com.trustedlogic.trustednfc.permission.NFC_RAW" + <!-- Allows applications to directly communicate over NFC --> + <permission android:name="android.permission.NFC" android:permissionGroup="android.permission-group.NETWORK" android:protectionLevel="dangerous" - android:description="@string/permdesc_nfcRaw" - android:label="@string/permlab_nfcRaw" /> - - <!-- Allows applications to be notified of remote NFC devices - @hide --> - <permission android:name="com.trustedlogic.trustednfc.permission.NFC_NOTIFY" - android:permissionGroup="android.permission-group.NETWORK" - android:protectionLevel="dangerous" - android:description="@string/permdesc_nfcNotify" - android:label="@string/permlab_nfcNotify" /> - - <!-- Allows applications to be notified of remote NFC LLCP devices - @hide --> - <permission android:name="com.trustedlogic.trustednfc.permission.NFC_LLCP" - android:permissionGroup="android.permission-group.NETWORK" - android:protectionLevel="dangerous" - android:description="@string/permdesc_nfcLlcp" - android:label="@string/permlab_nfcLlcp" /> + android:description="@string/permdesc_nfc" + android:label="@string/permlab_nfc" /> <!-- Allows an application to use SIP service --> <permission android:name="android.permission.USE_SIP" @@ -875,14 +858,6 @@ android:description="@string/permdesc_bluetoothAdmin" android:label="@string/permlab_bluetoothAdmin" /> - <!-- Allows applications to change NFC connectivity settings - @hide --> - <permission android:name="com.trustedlogic.trustednfc.permission.NFC_ADMIN" - android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="dangerous" - android:description="@string/permdesc_nfcAdmin" - android:label="@string/permlab_nfcAdmin" /> - <!-- Allows an application to clear the caches of all installed applications on the device. --> <permission android:name="android.permission.CLEAR_APP_CACHE" |