Merge "Remove newly added remove methods in Location and deprecate the old ones, this is the request from the android API council Test: Existing unit tests still pass. BUG: 36552859" into oc-dev

am: 500c1d0749

Change-Id: I1ca9beace45f80962d3992c27724e6d281972524
This commit is contained in:
Yu Liu
2017-04-19 01:41:51 +00:00
committed by android-build-merger
7 changed files with 66 additions and 21 deletions

View File

@@ -20783,13 +20783,10 @@ package android.location {
method public boolean hasSpeedAccuracy();
method public boolean hasVerticalAccuracy();
method public boolean isFromMockProvider();
method public void removeAccuracy();
method public void removeAltitude();
method public void removeBearing();
method public void removeBearingAccuracy();
method public void removeSpeed();
method public void removeSpeedAccuracy();
method public void removeVerticalAccuracy();
method public deprecated void removeAccuracy();
method public deprecated void removeAltitude();
method public deprecated void removeBearing();
method public deprecated void removeSpeed();
method public void reset();
method public void set(android.location.Location);
method public void setAccuracy(float);

View File

@@ -126,6 +126,16 @@ package android.hardware {
}
package android.location {
public class Location implements android.os.Parcelable {
method public deprecated void removeBearingAccuracy();
method public deprecated void removeSpeedAccuracy();
method public deprecated void removeVerticalAccuracy();
}
}
package android.media {
public final class AudioFormat implements android.os.Parcelable {

View File

@@ -22517,13 +22517,10 @@ package android.location {
method public boolean isComplete();
method public boolean isFromMockProvider();
method public void makeComplete();
method public void removeAccuracy();
method public void removeAltitude();
method public void removeBearing();
method public void removeBearingAccuracy();
method public void removeSpeed();
method public void removeSpeedAccuracy();
method public void removeVerticalAccuracy();
method public deprecated void removeAccuracy();
method public deprecated void removeAltitude();
method public deprecated void removeBearing();
method public deprecated void removeSpeed();
method public void reset();
method public void set(android.location.Location);
method public void setAccuracy(float);

View File

@@ -124,6 +124,16 @@ package android.hardware {
}
package android.location {
public class Location implements android.os.Parcelable {
method public deprecated void removeBearingAccuracy();
method public deprecated void removeSpeedAccuracy();
method public deprecated void removeVerticalAccuracy();
}
}
package android.media {
public final class AudioFormat implements android.os.Parcelable {

View File

@@ -20889,13 +20889,10 @@ package android.location {
method public boolean hasSpeedAccuracy();
method public boolean hasVerticalAccuracy();
method public boolean isFromMockProvider();
method public void removeAccuracy();
method public void removeAltitude();
method public void removeBearing();
method public void removeBearingAccuracy();
method public void removeSpeed();
method public void removeSpeedAccuracy();
method public void removeVerticalAccuracy();
method public deprecated void removeAccuracy();
method public deprecated void removeAltitude();
method public deprecated void removeBearing();
method public deprecated void removeSpeed();
method public void reset();
method public void set(android.location.Location);
method public void setAccuracy(float);

View File

@@ -126,6 +126,16 @@ package android.hardware {
}
package android.location {
public class Location implements android.os.Parcelable {
method public deprecated void removeBearingAccuracy();
method public deprecated void removeSpeedAccuracy();
method public deprecated void removeVerticalAccuracy();
}
}
package android.media {
public final class AudioFormat implements android.os.Parcelable {

View File

@@ -646,7 +646,10 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasAltitude} will return false,
* and {@link #getAltitude} will return 0.0.
*
* @deprecated use a new Location object for location updates.
*/
@Deprecated
public void removeAltitude() {
mAltitude = 0.0f;
mFieldsMask &= ~HAS_ALTITUDE_MASK;
@@ -683,7 +686,10 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasSpeed} will return false,
* and {@link #getSpeed} will return 0.0.
*
* @deprecated use a new Location object for location updates.
*/
@Deprecated
public void removeSpeed() {
mSpeed = 0.0f;
mFieldsMask &= ~HAS_SPEED_MASK;
@@ -733,7 +739,10 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasBearing} will return false,
* and {@link #getBearing} will return 0.0.
*
* @deprecated use a new Location object for location updates.
*/
@Deprecated
public void removeBearing() {
mBearing = 0.0f;
mFieldsMask &= ~HAS_BEARING_MASK;
@@ -790,7 +799,10 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasAccuracy} will return false, and
* {@link #getAccuracy} will return 0.0.
*
* @deprecated use a new Location object for location updates.
*/
@Deprecated
public void removeAccuracy() {
mHorizontalAccuracyMeters = 0.0f;
mFieldsMask &= ~HAS_HORIZONTAL_ACCURACY_MASK;
@@ -839,7 +851,11 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasVerticalAccuracy} will return false, and
* {@link #getVerticalAccuracyMeters} will return 0.0.
*
* @deprecated use a new Location object for location updates.
* @removed
*/
@Deprecated
public void removeVerticalAccuracy() {
mVerticalAccuracyMeters = 0.0f;
mFieldsMask &= ~HAS_VERTICAL_ACCURACY_MASK;
@@ -883,7 +899,11 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasSpeedAccuracy} will return false, and
* {@link #getSpeedAccuracyMetersPerSecond} will return 0.0.
*
* @deprecated use a new Location object for location updates.
* @removed
*/
@Deprecated
public void removeSpeedAccuracy() {
mSpeedAccuracyMetersPerSecond = 0.0f;
mFieldsMask &= ~HAS_SPEED_ACCURACY_MASK;
@@ -927,7 +947,11 @@ public class Location implements Parcelable {
*
* <p>Following this call {@link #hasBearingAccuracy} will return false, and
* {@link #getBearingAccuracyDegrees} will return 0.0.
*
* @deprecated use a new Location object for location updates.
* @removed
*/
@Deprecated
public void removeBearingAccuracy() {
mBearingAccuracyDegrees = 0.0f;
mFieldsMask &= ~HAS_BEARING_ACCURACY_MASK;