Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6af009ab authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

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
parent e48401c1

location/java/android/location/LocationManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

                }

            }