DO NOT MERGE: Fix array casting bug

Bug: 159701638 Test: presubmits Change-Id: Ib11f899d9b612b6325fda53b61e165613c881972
2020-06-23 13:35:19 -07:00
parent 06ba19ff4e
commit e007303822
2 changed files with 8 additions and 6 deletions
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -3030,14 +3030,14 @@ public class LocationManager {

        @Override
        @Nullable
-        protected GnssRequest merge(@NonNull GnssRequest[] requests) {
-            Preconditions.checkArgument(requests.length > 0);
+        protected GnssRequest merge(@NonNull List<GnssRequest> requests) {
+            Preconditions.checkArgument(!requests.isEmpty());
            for (GnssRequest request : requests) {
                if (request.isFullTracking()) {
                    return request;
                }
            }
-            return requests[0];
+            return requests.get(0);
        }

        private class GnssMeasurementsListener extends IGnssMeasurementsListener.Stub {