commit 5f970b91e3982c640ce88c4a931b8d0bcf623383
author Nate Jiang <qiangjiang@google.com> Mon Jan 31 13:28:12 2022 -0800
committer Nate Jiang <qiangjiang@google.com> Mon Jan 31 13:35:55 2022 -0800
tree a4e7b1804d93ab2e9076cf19028f5323697974b2
parent b135920d3736bc15345b18b91526e8f5e7ee92bb

Change API names

Bug: 216320373
Test: CtsVerifier
Change-Id: Ie54865030cdc675dd76f7e676da4cafdc181c13a

apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
index 5d80d66..9674d1c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
@@ -194,9 +194,9 @@
             }
         }
         if (mForceChannel) {
-            nsBuilder.setChannelInMhz(CHANNEL_IN_MHZ, true);
+            nsBuilder.setChannelFrequencyMhz(CHANNEL_IN_MHZ, true);
             WifiAwareNetworkSpecifier ns = nsBuilder.build();
-            if (ns.getChannelInMhz() != CHANNEL_IN_MHZ || !ns.isChannelRequired()) {
+            if (ns.getChannelFrequencyMhz() != CHANNEL_IN_MHZ || !ns.isChannelRequired()) {
                 Log.e(TAG, "executeTestSubscriber: channel configure for data-path is not match");
                 return false;
             }
@@ -242,28 +242,28 @@
         WifiAwareNetworkInfo peerAwareInfo =
                 (WifiAwareNetworkInfo) info.second.getTransportInfo();
         StringBuilder builder = new StringBuilder();
-        for (WifiAwareChannelInfo channelInfo : peerAwareInfo.getChannelInfos()) {
+        for (WifiAwareChannelInfo channelInfo : peerAwareInfo.getChannelInfoList()) {
             builder.append(channelInfo.toString());
         }
         if (DBG) Log.d(TAG, "executeTestSubscriber: channelInfo:" + builder.toString());
 
         if (mForceChannel) {
-            if (peerAwareInfo.getChannelInfos().size() != 1) {
+            if (peerAwareInfo.getChannelInfoList().size() != 1) {
                 setFailureReason(mContext.getString(R.string.aware_status_network_failed));
                 Log.e(TAG, "executeTestSubscriber: number of channel info is incorrect");
                 return false;
             }
-            WifiAwareChannelInfo channelInfo = peerAwareInfo.getChannelInfos().get(0);
-            if (channelInfo.getChannelFreqInMhz() != CHANNEL_IN_MHZ) {
+            WifiAwareChannelInfo channelInfo = peerAwareInfo.getChannelInfoList().get(0);
+            if (channelInfo.getChannelFrequencyMhz() != CHANNEL_IN_MHZ) {
                 setFailureReason(mContext.getString(R.string.aware_status_network_failed));
                 Log.e(TAG, "executeTestSubscriber: channel freq is not match the request");
                 return false;
             }
             if (DBG) {
                 Log.d(TAG, "executeTestSubscriber: ChannelFreqInMhz="
-                        + channelInfo.getChannelFreqInMhz()
+                        + channelInfo.getChannelFrequencyMhz()
                         + " ChannelBandWidth=" + channelInfo.getChannelBandwidth()
-                        + " NumSpatialStreams=" + channelInfo.getNumSpatialStreams());
+                        + " NumSpatialStreams=" + channelInfo.getSpatialStreamCount());
             }
         }
 
@@ -432,9 +432,9 @@
             nsBuilder.setPort(port).setTransportProtocol(6); // 6 == TCP
         }
         if (mForceChannel) {
-            nsBuilder.setChannelInMhz(CHANNEL_IN_MHZ, true);
+            nsBuilder.setChannelFrequencyMhz(CHANNEL_IN_MHZ, true);
             WifiAwareNetworkSpecifier ns = nsBuilder.build();
-            if (ns.getChannelInMhz() != CHANNEL_IN_MHZ || !ns.isChannelRequired()) {
+            if (ns.getChannelFrequencyMhz() != CHANNEL_IN_MHZ || !ns.isChannelRequired()) {
                 Log.e(TAG, "executeTestSubscriber: channel configure for data-path is not match");
                 return false;
             }