Do not get looper during initialize

Only get the looper when we need it

Flag: EXEMPT refactor
Bug: 385840659
Test: atest android.net.wifi
Change-Id: If16c3a72b3bc4d4d62505706fd8ba4aa9a349eef

6 files changed, 13 insertions, 50 deletions

diff --git a/framework/java/android/net/wifi/WifiFrameworkInitializer.java b/framework/java/android/net/wifi/WifiFrameworkInitializer.java
index 4c700c0f11..e942d74f74 100644
--- a/framework/java/android/net/wifi/WifiFrameworkInitializer.java
+++ b/framework/java/android/net/wifi/WifiFrameworkInitializer.java
@@ -29,10 +29,6 @@ import android.net.wifi.rtt.WifiRttManager;
 import android.net.wifi.usd.IUsdManager;
 import android.net.wifi.usd.UsdManager;
 import android.net.wifi.util.Environment;
-import android.os.HandlerThread;
-import android.os.Looper;
-
-import androidx.annotation.VisibleForTesting;
 
 /**
  * Class for performing registration for all Wifi services.
@@ -41,32 +37,6 @@ import androidx.annotation.VisibleForTesting;
  */
 @SystemApi
 public class WifiFrameworkInitializer {
-
-    /**
-     * A class implementing the lazy holder idiom: the unique static instance
-     * of {@link #INSTANCE} is instantiated in a thread-safe way (guaranteed by
-     * the language specs) the first time that NoPreloadHolder is referenced in getInstanceLooper().
-     *
-     * This is necessary because we can't spawn a new thread in {@link #registerServiceWrappers()}.
-     * {@link #registerServiceWrappers()} is called during the Zygote phase, which disallows
-     * spawning new threads. Naming the class "NoPreloadHolder" ensures that the classloader will
-     * not preload this class, inadvertently spawning the thread too early.
-     */
-    private static class NoPreloadHolder {
-        private static final HandlerThread INSTANCE = createInstance();
-
-        private static HandlerThread createInstance() {
-            HandlerThread thread = new HandlerThread("WifiManagerThread");
-            thread.start();
-            return thread;
-        }
-    }
-    /** @hide */
-    @VisibleForTesting
-    public static Looper getInstanceLooper() {
-        return NoPreloadHolder.INSTANCE.getLooper();
-    }
-
     private WifiFrameworkInitializer() {}
 
     /**
@@ -86,7 +56,7 @@ public class WifiFrameworkInitializer {
                         return null;
                     }
                     IWifiManager service = IWifiManager.Stub.asInterface(serviceBinder);
-                    return new WifiManager(context, service, getInstanceLooper());
+                    return new WifiManager(context, service);
                 }
         );
         SystemServiceRegistry.registerContextAwareService(
@@ -122,7 +92,7 @@ public class WifiFrameworkInitializer {
                         return null;
                     }
                     IWifiScanner service = IWifiScanner.Stub.asInterface(serviceBinder);
-                    return new WifiScanner(context, service, getInstanceLooper());
+                    return new WifiScanner(context, service);
                 }
         );
         SystemServiceRegistry.registerContextAwareService(
diff --git a/framework/java/android/net/wifi/WifiManager.java b/framework/java/android/net/wifi/WifiManager.java
index 121ee0374a..52836c2940 100644
--- a/framework/java/android/net/wifi/WifiManager.java
+++ b/framework/java/android/net/wifi/WifiManager.java
@@ -2217,15 +2217,12 @@ public class WifiManager {
      *
      * @param context the application context
      * @param service the Binder interface
-     * @param looper the Looper used to deliver callbacks
      * @hide - hide this because it takes in a parameter of type IWifiManager, which
      * is a system private class.
      */
-    public WifiManager(@NonNull Context context, @NonNull IWifiManager service,
-        @NonNull Looper looper) {
+    public WifiManager(@NonNull Context context, @NonNull IWifiManager service) {
         mContext = context;
         mService = service;
-        mLooper = looper;
         mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion;
         updateVerboseLoggingEnabledFromService();
     }
@@ -7560,7 +7557,7 @@ public class WifiManager {
             @Nullable ActionListener listener) {
         ActionListenerProxy listenerProxy = null;
         if (listener != null) {
-            listenerProxy = new ActionListenerProxy("connect", mLooper, listener);
+            listenerProxy = new ActionListenerProxy("connect", mContext.getMainLooper(), listener);
         }
         try {
             Bundle extras = new Bundle();
@@ -7709,7 +7706,7 @@ public class WifiManager {
         if (config == null) throw new IllegalArgumentException("config cannot be null");
         ActionListenerProxy listenerProxy = null;
         if (listener != null) {
-            listenerProxy = new ActionListenerProxy("save", mLooper, listener);
+            listenerProxy = new ActionListenerProxy("save", mContext.getMainLooper(), listener);
         }
         try {
             mService.save(config, listenerProxy, mContext.getOpPackageName());
@@ -7747,7 +7744,7 @@ public class WifiManager {
         if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative");
         ActionListenerProxy listenerProxy = null;
         if (listener != null) {
-            listenerProxy = new ActionListenerProxy("forget", mLooper, listener);
+            listenerProxy = new ActionListenerProxy("forget", mContext.getMainLooper(), listener);
         }
         try {
             mService.forget(netId, listenerProxy);
diff --git a/framework/java/android/net/wifi/WifiScanner.java b/framework/java/android/net/wifi/WifiScanner.java
index 1dffa8a3c7..fd9676e0e4 100644
--- a/framework/java/android/net/wifi/WifiScanner.java
+++ b/framework/java/android/net/wifi/WifiScanner.java
@@ -34,7 +34,6 @@ import android.content.Context;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Looper;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.Process;
@@ -2022,12 +2021,9 @@ public class WifiScanner {
      *
      * @param context the application context
      * @param service the Binder interface for {@link Context#WIFI_SCANNING_SERVICE}
-     * @param looper the Looper used to deliver callbacks
-     *
      * @hide
      */
-    public WifiScanner(@NonNull Context context, @NonNull IWifiScanner service,
-            @NonNull Looper looper) {
+    public WifiScanner(@NonNull Context context, @NonNull IWifiScanner service) {
         mContext = context;
         mService = service;
     }
diff --git a/framework/tests/src/android/net/wifi/WifiManagerTest.java b/framework/tests/src/android/net/wifi/WifiManagerTest.java
index a029be2267..2c297a9822 100644
--- a/framework/tests/src/android/net/wifi/WifiManagerTest.java
+++ b/framework/tests/src/android/net/wifi/WifiManagerTest.java
@@ -316,7 +316,8 @@ public class WifiManagerTest {
         mApplicationInfo.targetSdkVersion = Build.VERSION_CODES.Q;
         when(mContext.getApplicationInfo()).thenReturn(mApplicationInfo);
         when(mContext.getOpPackageName()).thenReturn(TEST_PACKAGE_NAME);
-        mWifiManager = new WifiManager(mContext, mWifiService, mLooper.getLooper());
+        when(mContext.getMainLooper()).thenReturn(mLooper.getLooper());
+        mWifiManager = new WifiManager(mContext, mWifiService);
         verify(mWifiService).getVerboseLoggingLevel();
         mWifiNetworkSuggestion = new WifiNetworkSuggestion();
         mScanResultsCallback = new ScanResultsCallback() {
diff --git a/framework/tests/src/android/net/wifi/WifiScannerTest.java b/framework/tests/src/android/net/wifi/WifiScannerTest.java
index 25a0cb6df3..237dc5dbf8 100644
--- a/framework/tests/src/android/net/wifi/WifiScannerTest.java
+++ b/framework/tests/src/android/net/wifi/WifiScannerTest.java
@@ -105,7 +105,7 @@ public class WifiScannerTest {
         MockitoAnnotations.initMocks(this);
         mLooper = new TestLooper();
         mHandler = spy(new Handler(mLooper.getLooper()));
-        mWifiScanner = new WifiScanner(mContext, mService, mLooper.getLooper());
+        mWifiScanner = new WifiScanner(mContext, mService);
         mLooper.dispatchAll();
         when(mParcelableScanData.getResults()).thenReturn(mScanData);
         when(mContext.getOpPackageName()).thenReturn(TEST_PACKAGE_NAME);
@@ -597,12 +597,12 @@ public class WifiScannerTest {
     @Test
     public void testWifiScannerConcurrentServiceStart() {
         WifiScanner wifiScanner = new WifiScanner(
-                mContext, mService, WifiFrameworkInitializer.getInstanceLooper());
+                mContext, mService);
 
         Thread thread1 = new Thread(() -> {
             try {
                 WifiScanner wifiScanner1 = new WifiScanner(
-                        mContext, mService, WifiFrameworkInitializer.getInstanceLooper());
+                        mContext, mService);
             }  catch (NullPointerException e) {
                 fail("WifiScanner can't be initialized! " + e);
             }
diff --git a/service/tests/wifitests/src/com/android/server/wifi/util/RssiUtilTest.java b/service/tests/wifitests/src/com/android/server/wifi/util/RssiUtilTest.java
index 3e924173c0..6089651d3f 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/util/RssiUtilTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/util/RssiUtilTest.java
@@ -30,7 +30,6 @@ import android.net.wifi.IWifiManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
-import android.os.Looper;
 
 import androidx.test.filters.SmallTest;
 
@@ -117,7 +116,7 @@ public class RssiUtilTest extends WifiBaseTest {
         when(context.getApplicationInfo()).thenReturn(applicationInfo);
         when(context.getOpPackageName()).thenReturn("TestPackage");
         WifiManager wifiManager = new WifiManager(
-                context, iWifiManager, mock(Looper.class));
+                context, iWifiManager);
 
         int level = wifiManager.getMaxSignalLevel();
         assertThat(level).isEqualTo(4);