Merge "Expose NO_GPS_LOCATION APIs to system and test"
This commit is contained in:
committed by
Android (Google) Code Review
commit
597703c518
@@ -3420,7 +3420,9 @@ package android.location {
|
||||
public class Location implements android.os.Parcelable {
|
||||
method public boolean isComplete();
|
||||
method public void makeComplete();
|
||||
method public void setExtraLocation(@Nullable String, @Nullable android.location.Location);
|
||||
method public void setIsFromMockProvider(boolean);
|
||||
field public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation";
|
||||
}
|
||||
|
||||
public class LocationManager {
|
||||
|
||||
@@ -1091,6 +1091,8 @@ package android.location {
|
||||
|
||||
public class Location implements android.os.Parcelable {
|
||||
method public void makeComplete();
|
||||
method public void setExtraLocation(@Nullable String, @Nullable android.location.Location);
|
||||
field public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation";
|
||||
}
|
||||
|
||||
public class LocationManager {
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
|
||||
package android.location;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.annotation.SystemApi;
|
||||
import android.annotation.TestApi;
|
||||
import android.annotation.UnsupportedAppUsage;
|
||||
@@ -79,6 +80,8 @@ public class Location implements Parcelable {
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
@TestApi
|
||||
@SystemApi
|
||||
public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation";
|
||||
|
||||
/**
|
||||
@@ -1214,8 +1217,9 @@ public class Location implements Parcelable {
|
||||
* @param value the Location to attach
|
||||
* @hide
|
||||
*/
|
||||
@UnsupportedAppUsage
|
||||
public void setExtraLocation(String key, Location value) {
|
||||
@TestApi
|
||||
@SystemApi
|
||||
public void setExtraLocation(@Nullable String key, @Nullable Location value) {
|
||||
if (mExtras == null) {
|
||||
mExtras = new Bundle();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user