Merge "Fix no-handler callback registrations"

1 files changed, 2 insertions, 2 deletions

diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index b7dd543680dc..c48f6e83ff20 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -1890,7 +1890,7 @@ public class LocationManager {
     @Deprecated
     @RequiresPermission(ACCESS_FINE_LOCATION)
     public boolean registerGnssStatusCallback(@NonNull GnssStatus.Callback callback) {
-        return registerGnssStatusCallback(callback, null);
+        return registerGnssStatusCallback(Runnable::run, callback);
     }
 
     /**
@@ -1985,7 +1985,7 @@ public class LocationManager {
     @Deprecated
     @RequiresPermission(ACCESS_FINE_LOCATION)
     public boolean addNmeaListener(@NonNull OnNmeaMessageListener listener) {
-        return addNmeaListener(listener, null);
+        return addNmeaListener(Runnable::run, listener);
     }
 
     /**