summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleg Kibirev <olegk@google.com>2023-11-29 22:14:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-11-29 22:14:42 +0000
commita83fdae39e9eceb35daf53d61b00230e786976a7 (patch)
tree6331a5eb4e1e0e5ad64a13d17583b11797cc63ab
parent8eb0f80289db65d0591eeb046f23f7158c265b3a (diff)
parent0ff0e8d1682393330bbd2e88fb10f875da161bb7 (diff)
downloadwifi-a83fdae39e9eceb35daf53d61b00230e786976a7.tar.gz
Merge "Add lifecycle observer after tracker is fully initialized" into main
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java7
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);
+ }
}
/**