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

Commit d0388299 authored by Erik Kline's avatar Erik Kline Committed by Android (Google) Code Review
Browse files

Merge "Listen for CONNECTIVITY_ACTION instead of _IMMEDIATE"

parents c1472782 32830cc8

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -173,7 +173,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
        filter.addAction(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED);

        filter.addAction(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);

        filter.addAction(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);

        filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);

        filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

        filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

        filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);

        filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED);
@@ -331,7 +331,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
            Log.d(TAG, "onReceive: intent=" + intent);

            Log.d(TAG, "onReceive: intent=" + intent);

        }

        }

        final String action = intent.getAction();

        final String action = intent.getAction();

        if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE) ||

        if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION) ||

                action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {

                action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {

            updateConnectivity();

            updateConnectivity();

        } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {

        } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {

services/core/java/com/android/server/location/GpsLocationProvider.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2012,7 +2012,7 @@ public class GpsLocationProvider implements LocationProviderInterface { 
            intentFilter = new IntentFilter();

            intentFilter = new IntentFilter();

            intentFilter.addAction(ALARM_WAKEUP);

            intentFilter.addAction(ALARM_WAKEUP);

            intentFilter.addAction(ALARM_TIMEOUT);

            intentFilter.addAction(ALARM_TIMEOUT);

            intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE);

            intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

            intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

            intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);

            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);

            intentFilter.addAction(Intent.ACTION_SCREEN_ON);

            intentFilter.addAction(Intent.ACTION_SCREEN_ON);