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

DO NOT MERGE: Fix NPE bug in LocationManager

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

Bug: 165375330
Test: presubmits
Change-Id: I13284b1c32f1ad1fce39ad1ca2e4298194197015
This commit is contained in:
Soonil Nagarkar
2020-08-19 13:07:15 -07:00
parent e48401c147
commit 6af009ab20
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
location/java/android/location/LocationManager.java
View File

@@ -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;
} }
} }