Revert "WifiTracker: Do not allow share/easy connect for demo mode"

This reverts commit 6877c304dabd8a602948867c411520c009f212f3.

Reason for revert: DroidMonitor-triggered revert due to breakage. b/201960397
Bug: 201960397

Change-Id: Ifa141b7ab0e1e758c42f83ae3a8896ddd9397c67

13 files changed, 143 insertions, 263 deletions

diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
index 536be2010..2b9bc78f7 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
@@ -140,7 +140,6 @@ public class BaseWifiTracker implements LifecycleObserver {
     private final BaseWifiTracker.Scanner mScanner;
     private final BaseWifiTrackerCallback mListener;
 
-    protected final WifiTrackerInjector mInjector;
     protected final Context mContext;
     protected final WifiManager mWifiManager;
     protected final ConnectivityManager mConnectivityManager;
@@ -300,7 +299,6 @@ public class BaseWifiTracker implements LifecycleObserver {
             String tag) {
         lifecycle.addObserver(this);
         mContext = context;
-        mInjector = new WifiTrackerInjector(context);
         mWifiManager = wifiManager;
         mConnectivityManager = connectivityManager;
         mNetworkScoreManager = networkScoreManager;
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java
index fed973941..422d34940 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java
@@ -37,14 +37,11 @@ public class NetworkRequestEntry extends StandardWifiEntry {
     //                    Remove once String keys are removed entirely.
     public static final String KEY_PREFIX = "NetworkRequestEntry:";
 
-    NetworkRequestEntry(
-            @NonNull WifiTrackerInjector injector,
-            @NonNull Context context, @NonNull Handler callbackHandler,
+    NetworkRequestEntry(@NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull StandardWifiEntryKey key, @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
             boolean forSavedNetworksPage) throws IllegalArgumentException {
-        super(injector, context, callbackHandler, key, wifiManager, scoreCache,
-                forSavedNetworksPage);
+        super(context, callbackHandler, key, wifiManager, scoreCache, forSavedNetworksPage);
     }
 
     @Override
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
index 1cdc47c20..8933ce739 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
@@ -285,8 +285,8 @@ public class SavedNetworkTracker extends BaseWifiTracker {
 
         // Create new entry for each unmatched config
         for (StandardWifiEntryKey key : wifiConfigsByKey.keySet()) {
-            mStandardWifiEntryCache.add(new StandardWifiEntry(mInjector, mContext, mMainHandler,
-                    key, wifiConfigsByKey.get(key), null, mWifiManager, mWifiNetworkScoreCache,
+            mStandardWifiEntryCache.add(new StandardWifiEntry(mContext, mMainHandler, key,
+                    wifiConfigsByKey.get(key), null, mWifiManager, mWifiNetworkScoreCache,
                     true /* forSavedNetworksPage */));
         }
     }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java
index a6299cc61..39470c65b 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java
@@ -69,12 +69,12 @@ public class StandardNetworkDetailsTracker extends NetworkDetailsTracker {
         mKey = new StandardWifiEntryKey(key);
         if (mKey.isNetworkRequest()) {
             mIsNetworkRequest = true;
-            mChosenEntry = new NetworkRequestEntry(mInjector, mContext, mMainHandler, mKey,
-                    mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+            mChosenEntry = new NetworkRequestEntry(mContext, mMainHandler, mKey, mWifiManager,
+                    mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
         } else {
             mIsNetworkRequest = false;
-            mChosenEntry = new StandardWifiEntry(mInjector, mContext, mMainHandler, mKey,
-                    mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+            mChosenEntry = new StandardWifiEntry(mContext, mMainHandler, mKey, mWifiManager,
+                    mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
         }
         // It is safe to call updateStartInfo() in the main thread here since onStart() won't have
         // a chance to post handleOnStart() on the worker thread until the main thread finishes
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index 72f7000b8..994331a69 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -101,7 +101,6 @@ public class StandardWifiEntry extends WifiEntry {
 
     @NonNull private final StandardWifiEntryKey mKey;
 
-    @NonNull private final WifiTrackerInjector mInjector;
     @NonNull private final Context mContext;
 
     // Map of security type to matching scan results
@@ -128,14 +127,11 @@ public class StandardWifiEntry extends WifiEntry {
     private final boolean mIsWpa3SuiteBSupported;
     private final boolean mIsEnhancedOpenSupported;
 
-    StandardWifiEntry(
-            @NonNull WifiTrackerInjector injector,
-            @NonNull Context context, @NonNull Handler callbackHandler,
+    StandardWifiEntry(@NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull StandardWifiEntryKey key, @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
             boolean forSavedNetworksPage) {
         super(callbackHandler, wifiManager, scoreCache, forSavedNetworksPage);
-        mInjector = injector;
         mContext = context;
         mKey = key;
         mIsWpa3SaeSupported = wifiManager.isWpa3SaeSupported();
@@ -144,16 +140,14 @@ public class StandardWifiEntry extends WifiEntry {
         updateRecommendationServiceLabel();
     }
 
-    StandardWifiEntry(
-            @NonNull WifiTrackerInjector injector,
-            @NonNull Context context, @NonNull Handler callbackHandler,
+    StandardWifiEntry(@NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull StandardWifiEntryKey key,
             @Nullable List<WifiConfiguration> configs,
             @Nullable List<ScanResult> scanResults,
             @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
             boolean forSavedNetworksPage) throws IllegalArgumentException {
-        this(injector, context, callbackHandler, key, wifiManager, scoreCache,
+        this(context, callbackHandler, key, wifiManager, scoreCache,
                 forSavedNetworksPage);
         if (configs != null && !configs.isEmpty()) {
             updateConfig(configs);
@@ -435,10 +429,6 @@ public class StandardWifiEntry extends WifiEntry {
      */
     @Override
     public synchronized boolean canShare() {
-        if (mInjector.isDemoMode()) {
-            return false;
-        }
-
         if (getWifiConfiguration() == null) {
             return false;
         }
@@ -462,10 +452,6 @@ public class StandardWifiEntry extends WifiEntry {
      */
     @Override
     public synchronized boolean canEasyConnect() {
-        if (mInjector.isDemoMode()) {
-            return false;
-        }
-
         if (getWifiConfiguration() == null) {
             return false;
         }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
index 22342b96a..e97aa28b6 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
@@ -476,8 +476,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
         for (ScanResultKey scanKey: newScanKeys) {
             final StandardWifiEntryKey entryKey =
                     new StandardWifiEntryKey(scanKey, true /* isTargetingNewNetworks */);
-            final StandardWifiEntry newEntry = new StandardWifiEntry(mInjector, mContext,
-                    mMainHandler, entryKey, mStandardWifiConfigCache.get(entryKey),
+            final StandardWifiEntry newEntry = new StandardWifiEntry(mContext, mMainHandler,
+                    entryKey, mStandardWifiConfigCache.get(entryKey),
                     scanResultsByKey.get(scanKey), mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
             mStandardWifiEntryCache.add(newEntry);
@@ -528,8 +528,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
                     || !scanResultsByKey.containsKey(scanKey)) {
                 continue;
             }
-            final StandardWifiEntry newEntry = new StandardWifiEntry(mInjector, mContext,
-                    mMainHandler, entryKey, mSuggestedConfigCache.get(entryKey),
+            final StandardWifiEntry newEntry = new StandardWifiEntry(mContext, mMainHandler,
+                    entryKey, mSuggestedConfigCache.get(entryKey),
                     scanResultsByKey.get(scanKey), mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
             newEntry.setUserShareable(userSharedEntryKeys.contains(entryKey));
@@ -821,9 +821,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
         final StandardWifiEntryKey entryKey = new StandardWifiEntryKey(matchingConfigs.get(0));
         if (mNetworkRequestEntry == null
                 || !mNetworkRequestEntry.getStandardWifiEntryKey().equals(entryKey)) {
-            mNetworkRequestEntry = new NetworkRequestEntry(mInjector, mContext, mMainHandler,
-                    entryKey, mWifiManager, mWifiNetworkScoreCache,
-                    false /* forSavedNetworksPage */);
+            mNetworkRequestEntry = new NetworkRequestEntry(mContext, mMainHandler, entryKey,
+                    mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
             mNetworkRequestEntry.updateConfig(matchingConfigs);
             updateNetworkRequestEntryScans(mScanResultUpdater.getScanResults());
         }
@@ -860,9 +859,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
                 }
             }
             final StandardWifiEntry connectedEntry =
-                    new StandardWifiEntry(mInjector, mContext, mMainHandler, entryKey, configs,
-                            null, mWifiManager, mWifiNetworkScoreCache,
-                            false /* forSavedNetworksPage */);
+                    new StandardWifiEntry(mContext, mMainHandler, entryKey, configs, null,
+                            mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
             connectedEntry.updateConnectionInfo(wifiInfo, networkInfo);
             mStandardWifiEntryCache.add(connectedEntry);
             return;
@@ -896,9 +894,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
                 }
             }
             final StandardWifiEntry connectedEntry =
-                    new StandardWifiEntry(mInjector, mContext, mMainHandler, entryKey, configs,
-                            null, mWifiManager, mWifiNetworkScoreCache,
-                            false /* forSavedNetworksPage */);
+                    new StandardWifiEntry(mContext, mMainHandler, entryKey, configs, null,
+                            mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
             connectedEntry.updateConnectionInfo(wifiInfo, networkInfo);
             mSuggestedWifiEntryCache.add(connectedEntry);
             return;
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiTrackerInjector.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiTrackerInjector.java
deleted file mode 100644
index 096b16c83..000000000
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiTrackerInjector.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.wifitrackerlib;
-
-import android.content.Context;
-import android.os.UserManager;
-
-import androidx.annotation.NonNull;
-
-/**
- * Wrapper class for commonly referenced objects and static data.
- */
-class WifiTrackerInjector {
-    private final boolean mIsDemoMode;
-
-    // TODO(b/201571677): Migrate the rest of the common objects to WifiTrackerInjector.
-    WifiTrackerInjector(@NonNull Context context) {
-        mIsDemoMode = context.getSystemService(UserManager.class).isDemoUser();
-    }
-
-    boolean isDemoMode() {
-        return mIsDemoMode;
-    }
-}
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java
index 9d46f8a98..ef2c003a2 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java
@@ -30,7 +30,6 @@ import android.net.ConnectivityManager;
 import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
-import android.os.UserManager;
 import android.os.test.TestLooper;
 
 import androidx.lifecycle.Lifecycle;
@@ -51,13 +50,18 @@ public class NetworkDetailsTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock private Lifecycle mMockLifecycle;
-    @Mock private Context mMockContext;
-    @Mock private WifiManager mMockWifiManager;
-    @Mock private ConnectivityManager mMockConnectivityManager;
-    @Mock private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock private UserManager mMockUserManager;
-    @Mock private Clock mMockClock;
+    @Mock
+    private Lifecycle mMockLifecycle;
+    @Mock
+    private Context mMockContext;
+    @Mock
+    private WifiManager mMockWifiManager;
+    @Mock
+    private ConnectivityManager mMockConnectivityManager;
+    @Mock
+    private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock
+    private Clock mMockClock;
 
     private TestLooper mTestLooper;
 
@@ -82,7 +86,6 @@ public class NetworkDetailsTrackerTest {
 
         mTestLooper = new TestLooper();
 
-        when(mMockContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);
         when(mMockWifiManager.getScanResults()).thenReturn(new ArrayList<>());
         when(mMockWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_ENABLED);
         when(mMockClock.millis()).thenReturn(START_MILLIS);
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java
index 63b6c0bdf..89482b1c2 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java
@@ -39,7 +39,6 @@ import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.net.wifi.hotspot2.pps.Credential;
 import android.net.wifi.hotspot2.pps.HomeSp;
 import android.os.Handler;
-import android.os.UserManager;
 import android.os.test.TestLooper;
 
 import androidx.lifecycle.Lifecycle;
@@ -64,14 +63,20 @@ public class SavedNetworkTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock private Lifecycle mMockLifecycle;
-    @Mock private Context mMockContext;
-    @Mock private WifiManager mMockWifiManager;
-    @Mock private ConnectivityManager mMockConnectivityManager;
-    @Mock private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock private UserManager mMockUserManager;
-    @Mock private Clock mMockClock;
-    @Mock private SavedNetworkTracker.SavedNetworkTrackerCallback mMockCallback;
+    @Mock
+    private Lifecycle mMockLifecycle;
+    @Mock
+    private Context mMockContext;
+    @Mock
+    private WifiManager mMockWifiManager;
+    @Mock
+    private ConnectivityManager mMockConnectivityManager;
+    @Mock
+    private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock
+    private Clock mMockClock;
+    @Mock
+    private SavedNetworkTracker.SavedNetworkTrackerCallback mMockCallback;
 
     private TestLooper mTestLooper;
 
@@ -99,7 +104,6 @@ public class SavedNetworkTrackerTest {
 
         mTestLooper = new TestLooper();
 
-        when(mMockContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);
         when(mMockWifiManager.getScanResults()).thenReturn(new ArrayList<>());
         when(mMockWifiManager.isWpa3SaeSupported()).thenReturn(true);
         when(mMockWifiManager.isWpa3SuiteBSupported()).thenReturn(true);
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java
index a14eecdae..ef124ad06 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java
@@ -41,7 +41,6 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
-import android.os.UserManager;
 import android.os.test.TestLooper;
 
 import androidx.lifecycle.Lifecycle;
@@ -63,13 +62,18 @@ public class StandardNetworkDetailsTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock private Lifecycle mMockLifecycle;
-    @Mock private Context mMockContext;
-    @Mock private WifiManager mMockWifiManager;
-    @Mock private ConnectivityManager mMockConnectivityManager;
-    @Mock private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock private UserManager mMockUserManager;
-    @Mock private Clock mMockClock;
+    @Mock
+    private Lifecycle mMockLifecycle;
+    @Mock
+    private Context mMockContext;
+    @Mock
+    private WifiManager mMockWifiManager;
+    @Mock
+    private ConnectivityManager mMockConnectivityManager;
+    @Mock
+    private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock
+    private Clock mMockClock;
 
     private TestLooper mTestLooper;
 
@@ -98,7 +102,6 @@ public class StandardNetworkDetailsTrackerTest {
 
         mTestLooper = new TestLooper();
 
-        when(mMockContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);
         when(mMockWifiManager.isWpa3SaeSupported()).thenReturn(true);
         when(mMockWifiManager.isWpa3SuiteBSupported()).thenReturn(true);
         when(mMockWifiManager.isEnhancedOpenSupported()).thenReturn(true);
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
index 21bce71a1..80aad2a8b 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
@@ -98,7 +98,6 @@ public class StandardWifiEntryTest {
     @Mock private SubscriptionManager mSubscriptionManager;
     @Mock private WifiInfo mMockWifiInfo;
     @Mock private NetworkInfo mMockNetworkInfo;
-    @Mock private WifiTrackerInjector mMockInjector;
     @Mock private Context mMockContext;
     @Mock private NetworkScoreManager mMockNetworkScoreManager;
     @Mock private WifiNetworkScoreCache mMockScoreCache;
@@ -149,8 +148,7 @@ public class StandardWifiEntryTest {
     @Test
     public void testConstructor_mismatchedSsids_throwsException() {
         try {
-            new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+            new StandardWifiEntry(mMockContext, mTestHandler,
                     ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                     null, Arrays.asList(
                             buildScanResult("ssid0", "bssid0", 0, GOOD_RSSI),
@@ -167,8 +165,7 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testConstructor_scanResults_setsBestLevel() {
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI),
@@ -189,14 +186,12 @@ public class StandardWifiEntryTest {
         final ScanResult secureScan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         secureScan.capabilities = "EAP/SHA1";
 
-        final StandardWifiEntry unsecureEntry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry unsecureEntry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetworks */),
                 null, Arrays.asList(unsecureScan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
-        final StandardWifiEntry secureEntry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry secureEntry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP,
                         true /* isTargetingNewNetworks */),
                 null, Arrays.asList(secureScan), mMockWifiManager, mMockScoreCache,
@@ -211,8 +206,7 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testUpdateScanResultInfo_mismatchedSsids_throwsException() {
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid0", SECURITY_TYPE_EAP),
                 null, Arrays.asList(buildScanResult("ssid0", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -231,8 +225,7 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testUpdateScanResultInfo_notifiesListener() {
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid", 0)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -249,8 +242,7 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testUpdateScanResultInfo_updatesLevel() {
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid", 0, BAD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -267,8 +259,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -281,8 +272,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -295,8 +285,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -316,8 +305,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -336,8 +324,7 @@ public class StandardWifiEntryTest {
     public void testUpdateConfig_unsavedToSaved() {
         final ScanResult scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 null, Arrays.asList(scan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -359,8 +346,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -378,8 +364,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -399,8 +384,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -417,8 +401,7 @@ public class StandardWifiEntryTest {
     @Test
     public void testConnect_savedNetwork_usesSavedConfig() {
         final ScanResult scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(scan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -435,8 +418,7 @@ public class StandardWifiEntryTest {
     @Test
     public void testConnect_savedNetwork_usesSavedConfig_withOutSim() {
         final ScanResult scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 null, Arrays.asList(scan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -458,8 +440,7 @@ public class StandardWifiEntryTest {
 
     @Test
     public void testConnect_openNetwork_callsConnect() {
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -473,8 +454,7 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedSecureNetwork_returnsNoConfigFailure() {
         final ScanResult secureScan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         secureScan.capabilities = "PSK";
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 null, Arrays.asList(secureScan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -499,8 +479,7 @@ public class StandardWifiEntryTest {
         when(spyConfig.getRandomizedMacAddress())
                 .thenReturn(MacAddress.fromString(randomizedMac));
 
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(spyConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -519,8 +498,7 @@ public class StandardWifiEntryTest {
         config.networkId = 1;
         config.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
         when(mMockWifiManager.getFactoryMacAddresses()).thenReturn(new String[]{factoryMac});
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -547,8 +525,7 @@ public class StandardWifiEntryTest {
         config.networkId = networkId;
         config.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
         when(mMockWifiManager.getFactoryMacAddresses()).thenReturn(new String[]{factoryMac});
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -596,8 +573,7 @@ public class StandardWifiEntryTest {
         final ScanResult pskScanResult = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         pskScanResult.capabilities = "PSK";
 
-        final StandardWifiEntry pskWifiEntry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry pskWifiEntry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey(pskScanResult.SSID, SECURITY_TYPE_PSK),
                 null, Arrays.asList(pskScanResult), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -645,8 +621,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -664,8 +639,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(wifiConfigurationSecureType);
-        return new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        return new StandardWifiEntry(mMockContext, mTestHandler,
                 new StandardWifiEntryKey(config), Collections.singletonList(config), null,
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
     }
@@ -697,8 +671,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.networkId = networkId;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -743,8 +716,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.networkId = networkId;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -771,8 +743,7 @@ public class StandardWifiEntryTest {
         config.SSID = "\"ssid\"";
         config.networkId = networkId;
 
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -821,8 +792,7 @@ public class StandardWifiEntryTest {
         ScanResult saeScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         saeScan.capabilities = "SAE";
 
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Arrays.asList(pskConfig, saeConfig), Arrays.asList(pskScan, saeScan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -860,8 +830,7 @@ public class StandardWifiEntryTest {
         when(mMockWifiInfo.getRssi()).thenReturn(GOOD_RSSI);
         when(mMockNetworkInfo.getDetailedState()).thenReturn(NetworkInfo.DetailedState.CONNECTED);
 
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Arrays.asList(pskConfig, saeConfig), Arrays.asList(pskScan, saeScan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -901,8 +870,7 @@ public class StandardWifiEntryTest {
         final ScanResult eapWpa3Scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         eapWpa3Scan.capabilities = "[RSN-EAP/SHA256][MFPR][MFPC]";
 
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Arrays.asList(eapConfig, eapWpa3Config), Arrays.asList(eapScan, eapWpa3Scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -923,8 +891,7 @@ public class StandardWifiEntryTest {
 
     @Test
     public void testCanSignIn_captivePortalCapability_returnsTrue() {
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
@@ -940,8 +907,7 @@ public class StandardWifiEntryTest {
     public void testUpdateNetworkCapabilities_userConnect_autoOpenCaptivePortalOnce() {
         when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mMockConnectivityManager);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
@@ -964,8 +930,7 @@ public class StandardWifiEntryTest {
 
     @Test
     public void testShouldEditBeforeConnect_nullWifiConfig_returnFalse() {
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
 
@@ -978,8 +943,7 @@ public class StandardWifiEntryTest {
         WifiConfiguration wifiConfig = new WifiConfiguration();
         wifiConfig.SSID = "\"ssid\"";
         wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(wifiConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -988,8 +952,7 @@ public class StandardWifiEntryTest {
 
         // Test enhanced open networks.
         wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
-        entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OWE),
                 Collections.singletonList(wifiConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -1003,8 +966,7 @@ public class StandardWifiEntryTest {
         WifiConfiguration wifiConfig = spy(new WifiConfiguration());
         wifiConfig.SSID = "\"ssid\"";
         wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Collections.singletonList(wifiConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -1045,8 +1007,7 @@ public class StandardWifiEntryTest {
     @Test
     public void testGetSpeed_cacheUpdated_speedValueChanges() {
         when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Collections.singletonList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -1068,8 +1029,7 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), Collections.singletonList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)), mMockWifiManager,
@@ -1084,8 +1044,7 @@ public class StandardWifiEntryTest {
     public void testGetSpeed_newScanResults_speedValueChanges() {
         when(mMockScoredNetwork.calculateBadge(BAD_RSSI)).thenReturn(SPEED_SLOW);
         when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
-        final StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Collections.singletonList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -1099,8 +1058,7 @@ public class StandardWifiEntryTest {
     @Test
     public void testCanConnect_nonEapMethod_returnTrueIfReachable() {
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1109,8 +1067,7 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "OWE";
-        spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OWE),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1119,8 +1076,7 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "WEP";
-        spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_WEP),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1129,8 +1085,7 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "PSK";
-        spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1139,8 +1094,7 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "SAE";
-        spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_SAE),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1159,8 +1113,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1180,8 +1133,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1204,8 +1156,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1231,8 +1182,7 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1281,8 +1231,7 @@ public class StandardWifiEntryTest {
         pskScan.capabilities = "PSK";
         ScanResult saeScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         saeScan.capabilities = "SAE";
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK,
                         true /* isTargetingNewNetwork */),
                 Collections.singletonList(pskConfig), Arrays.asList(pskScan, saeScan),
@@ -1309,8 +1258,7 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedOpen_configuresOpenNetwork() {
         ScanResult openScan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         openScan.capabilities = "";
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetworks */),
                 null, Collections.singletonList(openScan),
@@ -1329,8 +1277,7 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedOwe_configuresOweNetwork() {
         ScanResult oweScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         oweScan.capabilities = "OWE";
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OWE,
                         true /* isTargetingNewNetworks */),
                 null, Collections.singletonList(oweScan),
@@ -1349,8 +1296,7 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedOpenOwe_configuresOweAndOpenNetwork() {
         ScanResult oweTransitionScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         oweTransitionScan.capabilities = "OWE_TRANSITION";
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetworks */),
                 null, Collections.singletonList(oweTransitionScan),
@@ -1379,8 +1325,7 @@ public class StandardWifiEntryTest {
         oweConfig.SSID = "\"ssid\"";
         oweConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
 
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetwork */),
                 Arrays.asList(openConfig, oweConfig), null,
@@ -1399,8 +1344,7 @@ public class StandardWifiEntryTest {
         saeConfig.SSID = "\"ssid\"";
         saeConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
 
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK,
                         true /* isTargetingNewNetwork */),
                 Arrays.asList(pskConfig, saeConfig), null,
@@ -1419,8 +1363,7 @@ public class StandardWifiEntryTest {
         eapWpa3Config.SSID = "\"ssid\"";
         eapWpa3Config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
 
-        StandardWifiEntry entry = new StandardWifiEntry(
-                mMockInjector, mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP,
                         true /* isTargetingNewNetwork */),
                 Arrays.asList(eapConfig, eapWpa3Config), null,
@@ -1429,25 +1372,4 @@ public class StandardWifiEntryTest {
         assertThat(entry.getSecurity()).isEqualTo(WifiEntry.SECURITY_EAP);
         assertThat(entry.getWifiConfiguration()).isEqualTo(eapConfig);
     }
-
-    @Test
-    public void testCanShare_isDemoMode_returnsFalse() {
-        when(mMockInjector.isDemoMode()).thenReturn(true);
-
-        final StandardWifiEntry pskWifiEntry =
-                getSavedStandardWifiEntry(WifiConfiguration.SECURITY_TYPE_PSK);
-
-        assertThat(pskWifiEntry.canShare()).isFalse();
-    }
-
-    @Test
-    public void testCanEasyConnect_isDemoMode_returnsFalse() {
-        when(mMockInjector.isDemoMode()).thenReturn(true);
-
-        final StandardWifiEntry pskWifiEntry =
-                getSavedStandardWifiEntry(WifiConfiguration.SECURITY_TYPE_PSK);
-
-        assertThat(pskWifiEntry.canEasyConnect()).isFalse();
-    }
-
 }
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java
index 20beaa9cb..73137feb2 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java
@@ -94,12 +94,10 @@ public class UtilsTest {
 
     private static final String TEST_CARRIER_NAME = "carrierName";
 
-    @Mock private WifiTrackerInjector mMockInjector;
     @Mock private Context mMockContext;
     @Mock private Resources mMockResources;
     @Mock private NetworkScoreManager mMockNetworkScoreManager;
     @Mock private WifiNetworkScoreCache mMockScoreCache;
-    @Mock private WifiManager mMockWifiManager;
     @Mock private SubscriptionManager mSubscriptionManager;
     @Mock private TelephonyManager mTelephonyManager;
     @Mock private CarrierConfigManager mCarrierConfigManager;
@@ -494,9 +492,10 @@ public class UtilsTest {
 
 
     private StandardWifiEntry getStandardWifiEntry(WifiConfiguration config) {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockInjector, mMockContext,
-                mTestHandler, new StandardWifiEntryKey(config), Collections.singletonList(config),
-                null, mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
+        final WifiManager mockWifiManager = mock(WifiManager.class);
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+                new StandardWifiEntryKey(config), Collections.singletonList(config),
+                null, mockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
         final WifiInfo mockWifiInfo = mock(WifiInfo.class);
         final NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
 
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java
index 769c3cce1..dd487e9f6 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java
@@ -48,7 +48,6 @@ import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.net.wifi.hotspot2.pps.Credential;
 import android.net.wifi.hotspot2.pps.HomeSp;
 import android.os.Handler;
-import android.os.UserManager;
 import android.os.test.TestLooper;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -80,19 +79,30 @@ public class WifiPickerTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock private Lifecycle mMockLifecycle;
-    @Mock private Context mMockContext;
-    @Mock private Resources mMockResources;
-    @Mock private WifiManager mMockWifiManager;
-    @Mock private ConnectivityManager mMockConnectivityManager;
-    @Mock private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock private TelephonyManager mMockTelephonyManager;
-    @Mock private UserManager mMockUserManager;
-    @Mock private Clock mMockClock;
-    @Mock private WifiPickerTracker.WifiPickerTrackerCallback mMockCallback;
-    @Mock private WifiInfo mMockWifiInfo;
-    @Mock private NetworkInfo mMockNetworkInfo;
-    @Mock private Network mMockNetwork;
+    @Mock
+    private Lifecycle mMockLifecycle;
+    @Mock
+    private Context mMockContext;
+    @Mock
+    private Resources mMockResources;
+    @Mock
+    private WifiManager mMockWifiManager;
+    @Mock
+    private ConnectivityManager mMockConnectivityManager;
+    @Mock
+    private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock
+    private TelephonyManager mMockTelephonyManager;
+    @Mock
+    private Clock mMockClock;
+    @Mock
+    private WifiPickerTracker.WifiPickerTrackerCallback mMockCallback;
+    @Mock
+    private WifiInfo mMockWifiInfo;
+    @Mock
+    private NetworkInfo mMockNetworkInfo;
+    @Mock
+    private Network mMockNetwork;
 
     private TestLooper mTestLooper;
 
@@ -133,7 +143,6 @@ public class WifiPickerTrackerTest {
 
         mTestLooper = new TestLooper();
 
-        when(mMockContext.getSystemService(UserManager.class)).thenReturn(mMockUserManager);
         when(mMockWifiManager.getScanResults()).thenReturn(new ArrayList<>());
         when(mMockWifiManager.getConnectionInfo()).thenReturn(mMockWifiInfo);
         when(mMockWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_ENABLED);