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

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

Merge "resolved conflicts for merge of 256718bc to master"

parents e2796c21 c6454fcb

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

+3 −1
Original line number Diff line number Diff line
@@ -447,7 +447,8 @@ public class GpsLocationProvider implements LocationProviderInterface { 
                checkSmsSuplInit(intent);

            } else if (action.equals(Intents.WAP_PUSH_RECEIVED_ACTION)) {

                checkWapSuplInit(intent);

            } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {

            } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)

                    || action.equals(ConnectivityManager.CONNECTIVITY_ACTION_SUPL)) {

                // retrieve NetworkType result for this UID

                int networkType = intent.getIntExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, -1);

                if (DEBUG) Log.d(TAG, "Connectivity action, type=" + networkType);
@@ -2067,6 +2068,7 @@ public class GpsLocationProvider implements LocationProviderInterface { 
            intentFilter.addAction(ALARM_WAKEUP);

            intentFilter.addAction(ALARM_TIMEOUT);

            intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

            intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_SUPL);

            intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);

            intentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);

            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);