From cab87314a57197caa8e61eb7b934bb89603e7a75 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Wed, 8 Jul 2020 17:39:19 -0700
Subject: [PATCH] Keep old callback thread

Discrepency between documented and delivered thread in prior versions
got confused. Switching back to the main thread for delivery when not
specified.

Bug: 160565229
Test: presubmit only
Change-Id: I3461f16278a38082f7101b83e9e23b1e30c949b0
---
 location/java/android/location/LocationManager.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index fed65c971f7e3..aa9dd40f5e0fb 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -1855,7 +1855,8 @@ public class LocationManager {
                     "GpsStatus APIs not supported, please use GnssStatus APIs instead");
         }
 
-        getGnssStatusTransportMultiplexer().addListener(listener, DIRECT_EXECUTOR);
+        getGnssStatusTransportMultiplexer().addListener(listener,
+                new HandlerExecutor(new Handler()));
         return true;
     }
 
@@ -1974,7 +1975,7 @@ public class LocationManager {
     @Deprecated
     @RequiresPermission(ACCESS_FINE_LOCATION)
     public boolean addNmeaListener(@NonNull OnNmeaMessageListener listener) {
-        return addNmeaListener(DIRECT_EXECUTOR, listener);
+        return addNmeaListener(listener, null);
     }
 
     /**