From b1ad3c5625690be53a3d0fc303e57927835996c3 Mon Sep 17 00:00:00 2001 From: Soonil Nagarkar Date: Wed, 9 Dec 2020 09:39:25 -0800 Subject: [PATCH] Restore get/setExtras per API council feedback These methods are still valuable enough they shouldn't be deprecated. Bug: 173712888 Test: none Change-Id: I47b46e0db95c0fb29c2a73fb5355d9f9ce21c6df --- core/api/current.txt | 4 ++-- location/java/android/location/Location.java | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 188449c7d7df1..38a7f62e1b1d9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -19197,7 +19197,7 @@ package android.location { method public float getBearingAccuracyDegrees(); method public long getElapsedRealtimeNanos(); method public double getElapsedRealtimeUncertaintyNanos(); - method @Deprecated public android.os.Bundle getExtras(); + method public android.os.Bundle getExtras(); method public double getLatitude(); method public double getLongitude(); method public String getProvider(); @@ -19226,7 +19226,7 @@ package android.location { method public void setBearingAccuracyDegrees(float); method public void setElapsedRealtimeNanos(long); method public void setElapsedRealtimeUncertaintyNanos(double); - method @Deprecated public void setExtras(@Nullable android.os.Bundle); + method public void setExtras(@Nullable android.os.Bundle); method public void setLatitude(double); method public void setLongitude(double); method public void setProvider(String); diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 47ecbd80a07ff..a7e9a0de538ab 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -1049,11 +1049,7 @@ public class Location implements Parcelable { * - * - * @deprecated Do not use. For GNSS related information, prefer listening for GNSS status - * information via {@link LocationManager}. */ - @Deprecated public Bundle getExtras() { return mExtras; } @@ -1063,10 +1059,7 @@ public class Location implements Parcelable { * *

Note this stores a copy of the given extras, so any changes to extras after calling this * method won't be reflected in the location bundle. - * - * @deprecated Do not use. */ - @Deprecated public void setExtras(@Nullable Bundle extras) { mExtras = (extras == null) ? null : new Bundle(extras); }