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

Commit f487792a authored by Soonil Nagarkar's avatar Soonil Nagarkar Committed by Automerger Merge Worker
Browse files

Merge "Make Location.setMock() public" into sc-dev am: 1f731d7b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13986452

Change-Id: Ide444c40a8cba892ebe82995ec61fbeee86d56cf
parents cfd942e8 1f731d7b

core/api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -19822,7 +19822,8 @@ package android.location { 
    method public boolean hasSpeed();

    method public boolean hasSpeedAccuracy();

    method public boolean hasVerticalAccuracy();

    method public boolean isFromMockProvider();

    method @Deprecated public boolean isFromMockProvider();

    method public boolean isMock();

    method @Deprecated public void removeAccuracy();

    method @Deprecated public void removeAltitude();

    method @Deprecated public void removeBearing();
@@ -19838,6 +19839,7 @@ package android.location { 
    method public void setExtras(@Nullable android.os.Bundle);

    method public void setLatitude(double);

    method public void setLongitude(double);

    method public void setMock(boolean);

    method public void setProvider(String);

    method public void setSpeed(float);

    method public void setSpeedAccuracyMetersPerSecond(float);

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4831,7 +4831,7 @@ package android.location { 
  public class Location implements android.os.Parcelable {

    method public boolean isComplete();

    method public void makeComplete();

    method public void setIsFromMockProvider(boolean);

    method @Deprecated public void setIsFromMockProvider(boolean);

    field @Deprecated public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation";

  }

































location/java/android/location/Location.java



+24
−2




























Original line number
Diff line number
Diff line








@@ -1246,20 +1246,42 @@ public class Location implements Parcelable {













     * Returns true if the Location came from a mock provider.















     *















     * @return true if this Location came from a mock provider, false otherwise













     * @deprecated Prefer {@link #isMock()} instead.















     */













    @Deprecated















    public boolean isFromMockProvider() {













        return (mFieldsMask & HAS_MOCK_PROVIDER_MASK) != 0;













        return isMock();















    }































    /**















     * Flag this Location as having come from a mock provider or not.















     *















     * @param isFromMockProvider true if this Location came from a mock provider, false otherwise













     * @deprecated Prefer {@link #setMock(boolean)} instead.















     * @hide















     */













    @Deprecated















    @SystemApi















    public void setIsFromMockProvider(boolean isFromMockProvider) {













        if (isFromMockProvider) {













        setMock(isFromMockProvider);













    }



























    /**













     * Returns true if this location is marked as a mock location. If this location comes from the













     * Android framework, this indicates that the location was provided by a test location provider,













     * and thus may not be related to the actual location of the device.













     *













     * @see LocationManager#addTestProvider













     */













    public boolean isMock() {













        return (mFieldsMask & HAS_MOCK_PROVIDER_MASK) != 0;













    }



























    /**













     * Sets whether this location is marked as a mock location.













     */













    public void setMock(boolean mock) {













        if (mock) {















            mFieldsMask |= HAS_MOCK_PROVIDER_MASK;















        } else {















            mFieldsMask &= ~HAS_MOCK_PROVIDER_MASK;