From 6af009ab20d9b6445785c465a1e7ea88c1f9a259 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Wed, 19 Aug 2020 13:07:15 -0700
Subject: [PATCH] DO NOT MERGE: Fix NPE bug in LocationManager

Both null and non-null GnssRequest objects may be present in the list of
requests to merge.

Bug: 165375330
Test: presubmits
Change-Id: I13284b1c32f1ad1fce39ad1ca2e4298194197015
---
 location/java/android/location/LocationManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 2a2aaea035ffa..05a9863cb2667 100644
--- 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;
                 }
             }