Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make Location.setMock() public" into sc-dev

Browse Source
This commit is contained in:
Soonil Nagarkar
2021-03-25 01:19:47 +00:00
committed by Android (Google) Code Review
parent 9116887121 ed28be3633
commit 1f731d7bb1
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -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);

2
core/api/system-current.txt
View File

@@ -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";
}

26
location/java/android/location/Location.java
View File

@@ -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;