diff options
author | Etan Cohen <etancohen@google.com> | 2019-11-24 10:10:17 -0800 |
---|---|---|
committer | Etan Cohen <etancohen@google.com> | 2019-12-09 11:01:55 -0800 |
commit | 8d78ed903562038aa3fff47337aeef5416858750 (patch) | |
tree | d6e49570a8b5c7574153996bb268fe0813111412 /tests | |
parent | 2d3b38274c113659314e233bf203dafc659b4507 (diff) |
[WIFI][MAINLINE] Transition WificondControl interfaces: SignalPollResult, TxPacketCounters
Transition WificondControl public interfaces to that class itself.
Preparation for the class being extracted to an official API.
Classes shifted: SignalPollResult, TxPacketCounters
Bug: 140062898
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Id59bff14ad9a58a182121b49af27ab0544ed1d42
Diffstat (limited to 'tests')
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java | 2 | ||||
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java index 61ca10e53..0e72a31a0 100644 --- a/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java @@ -2579,7 +2579,7 @@ public class ClientModeImplTest extends WifiBaseTest { WifiLinkLayerStats llStats = new WifiLinkLayerStats(); llStats.txmpdu_be = 1000; llStats.rxmpdu_bk = 2000; - WifiNative.SignalPollResult signalPollResult = new WifiNative.SignalPollResult(); + WificondControl.SignalPollResult signalPollResult = new WificondControl.SignalPollResult(); signalPollResult.currentRssi = -42; signalPollResult.txBitrate = 65; signalPollResult.associationFrequency = sFreq; diff --git a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java index 95d4d15ef..726dadda6 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiNativeTest.java @@ -114,15 +114,15 @@ public class WifiNativeTest extends WifiBaseTest { new FateMapping(WifiLoggerHal.RX_PKT_FATE_DRV_DROP_OTHER, "driver dropped (other)"), new FateMapping((byte) 42, "42") }; - private static final WifiNative.SignalPollResult SIGNAL_POLL_RESULT = - new WifiNative.SignalPollResult() {{ + private static final WificondControl.SignalPollResult SIGNAL_POLL_RESULT = + new WificondControl.SignalPollResult() {{ currentRssi = -60; txBitrate = 12; associationFrequency = 5240; rxBitrate = 6; }}; - private static final WifiNative.TxPacketCounters PACKET_COUNTERS_RESULT = - new WifiNative.TxPacketCounters() {{ + private static final WificondControl.TxPacketCounters PACKET_COUNTERS_RESULT = + new WificondControl.TxPacketCounters() {{ txSucceeded = 2000; txFailed = 120; }}; @@ -518,7 +518,7 @@ public class WifiNativeTest extends WifiBaseTest { when(mWificondControl.signalPoll(WIFI_IFACE_NAME)) .thenReturn(SIGNAL_POLL_RESULT); - WifiNative.SignalPollResult pollResult = mWifiNative.signalPoll(WIFI_IFACE_NAME); + WificondControl.SignalPollResult pollResult = mWifiNative.signalPoll(WIFI_IFACE_NAME); assertEquals(SIGNAL_POLL_RESULT.currentRssi, pollResult.currentRssi); assertEquals(SIGNAL_POLL_RESULT.txBitrate, pollResult.txBitrate); assertEquals(SIGNAL_POLL_RESULT.associationFrequency, pollResult.associationFrequency); |