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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-24 19:24:59 +00:00
committed by Android (Google) Code Review
parent 4cb7d8c878 6af009ab20
commit 70c2974749
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;
} }
} }