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

Commit b61776eb authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Don't bootloop if GNSS is unavailable."

parents b97bd44d 2886705f

services/core/java/com/android/server/timedetector/GnssTimeUpdateService.java

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ public final class GnssTimeUpdateService extends Binder { 
            Log.d(TAG, "requestGnssTimeUpdates()");

        }



        if (!mLocationManager.hasProvider(LocationManager.GPS_PROVIDER)) {

            Log.e(TAG, "GPS provider does not exist on this device");

            return;

        }



        // Location Listener triggers onLocationChanged() when GNSS data is available, so

        // that the getGnssTimeMillis() function doesn't need to be continuously polled.

        mLocationListener = new LocationListener() {

services/tests/servicestests/src/com/android/server/timedetector/GnssTimeUpdateServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ public final class GnssTimeUpdateServiceTest { 
        when(mMockContext.getSystemService(AlarmManager.class))

                .thenReturn(mMockAlarmManager);



        when(mMockLocationManager.hasProvider(LocationManager.GPS_PROVIDER))

                .thenReturn(true);



        LocalServices.addService(LocationManagerInternal.class, mLocationManagerInternal);



        mGnssTimeUpdateService =