diff options
| author | Martijn Coenen <maco@google.com> | 2015-09-23 17:25:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:25:55 +0000 |
| commit | 405f17239f00e30674a84b16bf4d8f3d36ad5896 (patch) | |
| tree | 4d14d3c926b06bce0f1727521c585108080e1816 | |
| parent | 899ca873c16f31632eca2c56b5368b20279b484a (diff) | |
| parent | 8415fed4f7544099cb42d48157df6a63594c0007 (diff) | |
| download | android_packages_apps_Nfc-405f17239f00e30674a84b16bf4d8f3d36ad5896.tar.gz android_packages_apps_Nfc-405f17239f00e30674a84b16bf4d8f3d36ad5896.tar.bz2 android_packages_apps_Nfc-405f17239f00e30674a84b16bf4d8f3d36ad5896.zip | |
am 8415fed4: Grant WiFi override permission to NFC process.
* commit '8415fed4f7544099cb42d48157df6a63594c0007':
Grant WiFi override permission to NFC process.
| -rwxr-xr-x | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9941c53e..eea72fd4 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,6 +52,7 @@ <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" /> <uses-permission android:name="com.android.permission.WHITELIST_BLUETOOTH_DEVICE" /> <uses-permission android:name="android.permission.DISPATCH_NFC_MESSAGE" /> + <uses-permission android:name="android.permission.OVERRIDE_WIFI_CONFIG" /> <application android:name=".NfcApplication" android:icon="@drawable/icon" android:label="@string/app_name" |