From 4af3b8d14e37258e0ed97b732f34f4d79ebb8f65 Mon Sep 17 00:00:00 2001 From: Soonil Nagarkar Date: Thu, 7 Nov 2019 09:43:16 -0800 Subject: Re-add incorrectly removed API addNmeaListener was incorrectly removed in Q, breaking backwards compatibility. Re-adding in R so that apps can continue to compile against R while working on older platforms. Bug: 141019880 Test: na Change-Id: I527e73dcdb30fa4af8ca91bcfe113b2aa7bc87a5 --- location/java/android/location/LocationManager.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'location/java/android') diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 2eef2747d682..2725a01e8cb1 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -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. -- cgit v1.2.3-59-g8ed1b