diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-03 15:09:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 15:09:39 -0700 |
commit | 7c1ae08c1dfcfbae45f3d4692adee6140386eebd (patch) | |
tree | 4c0eeb160a4bf1df14f2ac587f253c7a3cae3941 | |
parent | 88b31b0940459f79204086d567a8aaad0a842f89 (diff) | |
parent | 7ba4a88eb78fc41717275de25748f5cf17915f5b (diff) | |
download | android_packages_apps_Snap-7c1ae08c1dfcfbae45f3d4692adee6140386eebd.tar.gz android_packages_apps_Snap-7c1ae08c1dfcfbae45f3d4692adee6140386eebd.tar.bz2 android_packages_apps_Snap-7c1ae08c1dfcfbae45f3d4692adee6140386eebd.zip |
am 7ba4a88e: Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
* commit '7ba4a88eb78fc41717275de25748f5cf17915f5b':
Sync Camera2 permissions to GoogleCamera permissions.
-rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 757c8b3e0..8152f8193 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -7,18 +7,25 @@ android:minSdkVersion="14" android:targetSdkVersion="17" /> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.BIND_WALLPAPER" /> <uses-permission android:name="android.permission.CAMERA" /> + <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> <uses-permission android:name="android.permission.NFC" /> + <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.SET_WALLPAPER" /> + <uses-permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" /> + <uses-permission android:name="android.permission.SUBSCRIBED_FEEDS_WRITE" /> <uses-permission android:name="android.permission.USE_CREDENTIALS" /> <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> |