Add lifecycle observer after tracker is fully initialized

Bug: 310112419
Tested: CTS Verifier

Change-Id: Ie20317b8b20a4ea16694aa03b4b352c43d19fe19

1 files changed, 4 insertions, 3 deletions

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
index 1e11afa2a..d704d395c 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
@@ -344,9 +344,6 @@ public class BaseWifiTracker {
                 BaseWifiTracker.this.onDestroy();
             }
         };
-        if (lifecycle != null) {
-            lifecycle.addObserver(mLifecycleObserver);
-        }
         mContext = context;
         mWifiManager = wifiManager;
         mConnectivityManager = connectivityManager;
@@ -366,6 +363,10 @@ public class BaseWifiTracker {
         mScanResultUpdater = new ScanResultUpdater(clock,
                 maxScanAgeMillis + scanIntervalMillis);
         mScanner = new BaseWifiTracker.Scanner(workerHandler.getLooper());
+
+        if (lifecycle != null) { // Need to add after mScanner is initialized.
+            lifecycle.addObserver(mLifecycleObserver);
+        }
     }
 
     /**