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

Commit bef3da31 authored by Brian Julian's avatar Brian Julian Committed by Android (Google) Code Review
Browse files

Merge "Renames addMslAltitude method in AltitudeConverter to... 

Merge "Renames addMslAltitude method in AltitudeConverter to addMslAltitudeToLocation, and updates Javadoc to use @throws."
parents a80be430 be73c90d

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -20206,7 +20206,7 @@ package android.location.altitude { 














  public final class AltitudeConverter {















    ctor public AltitudeConverter();













    method @WorkerThread public void addMslAltitude(@NonNull android.content.Context, @NonNull android.location.Location) throws java.io.IOException;













    method @WorkerThread public void addMslAltitudeToLocation(@NonNull android.content.Context, @NonNull android.location.Location) throws java.io.IOException;















  }





























}

























location/java/android/location/altitude/AltitudeConverter.java



+8
−11




























Original line number
Diff line number
Diff line








@@ -151,20 +151,17 @@ public final class AltitudeConverter {













     * altitude accuracy if the {@code location} has a finite and non-negative vertical accuracy;















     * otherwise, does not add a corresponding accuracy.















     *













     * <p>Must be called off the main thread as data may be loaded from raw assets. Throws an













     * {@link IOException} if an I/O error occurs when loading data.













     * <p>Must be called off the main thread as data may be loaded from raw assets.















     *













     * <p>Throws an {@link IllegalArgumentException} if the {@code location} has an invalid













     * latitude, longitude, or altitude above WGS84. Specifically:













     *













     * <ul>













     *     <li>The latitude must be between -90 and 90, both inclusive.













     *     <li>The longitude must be between -180 and 180, both inclusive.













     *     <li>The altitude above WGS84 must be finite.













     * </ul>













     * @throws IOException              if an I/O error occurs when loading data from raw assets.













     * @throws IllegalArgumentException if the {@code location} has an invalid latitude, longitude,













     *                                  or altitude above WGS84. Specifically, the latitude must be













     *                                  between -90 and 90 (both inclusive), the longitude must be













     *                                  between -180 and 180 (both inclusive), and the altitude













     *                                  above WGS84 must be finite.















     */















    @WorkerThread













    public void addMslAltitude(@NonNull Context context, @NonNull Location location)













    public void addMslAltitudeToLocation(@NonNull Context context, @NonNull Location location)















            throws IOException {















        validate(location);















        MapParamsProto params = GeoidHeightMap.getParams(context);