Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 617f6159db

Change-Id: I742bf6be74a9e6953d0a779bdab0c25cf32aa740
This commit is contained in:
Lorenzo Colitti
2018-03-19 17:55:30 +00:00
committed by android-build-merger
parent 660c46db41 617f6159db
commit a8e050f451
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CaptivePortalLogin/AndroidManifest.xml
View File

@@ -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"

3
packages/CarrierDefaultApp/AndroidManifest.xml
View File

@@ -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" />