summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Quang Luong <qal@google.com> 2022-01-19 17:29:54 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-01-19 17:29:54 +0000
commite241644c9c865f7710b2885ad5a46155794b1d1c (patch)
tree257a82496777af572aceb3e81cb05f89a8a13171
parent319a3c5cefe373ee585a18408cb66f95c184e7c8 (diff)
parent829076e56da3f7b970ff073bb261478743168aca (diff)
Merge "Revert "Make ServiceWifiResources utility classes @hide APIs""
-rw-r--r--service/java/com/android/server/wifi/AvailableNetworkNotifier.java1
-rw-r--r--service/java/com/android/server/wifi/ClientModeImpl.java1
-rw-r--r--service/java/com/android/server/wifi/ConnectToNetworkNotificationBuilder.java1
-rw-r--r--service/java/com/android/server/wifi/ConnectionFailureNotificationBuilder.java1
-rw-r--r--service/java/com/android/server/wifi/ConnectionFailureNotifier.java1
-rw-r--r--service/java/com/android/server/wifi/EapFailureNotifier.java2
-rw-r--r--service/java/com/android/server/wifi/InsecureEapNetworkHandler.java1
-rw-r--r--service/java/com/android/server/wifi/OpenNetworkNotifier.java1
-rw-r--r--service/java/com/android/server/wifi/SimRequiredNotifier.java1
-rw-r--r--service/java/com/android/server/wifi/SoftApManager.java1
-rw-r--r--service/java/com/android/server/wifi/SoftApNotifier.java1
-rw-r--r--service/java/com/android/server/wifi/WakeupNotificationFactory.java1
-rw-r--r--service/java/com/android/server/wifi/WakeupOnboarding.java1
-rw-r--r--service/java/com/android/server/wifi/WifiCarrierInfoManager.java1
-rw-r--r--service/java/com/android/server/wifi/WifiConfigStore.java2
-rw-r--r--service/java/com/android/server/wifi/WifiConnectivityManager.java1
-rw-r--r--service/java/com/android/server/wifi/WifiContext.java (renamed from framework/java/android/net/wifi/WifiContext.java)15
-rw-r--r--service/java/com/android/server/wifi/WifiInjector.java1
-rw-r--r--service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java1
-rw-r--r--service/java/com/android/server/wifi/WifiService.java1
-rw-r--r--service/java/com/android/server/wifi/WifiShellCommand.java1
-rw-r--r--service/java/com/android/server/wifi/WifiStringResourceWrapper.java (renamed from framework/java/android/net/wifi/WifiStringResourceWrapper.java)8
-rw-r--r--service/java/com/android/server/wifi/WrongPasswordNotifier.java1
-rw-r--r--service/java/com/android/server/wifi/aware/WifiAwareService.java2
-rw-r--r--service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java2
-rw-r--r--service/java/com/android/server/wifi/p2p/WifiP2pService.java2
-rw-r--r--service/java/com/android/server/wifi/rtt/RttService.java2
-rw-r--r--service/java/com/android/server/wifi/scanner/WifiScanningService.java2
-rw-r--r--service/java/com/android/server/wifi/util/Environment.java (renamed from framework/java/android/net/wifi/util/Environment.java)4
-rw-r--r--service/tests/wifitests/Android.bp6
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/AvailableNetworkNotifierTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/ConnectionFailureNotifierTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/EapFailureNotifierTest.java2
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/InsecureEapNetworkHandlerTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/SoftApNotifierTest.java4
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java2
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiShellCommandTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WifiStringResourceWrapperTest.java (renamed from framework/tests/src/android/net/wifi/WifiStringResourceWrapperTest.java)9
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java1
-rw-r--r--service/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java2
48 files changed, 28 insertions, 70 deletions
diff --git a/service/java/com/android/server/wifi/AvailableNetworkNotifier.java b/service/java/com/android/server/wifi/AvailableNetworkNotifier.java
index 4ecac8de29..89fc4dae48 100644
--- a/service/java/com/android/server/wifi/AvailableNetworkNotifier.java
+++ b/service/java/com/android/server/wifi/AvailableNetworkNotifier.java
@@ -34,7 +34,6 @@ import android.database.ContentObserver;
import android.net.wifi.IActionListener;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.util.ScanResultUtil;
import android.os.Handler;
import android.os.Looper;
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index 2499531149..989815b66c 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -73,7 +73,6 @@ import android.net.wifi.SecurityParams;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiAnnotations.WifiStandard;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
diff --git a/service/java/com/android/server/wifi/ConnectToNetworkNotificationBuilder.java b/service/java/com/android/server/wifi/ConnectToNetworkNotificationBuilder.java
index 709ecaee0e..948abc13c6 100644
--- a/service/java/com/android/server/wifi/ConnectToNetworkNotificationBuilder.java
+++ b/service/java/com/android/server/wifi/ConnectToNetworkNotificationBuilder.java
@@ -23,7 +23,6 @@ import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.net.wifi.ScanResult;
-import android.net.wifi.WifiContext;
import android.util.Log;
import com.android.modules.utils.build.SdkLevel;
diff --git a/service/java/com/android/server/wifi/ConnectionFailureNotificationBuilder.java b/service/java/com/android/server/wifi/ConnectionFailureNotificationBuilder.java
index 52f72892a5..8620ddc9a4 100644
--- a/service/java/com/android/server/wifi/ConnectionFailureNotificationBuilder.java
+++ b/service/java/com/android/server/wifi/ConnectionFailureNotificationBuilder.java
@@ -24,7 +24,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.view.WindowManager;
import com.android.wifi.resources.R;
diff --git a/service/java/com/android/server/wifi/ConnectionFailureNotifier.java b/service/java/com/android/server/wifi/ConnectionFailureNotifier.java
index 447b10412b..123b8f69e6 100644
--- a/service/java/com/android/server/wifi/ConnectionFailureNotifier.java
+++ b/service/java/com/android/server/wifi/ConnectionFailureNotifier.java
@@ -24,7 +24,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.os.Handler;
import android.os.Process;
import android.util.Log;
diff --git a/service/java/com/android/server/wifi/EapFailureNotifier.java b/service/java/com/android/server/wifi/EapFailureNotifier.java
index d795dc6341..6385e38925 100644
--- a/service/java/com/android/server/wifi/EapFailureNotifier.java
+++ b/service/java/com/android/server/wifi/EapFailureNotifier.java
@@ -21,8 +21,6 @@ import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
-import android.net.wifi.WifiStringResourceWrapper;
import android.provider.Settings;
import android.service.notification.StatusBarNotification;
import android.telephony.TelephonyManager;
diff --git a/service/java/com/android/server/wifi/InsecureEapNetworkHandler.java b/service/java/com/android/server/wifi/InsecureEapNetworkHandler.java
index 3855dc2d39..ea3562bede 100644
--- a/service/java/com/android/server/wifi/InsecureEapNetworkHandler.java
+++ b/service/java/com/android/server/wifi/InsecureEapNetworkHandler.java
@@ -30,7 +30,6 @@ import android.content.IntentFilter;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.os.Handler;
import android.provider.Browser;
diff --git a/service/java/com/android/server/wifi/OpenNetworkNotifier.java b/service/java/com/android/server/wifi/OpenNetworkNotifier.java
index bae58b7ca2..25fd972515 100644
--- a/service/java/com/android/server/wifi/OpenNetworkNotifier.java
+++ b/service/java/com/android/server/wifi/OpenNetworkNotifier.java
@@ -16,7 +16,6 @@
package com.android.server.wifi;
-import android.net.wifi.WifiContext;
import android.os.Looper;
import android.provider.Settings;
diff --git a/service/java/com/android/server/wifi/SimRequiredNotifier.java b/service/java/com/android/server/wifi/SimRequiredNotifier.java
index 4c4aba5cf8..69fe4c3c92 100644
--- a/service/java/com/android/server/wifi/SimRequiredNotifier.java
+++ b/service/java/com/android/server/wifi/SimRequiredNotifier.java
@@ -21,7 +21,6 @@ import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.provider.Settings;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
diff --git a/service/java/com/android/server/wifi/SoftApManager.java b/service/java/com/android/server/wifi/SoftApManager.java
index c9d6fd7fe0..353b222189 100644
--- a/service/java/com/android/server/wifi/SoftApManager.java
+++ b/service/java/com/android/server/wifi/SoftApManager.java
@@ -33,7 +33,6 @@ import android.net.wifi.SoftApConfiguration;
import android.net.wifi.SoftApInfo;
import android.net.wifi.WifiAnnotations;
import android.net.wifi.WifiClient;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiSsid;
diff --git a/service/java/com/android/server/wifi/SoftApNotifier.java b/service/java/com/android/server/wifi/SoftApNotifier.java
index f75815088f..c75eeddfa4 100644
--- a/service/java/com/android/server/wifi/SoftApNotifier.java
+++ b/service/java/com/android/server/wifi/SoftApNotifier.java
@@ -20,7 +20,6 @@ import android.app.Notification;
import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.drawable.Icon;
-import android.net.wifi.WifiContext;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
diff --git a/service/java/com/android/server/wifi/WakeupNotificationFactory.java b/service/java/com/android/server/wifi/WakeupNotificationFactory.java
index 728fa862d5..0187009ebc 100644
--- a/service/java/com/android/server/wifi/WakeupNotificationFactory.java
+++ b/service/java/com/android/server/wifi/WakeupNotificationFactory.java
@@ -20,7 +20,6 @@ import android.app.Notification;
import android.app.PendingIntent;
import android.content.Intent;
import android.graphics.drawable.Icon;
-import android.net.wifi.WifiContext;
import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
import com.android.wifi.resources.R;
diff --git a/service/java/com/android/server/wifi/WakeupOnboarding.java b/service/java/com/android/server/wifi/WakeupOnboarding.java
index a8ea874967..c7fc717fe1 100644
--- a/service/java/com/android/server/wifi/WakeupOnboarding.java
+++ b/service/java/com/android/server/wifi/WakeupOnboarding.java
@@ -24,7 +24,6 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.net.wifi.WifiContext;
import android.os.Handler;
import android.os.SystemClock;
import android.provider.Settings;
diff --git a/service/java/com/android/server/wifi/WifiCarrierInfoManager.java b/service/java/com/android/server/wifi/WifiCarrierInfoManager.java
index d04a77b7dd..0368af9c2b 100644
--- a/service/java/com/android/server/wifi/WifiCarrierInfoManager.java
+++ b/service/java/com/android/server/wifi/WifiCarrierInfoManager.java
@@ -34,7 +34,6 @@ import android.database.ContentObserver;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 74952014a4..34b148e572 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -24,7 +24,6 @@ import android.annotation.Nullable;
import android.app.AlarmManager;
import android.content.Context;
import android.net.wifi.WifiMigration;
-import android.net.wifi.util.Environment;
import android.os.Handler;
import android.os.UserHandle;
import android.util.AtomicFile;
@@ -36,6 +35,7 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.Preconditions;
import com.android.server.wifi.util.EncryptedData;
+import com.android.server.wifi.util.Environment;
import com.android.server.wifi.util.FileUtils;
import com.android.server.wifi.util.WifiConfigStoreEncryptionUtil;
import com.android.server.wifi.util.XmlUtil;
diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 4dc0189beb..937b43ab13 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -33,7 +33,6 @@ import android.content.IntentFilter;
import android.net.MacAddress;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.DeviceMobilityState;
diff --git a/framework/java/android/net/wifi/WifiContext.java b/service/java/com/android/server/wifi/WifiContext.java
index 9df4b8c4a3..aa7def45ee 100644
--- a/framework/java/android/net/wifi/WifiContext.java
+++ b/service/java/com/android/server/wifi/WifiContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.net.wifi;
+package com.android.server.wifi;
import android.annotation.NonNull;
import android.content.Context;
@@ -24,17 +24,16 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.AssetManager;
import android.content.res.Resources;
-import android.net.wifi.util.Environment;
import android.util.Log;
+import com.android.server.wifi.util.Environment;
+
import java.util.List;
import java.util.stream.Collectors;
/**
* Wrapper for context to override getResources method. Resources for wifi mainline jar needs to be
* fetched from the resources APK.
- *
- * @hide
*/
public class WifiContext extends ContextWrapper {
private static final String TAG = "WifiContext";
@@ -65,7 +64,6 @@ public class WifiContext extends ContextWrapper {
List<ResolveInfo> resolveInfos = getPackageManager().queryIntentActivities(
new Intent(ACTION_RESOURCES_APK),
PackageManager.MATCH_SYSTEM_ONLY);
- Log.i(TAG, "Got resolveInfos: " + resolveInfos);
// remove apps that don't live in the Wifi apex
resolveInfos.removeIf(info ->
@@ -159,10 +157,7 @@ public class WifiContext extends ContextWrapper {
mWifiThemeFromApk = null;
}
- /**
- * Returns an instance of WifiStringResourceWrapper with the given subId and carrierId.
- */
- public WifiStringResourceWrapper getStringResourceWrapper(int subId, int carrierId) {
+ WifiStringResourceWrapper getStringResourceWrapper(int subId, int carrierId) {
return new WifiStringResourceWrapper(this, subId, carrierId);
}
}
diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java
index d3ea13cefc..8b424ae806 100644
--- a/service/java/com/android/server/wifi/WifiInjector.java
+++ b/service/java/com/android/server/wifi/WifiInjector.java
@@ -29,7 +29,6 @@ import android.net.MatchAllNetworkSpecifier;
import android.net.NetworkAgentConfig;
import android.net.NetworkCapabilities;
import android.net.NetworkProvider;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiScanner;
import android.net.wifi.nl80211.WifiNl80211Manager;
import android.os.BatteryStatsManager;
diff --git a/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java b/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java
index 16a087bbbd..77164ee183 100644
--- a/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java
+++ b/service/java/com/android/server/wifi/WifiNetworkSuggestionsManager.java
@@ -43,7 +43,6 @@ import android.net.wifi.ISuggestionConnectionStatusListener;
import android.net.wifi.ISuggestionUserApprovalStatusListener;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiNetworkSuggestion;
diff --git a/service/java/com/android/server/wifi/WifiService.java b/service/java/com/android/server/wifi/WifiService.java
index 31a0cd7748..3ebbb98dd5 100644
--- a/service/java/com/android/server/wifi/WifiService.java
+++ b/service/java/com/android/server/wifi/WifiService.java
@@ -17,7 +17,6 @@
package com.android.server.wifi;
import android.content.Context;
-import android.net.wifi.WifiContext;
import android.util.Log;
import com.android.server.SystemService;
diff --git a/service/java/com/android/server/wifi/WifiShellCommand.java b/service/java/com/android/server/wifi/WifiShellCommand.java
index fdef4b7cdd..dda04e6659 100644
--- a/service/java/com/android/server/wifi/WifiShellCommand.java
+++ b/service/java/com/android/server/wifi/WifiShellCommand.java
@@ -52,7 +52,6 @@ import android.net.wifi.SupplicantState;
import android.net.wifi.WifiClient;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConnectedSessionInfo;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiNetworkSpecifier;
diff --git a/framework/java/android/net/wifi/WifiStringResourceWrapper.java b/service/java/com/android/server/wifi/WifiStringResourceWrapper.java
index b0a59a57c1..9b6337d315 100644
--- a/framework/java/android/net/wifi/WifiStringResourceWrapper.java
+++ b/service/java/com/android/server/wifi/WifiStringResourceWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.net.wifi;
+package com.android.server.wifi;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -42,8 +42,6 @@ import com.android.internal.annotations.VisibleForTesting;
*
* The WiFi-stack specific solution is to store the strings in the general name-space with a known
* prefix.
- *
- * @hide
*/
public class WifiStringResourceWrapper {
private static final String TAG = "WifiStringResourceWrapper";
@@ -65,7 +63,7 @@ public class WifiStringResourceWrapper {
* @param context a WifiContext
* @param subId the sub ID to use for all the resources (overlays or carrier ID)
*/
- public WifiStringResourceWrapper(WifiContext context, int subId, int carrierId) {
+ WifiStringResourceWrapper(WifiContext context, int subId, int carrierId) {
mContext = context;
mSubId = subId;
mCarrierId = carrierId;
diff --git a/service/java/com/android/server/wifi/WrongPasswordNotifier.java b/service/java/com/android/server/wifi/WrongPasswordNotifier.java
index 637246e208..ce59684f03 100644
--- a/service/java/com/android/server/wifi/WrongPasswordNotifier.java
+++ b/service/java/com/android/server/wifi/WrongPasswordNotifier.java
@@ -21,7 +21,6 @@ import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Icon;
-import android.net.wifi.WifiContext;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
diff --git a/service/java/com/android/server/wifi/aware/WifiAwareService.java b/service/java/com/android/server/wifi/aware/WifiAwareService.java
index 0e7c54ed45..2389b9ccdc 100644
--- a/service/java/com/android/server/wifi/aware/WifiAwareService.java
+++ b/service/java/com/android/server/wifi/aware/WifiAwareService.java
@@ -17,12 +17,12 @@
package com.android.server.wifi.aware;
import android.content.Context;
-import android.net.wifi.WifiContext;
import android.os.HandlerThread;
import android.util.Log;
import com.android.server.SystemService;
import com.android.server.wifi.HalDeviceManager;
+import com.android.server.wifi.WifiContext;
import com.android.server.wifi.WifiInjector;
/**
diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java b/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java
index 4cf7d8e2b2..49105dd457 100644
--- a/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java
+++ b/service/java/com/android/server/wifi/hotspot2/PasspointProvisioner.java
@@ -31,7 +31,6 @@ import android.net.wifi.hotspot2.OsuProvider;
import android.net.wifi.hotspot2.PasspointConfiguration;
import android.net.wifi.hotspot2.ProvisioningCallback;
import android.net.wifi.hotspot2.omadm.PpsMoParser;
-import android.net.wifi.util.Environment;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
@@ -56,6 +55,7 @@ import com.android.server.wifi.hotspot2.soap.UpdateResponseMessage;
import com.android.server.wifi.hotspot2.soap.command.BrowserUri;
import com.android.server.wifi.hotspot2.soap.command.PpsMoData;
import com.android.server.wifi.hotspot2.soap.command.SppCommand;
+import com.android.server.wifi.util.Environment;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pService.java b/service/java/com/android/server/wifi/p2p/WifiP2pService.java
index 2ffe9ae085..2b536b0cd4 100644
--- a/service/java/com/android/server/wifi/p2p/WifiP2pService.java
+++ b/service/java/com/android/server/wifi/p2p/WifiP2pService.java
@@ -17,10 +17,10 @@
package com.android.server.wifi.p2p;
import android.content.Context;
-import android.net.wifi.WifiContext;
import android.util.Log;
import com.android.server.SystemService;
+import com.android.server.wifi.WifiContext;
import com.android.server.wifi.WifiInjector;
/**
diff --git a/service/java/com/android/server/wifi/rtt/RttService.java b/service/java/com/android/server/wifi/rtt/RttService.java
index c4eb6c5377..17e4558681 100644
--- a/service/java/com/android/server/wifi/rtt/RttService.java
+++ b/service/java/com/android/server/wifi/rtt/RttService.java
@@ -17,13 +17,13 @@
package com.android.server.wifi.rtt;
import android.content.Context;
-import android.net.wifi.WifiContext;
import android.net.wifi.aware.WifiAwareManager;
import android.os.HandlerThread;
import android.util.Log;
import com.android.server.SystemService;
import com.android.server.wifi.HalDeviceManager;
+import com.android.server.wifi.WifiContext;
import com.android.server.wifi.WifiInjector;
import com.android.server.wifi.util.WifiPermissionsUtil;
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningService.java b/service/java/com/android/server/wifi/scanner/WifiScanningService.java
index d5f55f069c..8ec0d15e2f 100644
--- a/service/java/com/android/server/wifi/scanner/WifiScanningService.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningService.java
@@ -17,12 +17,12 @@
package com.android.server.wifi.scanner;
import android.content.Context;
-import android.net.wifi.WifiContext;
import android.os.BatteryStatsManager;
import android.os.HandlerThread;
import android.util.Log;
import com.android.server.SystemService;
+import com.android.server.wifi.WifiContext;
import com.android.server.wifi.WifiInjector;
/**
diff --git a/framework/java/android/net/wifi/util/Environment.java b/service/java/com/android/server/wifi/util/Environment.java
index f8c4125124..a423d55e6c 100644
--- a/framework/java/android/net/wifi/util/Environment.java
+++ b/service/java/com/android/server/wifi/util/Environment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.net.wifi.util;
+package com.android.server.wifi.util;
import android.content.ApexEnvironment;
import android.content.pm.ApplicationInfo;
diff --git a/service/tests/wifitests/Android.bp b/service/tests/wifitests/Android.bp
index ddf34f44fb..6894f45c8e 100644
--- a/service/tests/wifitests/Android.bp
+++ b/service/tests/wifitests/Android.bp
@@ -399,6 +399,9 @@ android_test {
"com.android.server.wifi.WifiConnectivityManager",
"com.android.server.wifi.WifiConnectivityManager$*",
"com.android.server.wifi.WifiConnectivityManager.**",
+ "com.android.server.wifi.WifiContext",
+ "com.android.server.wifi.WifiContext$*",
+ "com.android.server.wifi.WifiContext.**",
"com.android.server.wifi.WifiCountryCode",
"com.android.server.wifi.WifiCountryCode$*",
"com.android.server.wifi.WifiCountryCode.**",
@@ -846,6 +849,9 @@ android_test {
"com.android.server.wifi.util.EncryptedData",
"com.android.server.wifi.util.EncryptedData$*",
"com.android.server.wifi.util.EncryptedData.**",
+ "com.android.server.wifi.util.Environment",
+ "com.android.server.wifi.util.Environment$*",
+ "com.android.server.wifi.util.Environment.**",
"com.android.server.wifi.util.ExternalCallbackTracker",
"com.android.server.wifi.util.ExternalCallbackTracker$*",
"com.android.server.wifi.util.ExternalCallbackTracker.**",
diff --git a/service/tests/wifitests/src/com/android/server/wifi/AvailableNetworkNotifierTest.java b/service/tests/wifitests/src/com/android/server/wifi/AvailableNetworkNotifierTest.java
index bd76cf5c66..0dd8beec72 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/AvailableNetworkNotifierTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/AvailableNetworkNotifierTest.java
@@ -24,7 +24,6 @@ import android.content.BroadcastReceiver;
import android.content.Intent;
import android.net.wifi.ScanResult;
import android.net.wifi.ScanResult.InformationElement;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiSsid;
import android.os.Looper;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index 9488d54221..5ae589b452 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -114,7 +114,6 @@ import android.net.wifi.SecurityParams;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.KeyMgmt;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/ConnectionFailureNotifierTest.java b/service/tests/wifitests/src/com/android/server/wifi/ConnectionFailureNotifierTest.java
index a55461c908..fda7b6dacf 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/ConnectionFailureNotifierTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/ConnectionFailureNotifierTest.java
@@ -28,7 +28,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.os.Handler;
import android.os.Process;
import android.os.test.TestLooper;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/EapFailureNotifierTest.java b/service/tests/wifitests/src/com/android/server/wifi/EapFailureNotifierTest.java
index 2b2c8b1bab..031ad39e36 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/EapFailureNotifierTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/EapFailureNotifierTest.java
@@ -34,8 +34,6 @@ import android.app.PendingIntent;
import android.content.Intent;
import android.content.res.Resources;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
-import android.net.wifi.WifiStringResourceWrapper;
import android.provider.Settings;
import android.service.notification.StatusBarNotification;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/InsecureEapNetworkHandlerTest.java b/service/tests/wifitests/src/com/android/server/wifi/InsecureEapNetworkHandlerTest.java
index e1b3bd682d..994db7ddf5 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/InsecureEapNetworkHandlerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/InsecureEapNetworkHandlerTest.java
@@ -36,7 +36,6 @@ import android.app.Notification;
import android.content.BroadcastReceiver;
import android.content.Intent;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.os.Handler;
import android.view.Window;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java b/service/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java
index c19a809f88..67be29ceec 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/OpenNetworkNotifierTest.java
@@ -41,7 +41,6 @@ import android.content.res.Resources;
import android.database.ContentObserver;
import android.net.Uri;
import android.net.wifi.ScanResult;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiManager;
import android.os.Message;
import android.os.Process;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
index c00bede8eb..46a05c6920 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java
@@ -63,7 +63,6 @@ import android.net.wifi.SoftApConfiguration;
import android.net.wifi.SoftApConfiguration.Builder;
import android.net.wifi.SoftApInfo;
import android.net.wifi.WifiClient;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiScanner;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/SoftApNotifierTest.java b/service/tests/wifitests/src/com/android/server/wifi/SoftApNotifierTest.java
index 5f1cdfaea3..1e02f601f5 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/SoftApNotifierTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/SoftApNotifierTest.java
@@ -27,7 +27,6 @@ import android.app.Notification;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
-import android.net.wifi.WifiContext;
import androidx.test.filters.SmallTest;
@@ -45,8 +44,7 @@ import org.mockito.MockitoAnnotations;
public class SoftApNotifierTest extends WifiBaseTest {
private static final String TEST_SSID = "Test SSID";
- @Mock
- WifiContext mContext;
+ @Mock WifiContext mContext;
@Mock Resources mResources;
@Mock WifiNotificationManager mWifiNotificationManager;
@Mock FrameworkFacade mFrameworkFacade;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java b/service/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java
index c60c89a2eb..8c4809ca09 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WakeupOnboardingTest.java
@@ -31,7 +31,6 @@ import static org.mockito.Mockito.verify;
import android.content.BroadcastReceiver;
import android.content.Intent;
import android.content.IntentFilter;
-import android.net.wifi.WifiContext;
import android.os.Handler;
import android.os.test.TestLooper;
import android.provider.Settings;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java
index 84ba29dae6..88e5c40238 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiCarrierInfoManagerTest.java
@@ -45,7 +45,6 @@ import android.content.res.Resources;
import android.database.ContentObserver;
import android.net.Uri;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index b2d105de6e..461197648b 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -57,7 +57,6 @@ import android.net.wifi.ScanResult;
import android.net.wifi.SecurityParams;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
index 6d7260eb2a..1d93bc1605 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java
@@ -68,7 +68,6 @@ import android.net.wifi.ScanResult;
import android.net.wifi.ScanResult.InformationElement;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiNetworkSuggestion;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java
index ff2731756a..6af10d0c44 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiInjectorTest.java
@@ -16,8 +16,6 @@
package com.android.server.wifi;
-import android.net.wifi.WifiContext;
-
import androidx.test.filters.SmallTest;
import org.junit.Before;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java
index 86a4f33560..4abde76015 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiNetworkSuggestionsManagerTest.java
@@ -56,7 +56,6 @@ import android.net.wifi.ISuggestionConnectionStatusListener;
import android.net.wifi.ISuggestionUserApprovalStatusListener;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiNetworkSuggestion;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiShellCommandTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiShellCommandTest.java
index f6d6d3a65c..8d19e34f12 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiShellCommandTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiShellCommandTest.java
@@ -50,7 +50,6 @@ import android.net.NetworkRequest;
import android.net.wifi.SoftApConfiguration;
import android.net.wifi.SupplicantState;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiNetworkSpecifier;
import android.net.wifi.WifiNetworkSuggestion;
diff --git a/framework/tests/src/android/net/wifi/WifiStringResourceWrapperTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiStringResourceWrapperTest.java
index 36dcf313ef..a6bb54c940 100644
--- a/framework/tests/src/android/net/wifi/WifiStringResourceWrapperTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiStringResourceWrapperTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2022 The Android Open Source Project
+ * 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.
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-package android.net.wifi;
-
-import static android.net.wifi.WifiStringResourceWrapper.CARRIER_ID_RESOURCE_NAME_SUFFIX;
+package com.android.server.wifi;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
+import static com.android.server.wifi.WifiStringResourceWrapper.CARRIER_ID_RESOURCE_NAME_SUFFIX;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -44,7 +43,7 @@ import org.mockito.MockitoSession;
* Unit tests for {@link WifiStringResourceWrapper}
*/
@SmallTest
-public class WifiStringResourceWrapperTest {
+public class WifiStringResourceWrapperTest extends WifiBaseTest {
private MockitoSession mStaticMockSession = null;
@Mock WifiContext mContext;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java b/service/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
index 9d19c59f91..2656cbbe00 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WrongPasswordNotifierTest.java
@@ -26,7 +26,6 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
-import android.net.wifi.WifiContext;
import android.os.UserHandle;
import android.provider.Settings;
diff --git a/service/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
index 7b0b13f57f..1e49e5ecc9 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/hotspot2/PasspointManagerTest.java
@@ -59,7 +59,6 @@ import android.net.Uri;
import android.net.wifi.EAPConstants;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiContext;
import android.net.wifi.WifiEnterpriseConfig;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiSsid;
@@ -90,6 +89,7 @@ import com.android.server.wifi.WifiCarrierInfoManager;
import com.android.server.wifi.WifiConfigManager;
import com.android.server.wifi.WifiConfigStore;
import com.android.server.wifi.WifiConfigurationTestUtil;
+import com.android.server.wifi.WifiContext;
import com.android.server.wifi.WifiInjector;
import com.android.server.wifi.WifiKeyStore;
import com.android.server.wifi.WifiMetrics;