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

Commit cfd45ae4 authored by Daniel Estrada Alva's avatar Daniel Estrada Alva Committed by Android (Google) Code Review
Browse files

Merge "Add SUPL-specific network bcast" into mnc-dr-dev

parents 7bae31f8 e94a6ff5

core/java/android/net/ConnectivityManager.java

+10 −0
Original line number Diff line number Diff line
@@ -99,6 +99,16 @@ public class ConnectivityManager { 
    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";



    /**

     * A temporary hack until SUPL system can get off the legacy APIS.

     * They do too many network requests and the long list of apps listening

     * and waking due to the CONNECTIVITY_ACTION bcast makes it expensive.

     * Use this bcast intent instead for SUPL requests.

     * @hide

     */

    public static final String CONNECTIVITY_ACTION_SUPL =

            "android.net.conn.CONNECTIVITY_CHANGE_SUPL";



    /**

     * The device has connected to a network that has presented a captive

     * portal, which is blocking Internet connectivity. The user was presented

services/core/java/com/android/server/ConnectivityService.java

+6 −2
Original line number Diff line number Diff line
@@ -1524,10 +1524,14 @@ public class ConnectivityService extends IConnectivityManager.Stub 


            final long ident = Binder.clearCallingIdentity();

            if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {

                final NetworkInfo ni = intent.getParcelableExtra(

                        ConnectivityManager.EXTRA_NETWORK_INFO);

                if (ni.getType() == ConnectivityManager.TYPE_MOBILE_SUPL) {

                    intent.setAction(ConnectivityManager.CONNECTIVITY_ACTION_SUPL);

                    intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);

                }

                final IBatteryStats bs = BatteryStatsService.getService();

                try {

                    NetworkInfo ni = intent.getParcelableExtra(

                            ConnectivityManager.EXTRA_NETWORK_INFO);

                    bs.noteConnectivityChanged(intent.getIntExtra(

                            ConnectivityManager.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_NONE),

                            ni != null ? ni.getState().toString() : "?");