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

Browse Source 
am: c88ca67bb3

Change-Id: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb
This commit is contained in:
Lorenzo Colitti
2018-03-19 17:39:34 +00:00
committed by android-build-merger
parent f0e1e01c44 c88ca67bb3
commit 617f6159db
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.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
<application android:label="@string/app_name" > <application android:label="@string/app_name"
android:usesCleartextTraffic="true">
<activity <activity
android:name="com.android.captiveportallogin.CaptivePortalLoginActivity" android:name="com.android.captiveportallogin.CaptivePortalLoginActivity"
android:label="@string/action_bar_label" android:label="@string/action_bar_label"

3
packages/CarrierDefaultApp/AndroidManifest.xml
View File

@@ -29,7 +29,8 @@
<application <application
android:label="@string/app_name" android:label="@string/app_name"
android:directBootAware="true"> android:directBootAware="true"
android:usesCleartextTraffic="true">
<receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver"> <receiver android:name="com.android.carrierdefaultapp.CarrierDefaultBroadcastReceiver">
<intent-filter> <intent-filter>
<action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" /> <action android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />