From 5f549c40fcc4d87ed981a1c91ebf95f4d580dd28 Mon Sep 17 00:00:00 2001 From: Yu-Han Yang Date: Thu, 16 Jul 2020 12:52:15 -0700 Subject: [PATCH] DO NOT MERGE: Move updateSatelliteBlacklist after handleInitialize - updateSatelliteBlacklist should be called after HAL initialization is done. - The bug is likely triggered after ag/11960757 where the initialization order changed. Bug: 161443390 Test: on device Change-Id: If771783b8be22b08631bee6fe2e8b575956597cd --- .../com/android/server/location/gnss/GnssLocationProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java index 85544d0a1b029..a6a607e4ce66f 100644 --- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java @@ -718,7 +718,6 @@ public class GnssLocationProvider extends AbstractLocationProvider implements GnssSatelliteBlacklistHelper gnssSatelliteBlacklistHelper = new GnssSatelliteBlacklistHelper(mContext, mLooper, this); - mHandler.post(gnssSatelliteBlacklistHelper::updateSatelliteBlacklist); mGnssBatchingProvider = new GnssBatchingProvider(); mGnssGeofenceProvider = new GnssGeofenceProvider(); @@ -746,6 +745,7 @@ public class GnssLocationProvider extends AbstractLocationProvider implements setAllowed(true); sendMessage(INITIALIZE_HANDLER, 0, null); + mHandler.post(gnssSatelliteBlacklistHelper::updateSatelliteBlacklist); } /**