commit a8e050f451370851dacd5ccd591de72f23da3428
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 19 17:55:30 2018 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 19 17:55:30 2018 +0000
tree 8da906654fd259a38975aac7161cc370181dfded
parent 660c46db410605f938c7bba5e4e3a8b5b4a63284
parent 617f6159db19001c43831142de4ab51e3f222f6a

Merge "Enable cleartext for captive portal apps" into pi-dev am: c88ca67bb3
am: 617f6159db

Change-Id: I742bf6be74a9e6953d0a779bdab0c25cf32aa740

packages/CaptivePortalLogin/AndroidManifest.xml

diff --git a/packages/CaptivePortalLogin/AndroidManifest.xml b/packages/CaptivePortalLogin/AndroidManifest.xml
index f21fd88..69fbb99 100644
--- a/packages/CaptivePortalLogin/AndroidManifest.xml
+++ b/packages/CaptivePortalLogin/AndroidManifest.xml
@@ -23,7 +23,8 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
 
-    <application android:label="@string/app_name" >
+    <application android:label="@string/app_name"
+                 android:usesCleartextTraffic="true">
         <activity
             android:name="com.android.captiveportallogin.CaptivePortalLoginActivity"
             android:label="@string/action_bar_label"

packages/CarrierDefaultApp/AndroidManifest.xml

diff --git a/packages/CarrierDefaultApp/AndroidManifest.xml b/packages/CarrierDefaultApp/AndroidManifest.xml
index 1cd7b61..824d9f4 100644
--- a/packages/CarrierDefaultApp/AndroidManifest.xml
+++ b/packages/CarrierDefaultApp/AndroidManifest.xml
@@ -29,7 +29,8 @@
 
     <application
         android:label="@string/app_name"
-        android:directBootAware="true">
+        android:directBootAware="true"
+        android:usesCleartextTraffic="true">
         <receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver">
             <intent-filter>
                 <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />