Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor fixes for CTS tests"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-24 03:08:20 +00:00
committed by Android (Google) Code Review
parent 73aa38f27a 7630c828b8
commit 324eb4dfa0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
location/java/android/location/LocationManager.java
View File

@@ -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);
}
/**

6
location/java/android/location/LocationRequest.java
View File

@@ -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;