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

Commit 7630c828 authored by Soonil Nagarkar's avatar Soonil Nagarkar
Browse files

Minor fixes for CTS tests 

-Ensure deprecated GNSS APIs run on binder threads for backcompat.
-Normalize exception thrown on null criteria to
IllegalArgumentException.

Bug: 143110531
Test: atest LocationManagerTest
Change-Id: I962234913857cb0c5bfdf46653986ab2a55bd5ee
parent 4dd77f0b

location/java/android/location/LocationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ public class LocationManager { 
    public void removeGpsNavigationMessageListener(GpsNavigationMessageEvent.Listener listener) {}



    /**

     * Registers a GNSS Navigation Message callback.

     * Registers a GNSS Navigation Message callback which will run on a binder thread.

     *

     * @param callback a {@link GnssNavigationMessage.Callback} object to register.

     * @return {@code true} if the callback was added successfully, {@code false} otherwise.
@@ -2194,7 +2194,7 @@ public class LocationManager { 
    @Deprecated

    public boolean registerGnssNavigationMessageCallback(

            @NonNull GnssNavigationMessage.Callback callback) {

        return registerGnssNavigationMessageCallback(callback, null);

        return registerGnssNavigationMessageCallback(Runnable::run, callback);

    }



    /**

location/java/android/location/LocationRequest.java

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import android.os.SystemClock; 
import android.os.WorkSource;

import android.util.TimeUtils;



import com.android.internal.util.Preconditions;





/**

 * A data object that contains quality of service parameters for requests
@@ -195,6 +197,8 @@ public final class LocationRequest implements Parcelable { 
    @NonNull

    public static LocationRequest createFromDeprecatedProvider(

            @NonNull String provider, long minTime, float minDistance, boolean singleShot) {

        Preconditions.checkArgument(provider != null, "invalid null provider");



        if (minTime < 0) minTime = 0;

        if (minDistance < 0) minDistance = 0;
@@ -222,6 +226,8 @@ public final class LocationRequest implements Parcelable { 
    @NonNull

    public static LocationRequest createFromDeprecatedCriteria(

            @NonNull Criteria criteria, long minTime, float minDistance, boolean singleShot) {

        Preconditions.checkArgument(criteria != null, "invalid null criteria");



        if (minTime < 0) minTime = 0;

        if (minDistance < 0) minDistance = 0;