Merge "DO NOT MERGE: Fix NPE bug in LocationManager" into rvc-qpr-dev (70c29747) · Commits · e / os / android_frameworks_base

location/java/android/location/LocationManager.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3039,7 +3039,7 @@ public class LocationManager {
	protected GnssRequest merge(@NonNull List<GnssRequest> requests) {		protected GnssRequest merge(@NonNull List<GnssRequest> requests) {
	Preconditions.checkArgument(!requests.isEmpty());		Preconditions.checkArgument(!requests.isEmpty());
	for (GnssRequest request : requests) {		for (GnssRequest request : requests) {
	if (request.isFullTracking()) {		if (request != null && request.isFullTracking()) {
	return request;		return request;
	}		}
	}		}