Fix boot regression from KeyStore being slow

Getting the secret hashfunction from KeyStore had increased wifi service
start time by ~20ms.

Moving this to loadFromStore, which happens right after boot complete, should
fix the problem.

Bug: 144579147
Test: atest FrameworksWifiTests
Change-Id: I478f1d558121e56e3d8bdeed4220eb8ba4ef097a
Merged-In: I478f1d558121e56e3d8bdeed4220eb8ba4ef097a
(cherry picked from: 0c6db026e4463abb4030cdf4f7813152f2dd1996)

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index 95a1e84e0..a1b1a298c 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -296,6 +296,16 @@ public class WifiConfigManagerTest {
     }
 
     /**
+     * Verifies that the Mac randomization secret hashfunction is obtained after |loadFromStore|.
+     */
+    @Test
+    public void testMacHashIsObtainedAfterLoadFromStore() {
+        verify(mMacAddressUtil, never()).obtainMacRandHashFunction(anyInt());
+        assertTrue(mWifiConfigManager.loadFromStore());
+        verify(mMacAddressUtil).obtainMacRandHashFunction(anyInt());
+    }
+
+    /**
      * Verifies the addition of a single network using
      * {@link WifiConfigManager#addOrUpdateNetwork(WifiConfiguration, int)}
      */