commit 1afbb489c12a79ad7d1a3590ddb14b5f55f4c510
author David Su <dysu@google.com> Mon Jan 13 19:02:20 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 13 19:02:20 2020 +0000
tree 5890cbe10aaaaf9d735251d73608053108940afe
parent 142df96ebf1c105b51bfda4d493d2865430b1cdf
parent 47a4a384c41776ef6c3904e14bcc86cf55057c42

Merge changes from topic "cts-wifimanagertest-hide-apis"

* changes:
  Remove WifiManager CTS test using TxPacketCountListener
  CtsNetTestCases: fix Wifi @hide usages

tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index 1411c96..a05679e 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -638,7 +638,7 @@
         SoftApConfiguration customConfig = new SoftApConfiguration.Builder()
                 .setBssid(TEST_MAC)
                 .setSsid(TEST_SSID_UNQUOTED)
-                .setWpa2Passphrase(TEST_PASSPHRASE)
+                .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .build();
         TestExecutor executor = new TestExecutor();
         TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(mLOHSLock);