summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-08 16:47:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-08 16:47:24 +0000
commit17ba7411ec56e29d11ceb75e620ba86ac43fa95e (patch)
treeb180d295be55a24f241c6c0308d415dd5d734881
parent0ccd073c887b414b9ef9ba57166d9f5e287848b2 (diff)
parent2492ea00c8c0968cf211d954f84b02994bf01ccf (diff)
downloadpackages_apps_Browser-17ba7411ec56e29d11ceb75e620ba86ac43fa95e.tar.gz
packages_apps_Browser-17ba7411ec56e29d11ceb75e620ba86ac43fa95e.tar.bz2
packages_apps_Browser-17ba7411ec56e29d11ceb75e620ba86ac43fa95e.zip
Merge "Declare that Browser app uses cleartext traffic."
-rw-r--r--AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9ea41e6a0..a1de13137 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,7 +55,8 @@
android:icon="@mipmap/ic_launcher_browser"
android:backupAgent=".BrowserBackupAgent"
android:hardwareAccelerated="true"
- android:taskAffinity="android.task.browser" >
+ android:taskAffinity="android.task.browser"
+ android:usesCleartextTraffic="true" >
<provider android:name=".provider.BrowserProvider2"
android:authorities="com.android.browser;browser"