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

Merge "Catch IllegalArgumentException when calling LocationManager#requestLocationUpdate" into pi-dev

Browse Source
This commit is contained in:
Yu-Han Yang
2018-05-29 18:02:31 +00:00
committed by Android (Google) Code Review
parent d8f3889b28 e684ddac67
commit 3bc533d22f
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/core/java/com/android/server/location/GnssLocationProvider.java
View File

@@ -1015,26 +1015,25 @@ public class GnssLocationProvider implements LocationProviderInterface, InjectNt
locationListener = mFusedLocationListener;
}
if (!locationManager.isProviderEnabled(provider)) {
Log.w(TAG, "Unable to request location since " + provider
+ " provider does not exist or is not enabled.");
return;
}
Log.i(TAG,
String.format(
"GNSS HAL Requesting location updates from %s provider for %d millis.",
provider, durationMillis));
locationManager.requestLocationUpdates(provider,
LOCATION_UPDATE_MIN_TIME_INTERVAL_MILLIS, /*minDistance=*/ 0,
locationListener, mHandler.getLooper());
locationListener.numLocationUpdateRequest++;
mHandler.postDelayed(() -> {
if (--locationListener.numLocationUpdateRequest == 0) {
Log.i(TAG, String.format("Removing location updates from %s provider.", provider));
locationManager.removeUpdates(locationListener);
}
}, durationMillis);
try {
locationManager.requestLocationUpdates(provider,
LOCATION_UPDATE_MIN_TIME_INTERVAL_MILLIS, /*minDistance=*/ 0,
locationListener, mHandler.getLooper());
locationListener.numLocationUpdateRequest++;
mHandler.postDelayed(() -> {
if (--locationListener.numLocationUpdateRequest == 0) {
Log.i(TAG,
String.format("Removing location updates from %s provider.", provider));
locationManager.removeUpdates(locationListener);
}
}, durationMillis);
} catch (IllegalArgumentException e) {
Log.w(TAG, "Unable to request location.", e);
}
}
private void injectBestLocation(Location location) {