summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-07-01 16:24:41 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-07-01 16:24:41 -0700
commit98e2574f773032b77099707c40527a38eebdfbc9 (patch)
treef70d3c877d4391cc09e0b8477066dd28582abb85 /AndroidManifest.xml
parent8604e358f3d24d00d2db9a14eb69813a2a6bcb3e (diff)
parentce6d1cff610acd77b3383d66b7626244cf803493 (diff)
downloadandroid_packages_apps_Gallery2-98e2574f773032b77099707c40527a38eebdfbc9.tar.gz
android_packages_apps_Gallery2-98e2574f773032b77099707c40527a38eebdfbc9.tar.bz2
android_packages_apps_Gallery2-98e2574f773032b77099707c40527a38eebdfbc9.zip
Merge "Gallery: multiple fixes"
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f3a7a9bf6..add9263e6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,7 +47,7 @@
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
<uses-permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER" />
<uses-permission android:name="android.permission.BLUETOOTH" />
- //add for guest to set system property
+ <!-- add for guest to set system property -->
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<supports-screens android:smallScreens="false"
@@ -61,7 +61,7 @@
android:largeHeap="true"
android:restoreAnyVersion="true"
android:supportsRtl="true"
- usesCleartextHttp="true">
+ android:usesCleartextTraffic="true">
<uses-library android:name="com.google.android.media.effects" android:required="false" />
<uses-library android:name="org.apache.http.legacy" android:required="false" />
<activity android:name="com.android.gallery3d.app.MovieActivity"