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

Commit c7075092 authored by Adam Newman's avatar Adam Newman Committed by Chalard Jean
Browse files

Enable cleartext for captive portal apps 

When a user attempts to visit a captive portal the Activity will attempt
to load http://connectivitycheck.gstatic.com/generate_204 and a
walled-garden will typically intercept this and respond with a 302
redirect to a sign-in flow.

The new default of disabling cleartext unless explicitly enabled breaks
captive portal operation. This change enables cleartext for the two
applications that contain a CaptivePortalLoginActivity.

Clean cherry-pick of ag/3750960

Bug: 75279991
Test: Manually associated with captive portals.
Exempt-From-Owner-Approval: Already approved by owner on pi-dev.
Change-Id: Ib9ea7a8a2aa72b8305fa7044df0e369a57d33953
Merged-In: Ie38d6ce6f54336db2f4672746dc7385e0a7979fb
Merged-In: I742bf6be74a9e6953d0a779bdab0c25cf32aa740
parent 626a33cc

packages/CaptivePortalLogin/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <uses-permission android:name="android.permission.NETWORK_BYPASS_PRIVATE_DNS" />



    <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
@@ -30,7 +30,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" />