Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8c2aeffd0882513246aaf10a2b179bb858e851d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-18 21:29:02 +00:00
committed by Automerger Merge Worker
parent 94c541d4e5 92e6896842
commit 50fbd739c4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/timedetector/GnssTimeUpdateService.java
View File

@@ -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() {

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

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