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

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

Change-Id: Ib69f51ce42f752e1d0bcc959b6c16fd41ee5f4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -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

@@ -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 =