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

Commit 5e675d58 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't bootloop if GNSS is unavailable." into tm-dev am: 92e68968 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18383202



Change-Id: If6d096c29e1005ca10789bba71b3127a50388b48
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c577b185 92e68968

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

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

            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

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

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

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

        mLocationListener = new LocationListener() {

        mLocationListener = new LocationListener() {

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

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

        when(mMockContext.getSystemService(AlarmManager.class))

                .thenReturn(mMockAlarmManager);

                .thenReturn(mMockAlarmManager);





        when(mMockLocationManager.hasProvider(LocationManager.GPS_PROVIDER))

                .thenReturn(true);



        LocalServices.addService(LocationManagerInternal.class, mLocationManagerInternal);

        LocalServices.addService(LocationManagerInternal.class, mLocationManagerInternal);





        mGnssTimeUpdateService =

        mGnssTimeUpdateService =