From 30fe9229c50229a77ce2baaffca508a15bda3b6c Mon Sep 17 00:00:00 2001
From: David Christie <dnchrist@google.com>
Date: Thu, 7 Jul 2016 14:07:19 -0700
Subject: [PATCH] Fix issue where GnssMeasurements wouldn't allow empty
 measurements.

Bug: 29966456

Change-Id: Ie74ed921d4ebe43e3ec086ef8fb96d54f992fa38
---
 location/java/android/location/GnssMeasurementsEvent.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java
index 315169472a7c3..7db04663c83be 100644
--- a/location/java/android/location/GnssMeasurementsEvent.java
+++ b/location/java/android/location/GnssMeasurementsEvent.java
@@ -98,13 +98,13 @@ public final class GnssMeasurementsEvent implements Parcelable {
             throw new InvalidParameterException("Parameter 'clock' must not be null.");
         }
         if (measurements == null || measurements.length == 0) {
-            throw new InvalidParameterException(
-                    "Parameter 'measurements' must not be null or empty.");
+            mReadOnlyMeasurements = Collections.emptyList();
+        } else {
+            Collection<GnssMeasurement> measurementCollection = Arrays.asList(measurements);
+            mReadOnlyMeasurements = Collections.unmodifiableCollection(measurementCollection);
         }
 
         mClock = clock;
-        Collection<GnssMeasurement> measurementCollection = Arrays.asList(measurements);
-        mReadOnlyMeasurements = Collections.unmodifiableCollection(measurementCollection);
     }
 
     /**