summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorSascha Haeberling <haeberling@google.com>2013-10-03 22:07:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-03 22:07:15 +0000
commit7ba4a88eb78fc41717275de25748f5cf17915f5b (patch)
treefbb160814418aca9e49903f12a89564737ef68ed /AndroidManifest.xml
parent77dd14930b24816369560a73cfb0610c1f745d05 (diff)
parentb1e5e38e21183edf4b694c28b918c069638ec31e (diff)
downloadandroid_packages_apps_Snap-7ba4a88eb78fc41717275de25748f5cf17915f5b.tar.gz
android_packages_apps_Snap-7ba4a88eb78fc41717275de25748f5cf17915f5b.tar.bz2
android_packages_apps_Snap-7ba4a88eb78fc41717275de25748f5cf17915f5b.zip
Merge "Sync Camera2 permissions to GoogleCamera permissions." into gb-ub-photos-carlsbad
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml7
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" />