diff options
19 files changed, 35 insertions, 35 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index 145335e16..dc4327ca1 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -75,9 +75,9 @@ import android.net.wifi.WifiNetworkAgentSpecifier; import android.net.wifi.WifiScanner; import android.net.wifi.hotspot2.IProvisioningCallback; import android.net.wifi.hotspot2.OsuProvider; +import android.net.wifi.nl80211.DeviceWiphyCapabilities; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.net.wifi.p2p.WifiP2pManager; -import android.net.wifi.wificond.DeviceWiphyCapabilities; -import android.net.wifi.wificond.WifiNl80211Manager; import android.os.BatteryStatsManager; import android.os.Bundle; import android.os.ConditionVariable; diff --git a/service/java/com/android/server/wifi/LinkProbeManager.java b/service/java/com/android/server/wifi/LinkProbeManager.java index c6fab2f75..863268811 100644 --- a/service/java/com/android/server/wifi/LinkProbeManager.java +++ b/service/java/com/android/server/wifi/LinkProbeManager.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import android.content.Context; import android.net.MacAddress; import android.net.wifi.WifiInfo; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.util.Log; diff --git a/service/java/com/android/server/wifi/SoftApManager.java b/service/java/com/android/server/wifi/SoftApManager.java index 54884cd89..705680ee6 100644 --- a/service/java/com/android/server/wifi/SoftApManager.java +++ b/service/java/com/android/server/wifi/SoftApManager.java @@ -33,7 +33,7 @@ import android.net.wifi.SoftApInfo; import android.net.wifi.WifiAnnotations; import android.net.wifi.WifiClient; import android.net.wifi.WifiManager; -import android.net.wifi.wificond.NativeWifiClient; +import android.net.wifi.nl80211.NativeWifiClient; import android.os.Handler; import android.os.Looper; import android.os.Message; diff --git a/service/java/com/android/server/wifi/ThroughputPredictor.java b/service/java/com/android/server/wifi/ThroughputPredictor.java index 80df9aa43..07ed12b97 100644 --- a/service/java/com/android/server/wifi/ThroughputPredictor.java +++ b/service/java/com/android/server/wifi/ThroughputPredictor.java @@ -21,7 +21,7 @@ import static com.android.server.wifi.util.InformationElementUtil.BssLoad.MIN_CH import android.annotation.NonNull; import android.net.wifi.ScanResult; import android.net.wifi.WifiInfo; -import android.net.wifi.wificond.DeviceWiphyCapabilities; +import android.net.wifi.nl80211.DeviceWiphyCapabilities; import android.util.Log; /** diff --git a/service/java/com/android/server/wifi/WifiInjector.java b/service/java/com/android/server/wifi/WifiInjector.java index d64415ba9..c035ee45b 100644 --- a/service/java/com/android/server/wifi/WifiInjector.java +++ b/service/java/com/android/server/wifi/WifiInjector.java @@ -28,7 +28,7 @@ import android.net.NetworkKey; import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.net.wifi.WifiScanner; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.BatteryStatsManager; import android.os.Handler; import android.os.HandlerExecutor; diff --git a/service/java/com/android/server/wifi/WifiMetrics.java b/service/java/com/android/server/wifi/WifiMetrics.java index 390d0734d..e6c5058be 100644 --- a/service/java/com/android/server/wifi/WifiMetrics.java +++ b/service/java/com/android/server/wifi/WifiMetrics.java @@ -31,7 +31,7 @@ import android.net.wifi.WifiManager.DeviceMobilityState; import android.net.wifi.WifiUsabilityStatsEntry.ProbeStatus; import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.ProvisioningCallback; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.os.IBinder; import android.os.Looper; diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index fb3459131..a80486016 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -29,10 +29,10 @@ import android.net.wifi.WifiAnnotations; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; import android.net.wifi.WifiSsid; -import android.net.wifi.wificond.DeviceWiphyCapabilities; -import android.net.wifi.wificond.NativeScanResult; -import android.net.wifi.wificond.RadioChainInfo; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.DeviceWiphyCapabilities; +import android.net.wifi.nl80211.NativeScanResult; +import android.net.wifi.nl80211.RadioChainInfo; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.os.SystemClock; import android.text.TextUtils; @@ -2667,9 +2667,9 @@ public class WifiNative { return Objects.hash(ssid, flags, auth_bit_field, frequencies); } - android.net.wifi.wificond.PnoNetwork toNativePnoNetwork() { - android.net.wifi.wificond.PnoNetwork nativePnoNetwork = - new android.net.wifi.wificond.PnoNetwork(); + android.net.wifi.nl80211.PnoNetwork toNativePnoNetwork() { + android.net.wifi.nl80211.PnoNetwork nativePnoNetwork = + new android.net.wifi.nl80211.PnoNetwork(); nativePnoNetwork.setHidden( (flags & WifiScanner.PnoSettings.PnoNetwork.FLAG_DIRECTED_SCAN) != 0); try { @@ -2696,18 +2696,18 @@ public class WifiNative { public boolean isConnected; public PnoNetwork[] networkList; - android.net.wifi.wificond.PnoSettings toNativePnoSettings() { - android.net.wifi.wificond.PnoSettings nativePnoSettings = - new android.net.wifi.wificond.PnoSettings(); + android.net.wifi.nl80211.PnoSettings toNativePnoSettings() { + android.net.wifi.nl80211.PnoSettings nativePnoSettings = + new android.net.wifi.nl80211.PnoSettings(); nativePnoSettings.setIntervalMillis(periodInMs); nativePnoSettings.setMin2gRssiDbm(min24GHzRssi); nativePnoSettings.setMin5gRssiDbm(min5GHzRssi); nativePnoSettings.setMin6gRssiDbm(min6GHzRssi); - List<android.net.wifi.wificond.PnoNetwork> pnoNetworks = new ArrayList<>(); + List<android.net.wifi.nl80211.PnoNetwork> pnoNetworks = new ArrayList<>(); if (networkList != null) { for (PnoNetwork network : networkList) { - android.net.wifi.wificond.PnoNetwork nativeNetwork = + android.net.wifi.nl80211.PnoNetwork nativeNetwork = network.toNativePnoNetwork(); if (nativeNetwork != null) { pnoNetworks.add(nativeNetwork); diff --git a/service/java/com/android/server/wifi/WifiShellCommand.java b/service/java/com/android/server/wifi/WifiShellCommand.java index 171cb7bb6..4dba42c80 100644 --- a/service/java/com/android/server/wifi/WifiShellCommand.java +++ b/service/java/com/android/server/wifi/WifiShellCommand.java @@ -19,7 +19,7 @@ package com.android.server.wifi; import android.content.Context; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiScanner; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.BasicShellCommandHandler; import android.os.Binder; diff --git a/service/java/com/android/server/wifi/p2p/WifiP2pNative.java b/service/java/com/android/server/wifi/p2p/WifiP2pNative.java index 53426588d..300b7a122 100644 --- a/service/java/com/android/server/wifi/p2p/WifiP2pNative.java +++ b/service/java/com/android/server/wifi/p2p/WifiP2pNative.java @@ -20,11 +20,11 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.hardware.wifi.V1_0.IWifiP2pIface; import android.hardware.wifi.V1_0.IfaceType; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pGroupList; import android.net.wifi.p2p.nsd.WifiP2pServiceInfo; -import android.net.wifi.wificond.WifiNl80211Manager; import android.os.Handler; import android.text.TextUtils; import android.util.Log; diff --git a/service/java/com/android/server/wifi/util/InformationElementUtil.java b/service/java/com/android/server/wifi/util/InformationElementUtil.java index 917f1f7a0..b5bf82269 100644 --- a/service/java/com/android/server/wifi/util/InformationElementUtil.java +++ b/service/java/com/android/server/wifi/util/InformationElementUtil.java @@ -20,8 +20,8 @@ import android.net.wifi.ScanResult.InformationElement; import android.net.wifi.WifiAnnotations.Cipher; import android.net.wifi.WifiAnnotations.KeyMgmt; import android.net.wifi.WifiAnnotations.Protocol; -import android.net.wifi.wificond.NativeScanResult; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.NativeScanResult; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.util.Log; import com.android.server.wifi.ByteBufferReader; diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index c11f82fc6..185811cfe 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -85,8 +85,8 @@ import android.net.wifi.WifiScanner; import android.net.wifi.WifiSsid; import android.net.wifi.hotspot2.IProvisioningCallback; import android.net.wifi.hotspot2.OsuProvider; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.net.wifi.p2p.WifiP2pManager; -import android.net.wifi.wificond.WifiNl80211Manager; import android.os.BatteryStatsManager; import android.os.Binder; import android.os.Bundle; diff --git a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java index 98ad24831..43f7e1b75 100644 --- a/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/HostapdHalTest.java @@ -34,7 +34,7 @@ import android.hidl.manager.V1_0.IServiceNotification; import android.net.MacAddress; import android.net.wifi.SoftApConfiguration; import android.net.wifi.SoftApConfiguration.Builder; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.os.IHwBinder; import android.os.RemoteException; diff --git a/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java b/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java index 4ca17e8b4..746976aef 100644 --- a/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java @@ -30,7 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiInfo; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.os.test.TestLooper; diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java index a66480978..7b4c1cee6 100644 --- a/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/SoftApManagerTest.java @@ -64,7 +64,7 @@ import android.net.wifi.SoftApInfo; import android.net.wifi.WifiClient; import android.net.wifi.WifiManager; import android.net.wifi.WifiScanner; -import android.net.wifi.wificond.NativeWifiClient; +import android.net.wifi.nl80211.NativeWifiClient; import android.os.UserHandle; import android.os.test.TestLooper; import android.provider.Settings; diff --git a/tests/wifitests/src/com/android/server/wifi/ThroughputPredictorTest.java b/tests/wifitests/src/com/android/server/wifi/ThroughputPredictorTest.java index 3844687a3..3575128fe 100644 --- a/tests/wifitests/src/com/android/server/wifi/ThroughputPredictorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ThroughputPredictorTest.java @@ -25,7 +25,7 @@ import static org.mockito.Mockito.validateMockitoUsage; import static org.mockito.Mockito.when; import android.net.wifi.ScanResult; -import android.net.wifi.wificond.DeviceWiphyCapabilities; +import android.net.wifi.nl80211.DeviceWiphyCapabilities; import androidx.test.filters.SmallTest; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java index 0b000b3bc..605027f15 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -63,7 +63,7 @@ import android.net.wifi.WifiSsid; import android.net.wifi.hotspot2.PasspointConfiguration; import android.net.wifi.hotspot2.ProvisioningCallback; import android.net.wifi.hotspot2.pps.Credential; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.os.IBinder; import android.os.RemoteException; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java index d4017a4bb..e2a233784 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeInterfaceManagementTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; import android.app.test.MockAnswerUtil; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiScanner; -import android.net.wifi.wificond.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.os.Handler; import android.os.test.TestLooper; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java index 79df8fe6f..728af073a 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java @@ -35,10 +35,10 @@ import android.net.MacAddress; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; -import android.net.wifi.wificond.NativeScanResult; -import android.net.wifi.wificond.RadioChainInfo; -import android.net.wifi.wificond.WifiNl80211Manager; -import android.net.wifi.wificond.WifiNl80211Manager.SendMgmtFrameCallback; +import android.net.wifi.nl80211.NativeScanResult; +import android.net.wifi.nl80211.RadioChainInfo; +import android.net.wifi.nl80211.WifiNl80211Manager; +import android.net.wifi.nl80211.WifiNl80211Manager.SendMgmtFrameCallback; import android.os.Handler; import androidx.test.filters.SmallTest; diff --git a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pNativeTest.java b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pNativeTest.java index 1bde4673b..eca30bd90 100644 --- a/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/p2p/WifiP2pNativeTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.when; import android.app.test.MockAnswerUtil.AnswerWithArguments; import android.net.wifi.WifiManager; +import android.net.wifi.nl80211.WifiNl80211Manager; import android.net.wifi.p2p.WifiP2pConfig; import android.net.wifi.p2p.WifiP2pDevice; import android.net.wifi.p2p.WifiP2pGroup; @@ -37,7 +38,6 @@ import android.net.wifi.p2p.WifiP2pGroupList; import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.nsd.WifiP2pDnsSdServiceInfo; import android.net.wifi.p2p.nsd.WifiP2pServiceInfo; -import android.net.wifi.wificond.WifiNl80211Manager; import android.os.Handler; import androidx.test.filters.SmallTest; |