Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee448e78 authored by David Christie's avatar David Christie Committed by android-build-merger
Browse files

Merge \"Fix issue where GnssMeasurements wouldn\'t allow empty measurements.\" into nyc-mr1-dev 

am: 6441738f

Change-Id: Ic127d17bde42fef81d6509fc408384c6f581687f
parents ef759ca1 6441738f

location/java/android/location/GnssMeasurementsEvent.java

+4 −4
Original line number Diff line number Diff line
@@ -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);

    }



    /**