softap: Use set/getPassphrase to replace set/getWpa2Passphrase

Bug: 142752869
Test: atest frameworks/opt/net/wifi/tests/wifitests/
Change-Id: I1514a9e215aae553bb4acdff9cd5d5ddb47c5281

4 files changed, 8 insertions, 9 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java
index f56e4bfa4..9ca8e625a 100644
--- a/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SoftApBackupRestoreTest.java
@@ -57,7 +57,7 @@ public class SoftApBackupRestoreTest extends WifiBaseTest {
         assertEquals(ApConfigUtil.convertWifiConfigBandToSoftApConfigBand(backup.apBand),
                 restore.getBand());
         assertEquals(backup.apChannel, restore.getChannel());
-        assertEquals(backup.preSharedKey, restore.getWpa2Passphrase());
+        assertEquals(backup.preSharedKey, restore.getPassphrase());
         int authType = backup.getAuthType();
         if (backup.getAuthType() == WifiConfiguration.KeyMgmt.WPA2_PSK) {
             assertEquals(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK, restore.getSecurityType());
diff --git a/tests/wifitests/src/com/android/server/wifi/SoftApStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/SoftApStoreDataTest.java
index bd77092d7..673396e38 100644
--- a/tests/wifitests/src/com/android/server/wifi/SoftApStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SoftApStoreDataTest.java
@@ -172,7 +172,7 @@ public class SoftApStoreDataTest extends WifiBaseTest {
         SoftApConfiguration softApConfig = softapConfigCaptor.getValue();
         assertNotNull(softApConfig);
         assertEquals(softApConfig.getSsid(), TEST_SSID);
-        assertEquals(softApConfig.getWpa2Passphrase(), TEST_PASSPHRASE);
+        assertEquals(softApConfig.getPassphrase(), TEST_PASSPHRASE);
         assertEquals(softApConfig.getSecurityType(), SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
         assertEquals(softApConfig.isHiddenSsid(), TEST_HIDDEN);
         assertEquals(softApConfig.getBand(), TEST_BAND);
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
index 46b4bd455..77e7c30c9 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiApConfigStoreTest.java
@@ -165,7 +165,6 @@ public class WifiApConfigStoreTest extends WifiBaseTest {
         Builder configBuilder = new SoftApConfiguration.Builder();
         configBuilder.setSsid(ssid);
         configBuilder.setPassphrase(preSharedKey, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
-        configBuilder.setWpa2Passphrase(preSharedKey);
         if (channel == 0) {
             configBuilder.setBand(band);
         } else {
@@ -221,7 +220,7 @@ public class WifiApConfigStoreTest extends WifiBaseTest {
         assertEquals(ApConfigUtil.convertWifiConfigBandToSoftApConfigBand(backup.apBand),
                 restore.getBand());
         assertEquals(backup.apChannel, restore.getChannel());
-        assertEquals(backup.preSharedKey, restore.getWpa2Passphrase());
+        assertEquals(backup.preSharedKey, restore.getPassphrase());
         int authType = backup.getAuthType();
         if (backup.getAuthType() == WifiConfiguration.KeyMgmt.WPA2_PSK) {
             assertEquals(SoftApConfiguration.SECURITY_TYPE_WPA2_PSK, restore.getSecurityType());
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
index ccf42c0d4..e8f9cf078 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiServiceImplTest.java
@@ -1309,7 +1309,7 @@ public class WifiServiceImplTest extends WifiBaseTest {
                 .thenReturn(true);
         SoftApConfiguration config = new SoftApConfiguration.Builder()
                 .setSsid("TestAp")
-                .setWpa2Passphrase("thisIsABadPassword")
+                .setPassphrase("thisIsABadPassword", SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .setBand(SoftApConfiguration.BAND_5GHZ)
                 .build();
 
@@ -1329,7 +1329,7 @@ public class WifiServiceImplTest extends WifiBaseTest {
                 .thenReturn(false);
         SoftApConfiguration config = new SoftApConfiguration.Builder()
                 .setSsid("TestAp")
-                .setWpa2Passphrase("thisIsABadPassword")
+                .setPassphrase("thisIsABadPassword", SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .setBand(SoftApConfiguration.BAND_5GHZ)
                 .build();
 
@@ -1352,7 +1352,7 @@ public class WifiServiceImplTest extends WifiBaseTest {
 
         SoftApConfiguration config = new SoftApConfiguration.Builder()
                 .setSsid("TestAp")
-                .setWpa2Passphrase("thisIsABadPassword")
+                .setPassphrase("thisIsABadPassword", SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .setBand(SoftApConfiguration.BAND_6GHZ)
                 .build();
 
@@ -1376,7 +1376,7 @@ public class WifiServiceImplTest extends WifiBaseTest {
 
         SoftApConfiguration config = new SoftApConfiguration.Builder()
                 .setSsid("TestAp")
-                .setWpa2Passphrase("thisIsABadPassword")
+                .setPassphrase("thisIsABadPassword", SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .setBand(SoftApConfiguration.BAND_6GHZ)
                 .build();
 
@@ -1395,7 +1395,7 @@ public class WifiServiceImplTest extends WifiBaseTest {
                 .thenReturn(true);
         SoftApConfiguration config = new SoftApConfiguration.Builder()
                 .setSsid("TestAp")
-                .setWpa2Passphrase("thisIsABadPassword")
+                .setPassphrase("thisIsABadPassword", SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .setBand(SoftApConfiguration.BAND_5GHZ)
                 .build();