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

Commit b5c80397 authored by Kweku Adams's avatar Kweku Adams
Browse files

Fix location provider mismatch. 

Requesting location updates without specifying a provider tended to use
the FUSED provider under the hood, but DeviceIdleController was checking
for the NETWORK provider instead. Switch to explicitly check for the
FUSED provider and request updates from the FUSED provider so that the
system can be consistent and avoid system crashes if the FUSED provider
is missing.

Bug: 274369433
Bug: 274572355
Test: atest DeviceIdleTest
Test: atest FrameworksMockingServicesTests:DeviceIdleControllerTest
Change-Id: I98bab13d3cc685f504c934b4714543d1b16a612c
parent 9d1c9281

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+11 −8
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ public class DeviceIdleController extends SystemService 
    @GuardedBy("this")

    private boolean mHasGps;

    @GuardedBy("this")

    private boolean mHasNetworkLocation;

    private boolean mHasFusedLocation;

    @GuardedBy("this")

    private Location mLastGenericLocation;

    @GuardedBy("this")
@@ -3782,12 +3782,14 @@ public class DeviceIdleController extends SystemService 
                scheduleAlarmLocked(mConstants.LOCATING_TIMEOUT);

                LocationManager locationManager = mInjector.getLocationManager();

                if (locationManager != null

                        && locationManager.getProvider(LocationManager.NETWORK_PROVIDER) != null) {

                    locationManager.requestLocationUpdates(mLocationRequest,

                            mGenericLocationListener, mHandler.getLooper());

                        && locationManager.getProvider(LocationManager.FUSED_PROVIDER) != null) {

                    locationManager.requestLocationUpdates(LocationManager.FUSED_PROVIDER,

                            mLocationRequest,

                            AppSchedulingModuleThread.getExecutor(),

                            mGenericLocationListener);

                    mLocating = true;

                } else {

                    mHasNetworkLocation = false;

                    mHasFusedLocation = false;

                }

                if (locationManager != null

                        && locationManager.getProvider(LocationManager.GPS_PROVIDER) != null) {
@@ -5301,9 +5303,10 @@ public class DeviceIdleController extends SystemService 
                pw.print("  "); pw.print(mStationaryListeners.size());

                pw.println(" stationary listeners registered");

            }

            pw.print("  mLocating="); pw.print(mLocating); pw.print(" mHasGps=");

                    pw.print(mHasGps); pw.print(" mHasNetwork=");

                    pw.print(mHasNetworkLocation); pw.print(" mLocated="); pw.println(mLocated);

            pw.print("  mLocating="); pw.print(mLocating);

            pw.print(" mHasGps="); pw.print(mHasGps);

            pw.print(" mHasFused="); pw.print(mHasFusedLocation);

            pw.print(" mLocated="); pw.println(mLocated);

            if (mLastGenericLocation != null) {

                pw.print("  mLastGenericLocation="); pw.println(mLastGenericLocation);

            }