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

Commit 0dbc53c7 authored by Brian Julian's avatar Brian Julian
Browse files

Renames addMslAltitudeToLocation(Location) to... 

Renames addMslAltitudeToLocation(Location) to tryAddMslAltitudeToLocation(Location) in AltitudeConverter.

Test: FrameworksMockingServicesTests:AltitudeConverterTest, CtsLocationNoneTestCases
Bug: 323121169
Change-Id: Ia10b3b78d0e7b10c025a3a646e632f2c28e4e3b7
parent 461a89f2

location/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ package android.location.altitude { 
  public final class AltitudeConverter {

    ctor public AltitudeConverter();

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

    method @FlaggedApi(Flags.FLAG_GEOID_HEIGHTS_VIA_ALTITUDE_HAL) public boolean addMslAltitudeToLocation(@NonNull android.location.Location);

    method @FlaggedApi(Flags.FLAG_GEOID_HEIGHTS_VIA_ALTITUDE_HAL) public boolean tryAddMslAltitudeToLocation(@NonNull android.location.Location);

  }



}

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

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ public final class AltitudeConverter { 
     * are necessary to load data from raw assets. Example code on the main thread is as follows:

     *

     * <pre>{@code

     *   if (!mAltitudeConverter.addMslAltitudeToLocation(location)) {

     *   if (!mAltitudeConverter.tryAddMslAltitudeToLocation(location)) {

     *       // Queue up only one call off the main thread.

     *       if (mIsAltitudeConverterIdle) {

     *           mIsAltitudeConverterIdle = false;
@@ -242,7 +242,7 @@ public final class AltitudeConverter { 
     * }</pre>

     */

    @FlaggedApi(Flags.FLAG_GEOID_HEIGHTS_VIA_ALTITUDE_HAL)

    public boolean addMslAltitudeToLocation(@NonNull Location location) {

    public boolean tryAddMslAltitudeToLocation(@NonNull Location location) {

        validate(location);

        MapParamsProto geoidHeightParams = GeoidMap.getGeoidHeightParams();

        if (geoidHeightParams == null) {

services/core/java/com/android/server/location/provider/LocationProviderManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2590,7 +2590,7 @@ public class LocationProviderManager extends 
                if (!location.hasMslAltitude() && location.hasAltitude()) {

                    try {

                        Location locationCopy = new Location(location);

                        if (mAltitudeConverter.addMslAltitudeToLocation(locationCopy)) {

                        if (mAltitudeConverter.tryAddMslAltitudeToLocation(locationCopy)) {

                            return locationCopy;

                        }

                        // Only queue up one IO thread runnable.

services/tests/mockingservicestests/src/com/android/server/location/altitude/AltitudeConverterTest.java

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public class AltitudeConverterTest { 
        location.setAltitude(-1);

        location.setVerticalAccuracyMeters(1);

        // Requires data to be loaded from raw assets.

        assertThat(mAltitudeConverter.addMslAltitudeToLocation(location)).isFalse();

        assertThat(mAltitudeConverter.tryAddMslAltitudeToLocation(location)).isFalse();

        assertThat(location.hasMslAltitude()).isFalse();

        assertThat(location.hasMslAltitudeAccuracy()).isFalse();

        // Loads data from raw assets.
@@ -75,7 +75,7 @@ public class AltitudeConverterTest { 
        location.setAltitude(-1);

        location.setVerticalAccuracyMeters(-1); // Invalid vertical accuracy

        // Requires no data to be loaded from raw assets.

        assertThat(mAltitudeConverter.addMslAltitudeToLocation(location)).isTrue();

        assertThat(mAltitudeConverter.tryAddMslAltitudeToLocation(location)).isTrue();

        assertThat(location.getMslAltitudeMeters()).isWithin(2).of(5.0622);

        assertThat(location.hasMslAltitudeAccuracy()).isFalse();

        // Results in same outcome.
@@ -90,7 +90,7 @@ public class AltitudeConverterTest { 
        location.setAltitude(-1);

        location.setVerticalAccuracyMeters(1);

        // Requires data to be loaded from raw assets.

        assertThat(mAltitudeConverter.addMslAltitudeToLocation(location)).isFalse();

        assertThat(mAltitudeConverter.tryAddMslAltitudeToLocation(location)).isFalse();

        assertThat(location.hasMslAltitude()).isFalse();

        assertThat(location.hasMslAltitudeAccuracy()).isFalse();

        // Loads data from raw assets.