diff options
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | location/java/android/location/Location.java | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index fc488457e3b2..57a5fcb75e93 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3418,7 +3418,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 { diff --git a/api/test-current.txt b/api/test-current.txt index d709886eff66..c04e22bc08c9 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1088,6 +1088,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 { diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 9c36d76cf370..6824be8e1e3b 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -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(); } |