Merge "Re-add incorrectly removed API" (c06439dd) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -23164,6 +23164,7 @@ package android.location {

		public class LocationManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addGpsStatusListener(android.location.GpsStatus.Listener);
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.GpsStatus.NmeaListener);
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener);
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull android.location.OnNmeaMessageListener, @Nullable android.os.Handler);
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(@NonNull java.util.concurrent.Executor, @NonNull android.location.OnNmeaMessageListener);
		@@ -23194,6 +23195,7 @@ package android.location {
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull android.location.GnssStatus.Callback, @Nullable android.os.Handler);
		method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean registerGnssStatusCallback(@NonNull java.util.concurrent.Executor, @NonNull android.location.GnssStatus.Callback);
		method @Deprecated public void removeGpsStatusListener(android.location.GpsStatus.Listener);
		method @Deprecated public void removeNmeaListener(@NonNull android.location.GpsStatus.NmeaListener);
		method public void removeNmeaListener(@NonNull android.location.OnNmeaMessageListener);
		method @RequiresPermission(anyOf={"android.permission.ACCESS_COARSE_LOCATION", "android.permission.ACCESS_FINE_LOCATION"}, apis="..22") public void removeProximityAlert(@NonNull android.app.PendingIntent);
		method public void removeTestProvider(@NonNull String);

api/removed.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -217,11 +217,6 @@ package android.location {
		method @Deprecated public void removeVerticalAccuracy();
		}

		public class LocationManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public boolean addNmeaListener(android.location.GpsStatus.NmeaListener);
		method @Deprecated public void removeNmeaListener(android.location.GpsStatus.NmeaListener);
		}

		}

		package android.media {

location/java/android/location/LocationManager.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -1963,23 +1963,21 @@ public class LocationManager {
		/**
		* No-op method to keep backward-compatibility.
		*
		* @deprecated use {@link #addNmeaListener(OnNmeaMessageListener)} instead.
		* @removed
		* @deprecated Use {@link #addNmeaListener} instead.
		*/
		@Deprecated
		@RequiresPermission(ACCESS_FINE_LOCATION)
		public boolean addNmeaListener(GpsStatus.NmeaListener listener) {
		public boolean addNmeaListener(@NonNull GpsStatus.NmeaListener listener) {
		return false;
		}

		/**
		* No-op method to keep backward-compatibility.
		*
		* @deprecated use {@link #removeNmeaListener(OnNmeaMessageListener)} instead.
		* @removed
		* @deprecated Use {@link #removeNmeaListener(OnNmeaMessageListener)} instead.
		*/
		@Deprecated
		public void removeNmeaListener(GpsStatus.NmeaListener listener) {}
		public void removeNmeaListener(@NonNull GpsStatus.NmeaListener listener) {}

		/**
		* Adds an NMEA listener.