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

Commit 018a3adb authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by Android (Google) Code Review
Browse files

Merge "Restore get/setExtras per API council feedback"

parents f4bb783c b1ad3c56

core/api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -19197,7 +19197,7 @@ package android.location { 
    method public float getBearingAccuracyDegrees();

    method public float getBearingAccuracyDegrees();

    method public long getElapsedRealtimeNanos();

    method public long getElapsedRealtimeNanos();

    method public double getElapsedRealtimeUncertaintyNanos();

    method public double getElapsedRealtimeUncertaintyNanos();

    method @Deprecated public android.os.Bundle getExtras();

    method public android.os.Bundle getExtras();

    method public double getLatitude();

    method public double getLatitude();

    method public double getLongitude();

    method public double getLongitude();

    method public String getProvider();

    method public String getProvider();
@@ -19226,7 +19226,7 @@ package android.location { 
    method public void setBearingAccuracyDegrees(float);

    method public void setBearingAccuracyDegrees(float);

    method public void setElapsedRealtimeNanos(long);

    method public void setElapsedRealtimeNanos(long);

    method public void setElapsedRealtimeUncertaintyNanos(double);

    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 setLatitude(double);

    method public void setLongitude(double);

    method public void setLongitude(double);

    method public void setProvider(String);

    method public void setProvider(String);

location/java/android/location/Location.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -1049,11 +1049,7 @@ public class Location implements Parcelable { 
     * <ul>

     * <ul>

     * <li> satellites - the number of satellites used to derive the fix

     * <li> satellites - the number of satellites used to derive the fix

     * </ul>

     * </ul>

     *

     * @deprecated Do not use. For GNSS related information, prefer listening for GNSS status

     *             information via {@link LocationManager}.

     */

     */

    @Deprecated

    public Bundle getExtras() {

    public Bundle getExtras() {

        return mExtras;

        return mExtras;

    }

    }
@@ -1063,10 +1059,7 @@ public class Location implements Parcelable { 
     *

     *

     * <p>Note this stores a copy of the given extras, so any changes to extras after calling this

     * <p>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.

     * method won't be reflected in the location bundle.

     *

     * @deprecated Do not use.

     */

     */

    @Deprecated

    public void setExtras(@Nullable Bundle extras) {

    public void setExtras(@Nullable Bundle extras) {

        mExtras = (extras == null) ? null : new Bundle(extras);

        mExtras = (extras == null) ? null : new Bundle(extras);

    }

    }