Merge "DO NOT MERGE: Fix NPE bug in LocationManager" into rvc-qpr-dev

2020-08-24 19:24:59 +00:00
parent 4cb7d8c878 6af009ab20
commit 70c2974749
1 changed files with 1 additions and 1 deletions
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -3039,7 +3039,7 @@ public class LocationManager {
        protected GnssRequest merge(@NonNull List<GnssRequest> requests) {
            Preconditions.checkArgument(!requests.isEmpty());
            for (GnssRequest request : requests) {
-                if (request.isFullTracking()) {
+                if (request != null && request.isFullTracking()) {
                    return request;
                }
            }