summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-05-20 16:22:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-20 16:22:50 +0000
commitb3e6d82065e9bc523267a9936fc37a4bb0027eb0 (patch)
tree71cf779e7cd16226fdb246cd0387201d8f795942
parentac121930e73e9b9320592facbc49069b29370c87 (diff)
parentbeb40ca95cc4acc2045fb0fe8faa32be2df3ef66 (diff)
downloadandroid_packages_apps_Camera2-b3e6d82065e9bc523267a9936fc37a4bb0027eb0.tar.gz
android_packages_apps_Camera2-b3e6d82065e9bc523267a9936fc37a4bb0027eb0.tar.bz2
android_packages_apps_Camera2-b3e6d82065e9bc523267a9936fc37a4bb0027eb0.zip
am beb40ca9: Declare that Camera2 does not use cleartext network traffic.
* commit 'beb40ca95cc4acc2045fb0fe8faa32be2df3ef66': Declare that Camera2 does not use cleartext network traffic.
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 076863de2..07647ae45 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,7 +47,8 @@
android:largeHeap="true"
android:restoreAnyVersion="true"
android:supportsRtl="true"
- android:theme="@style/Theme.Camera" >
+ android:theme="@style/Theme.Camera"
+ android:usesCleartextTraffic="false" >
<activity
android:name="com.android.camera.CameraActivity"
android:clearTaskOnLaunch="true"