PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ff8018dc: Merge "Fix NFC permission." into gingerbread

Browse Source 
Merge commit 'ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp

* commit 'ff8018dcbd0488160519481d4ca1567fa397d44e':
  Fix NFC permission.
This commit is contained in:
Nick Pelly
2010-10-20 16:47:25 -07:00
committed by Android Git Automerger
parent 5cfa75875f ff8018dcbd
commit 029f23c32c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -14,7 +14,7 @@
<uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="com.trustedlogic.trustednfc.permission.NFC_ADMIN" /> <uses-permission android:name="android.permission.NFC" />
<uses-permission android:name="android.permission.HARDWARE_TEST" /> <uses-permission android:name="android.permission.HARDWARE_TEST" />
<uses-permission android:name="android.permission.CALL_PHONE" /> <uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" /> <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />