From 42317137d8c9bda389c7bd6cf7d5378d60b3bdc0 Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Fri, 28 Aug 2020 18:03:41 -0700 Subject: wifi: get the correct mainline version when wifi is disabled update getWifiStackVersion() to return the correct mainline version even when wifi is disabled. Bug: 166835054 Test: atest com.android.server.wifi Test: manual test to confirm post-boot detection can detect SW version change correctly Change-Id: I3eb878145a761452ddcfdd0b5c424e78212fc799 Merged-In: I3eb878145a761452ddcfdd0b5c424e78212fc799 --- tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java index 1f524994a..c679954b1 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiHealthMonitorTest.java @@ -327,7 +327,7 @@ public class WifiHealthMonitorTest extends WifiBaseTest { // trigger extractCurrentSoftwareBuildInfo() call to update currSoftwareBuildInfo mWifiHealthMonitor.installMemoryStoreSetUpDetectionAlarm(mMemoryStore); mWifiHealthMonitor.setWifiEnabled(true); - assertEquals(0, mWifiHealthMonitor.getWifiStackVersion()); + assertEquals(MODULE_VERSION, mWifiHealthMonitor.getWifiStackVersion()); millisecondsPass(5000); mWifiScanner.startScan(mScanSettings, mScanListener); mAlarmManager.dispatch(WifiHealthMonitor.POST_BOOT_DETECTION_TIMER_TAG); -- cgit v1.2.3