Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c88ca67b authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

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

parents 16e56f78 d816a2a8

packages/CaptivePortalLogin/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -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

+2 −1
Original line number Diff line number Diff line
@@ -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" />