commit ad50ba065d31f3d8ec53c512b6ba5cf94d15d1e3
author Nick Pelly <npelly@google.com> Wed Sep 22 10:55:13 2010 -0700
committer Nick Pelly <npelly@google.com> Tue Sep 28 21:26:50 2010 -0700
tree 98f9beb9557a10008194a777ee2956fdb1d16101
parent 0adb8460bcb736d67f87bf1b56150bfac9c9c130

Add NFC checkbox to Settings app.

Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Heavily modified to remove dead code.

Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d9b39fe..1094cf4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="com.trustedlogic.trustednfc.permission.NFC_ADMIN" />
     <uses-permission android:name="android.permission.HARDWARE_TEST" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />