diff options
| author | 2018-03-19 16:49:47 +0000 | |
|---|---|---|
| committer | 2018-03-19 16:49:47 +0000 | |
| commit | c88ca67bb34b9b504c48d18a14e3c0727bf1d15e (patch) | |
| tree | 6b44918d010e031a1e37f3da9cdbf85665fac489 | |
| parent | 16e56f7815ae3e2b2d3fa472a69ee4e46cfbb56b (diff) | |
| parent | d816a2a8ed1cfc32cff37618418e706104b9a264 (diff) | |
Merge "Enable cleartext for captive portal apps" into pi-dev
| -rw-r--r-- | packages/CaptivePortalLogin/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/CarrierDefaultApp/AndroidManifest.xml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/CaptivePortalLogin/AndroidManifest.xml b/packages/CaptivePortalLogin/AndroidManifest.xml index f21fd88cadf6..69fbb99f1a72 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" diff --git a/packages/CarrierDefaultApp/AndroidManifest.xml b/packages/CarrierDefaultApp/AndroidManifest.xml index 1cd7b6123e35..824d9f45c21e 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" /> |