summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/java/android/net/wifi/rtt/PasnConfig.java3
-rw-r--r--framework/tests/src/android/net/wifi/rtt/PasnConfigTest.java5
2 files changed, 5 insertions, 3 deletions
diff --git a/framework/java/android/net/wifi/rtt/PasnConfig.java b/framework/java/android/net/wifi/rtt/PasnConfig.java
index f1feb5bd29..550fa6f5ea 100644
--- a/framework/java/android/net/wifi/rtt/PasnConfig.java
+++ b/framework/java/android/net/wifi/rtt/PasnConfig.java
@@ -426,8 +426,9 @@ public final class PasnConfig implements Parcelable {
@Override
public String toString() {
+ String password = (mPassword != null ? "*" : "null");
return "PasnConfig{" + "mBaseAkms=" + mBaseAkms + ", mCiphers=" + mCiphers + ", mPassword='"
- + mPassword + '\'' + ", mWifiSsid=" + mWifiSsid + ", mPasnComebackCookie="
+ + password + '\'' + ", mWifiSsid=" + mWifiSsid + ", mPasnComebackCookie="
+ Arrays.toString(mPasnComebackCookie) + '}';
}
}
diff --git a/framework/tests/src/android/net/wifi/rtt/PasnConfigTest.java b/framework/tests/src/android/net/wifi/rtt/PasnConfigTest.java
index d235f037fd..a5e4798cad 100644
--- a/framework/tests/src/android/net/wifi/rtt/PasnConfigTest.java
+++ b/framework/tests/src/android/net/wifi/rtt/PasnConfigTest.java
@@ -41,6 +41,7 @@ public class PasnConfigTest {
private static final int TEST_CIPHER = PasnConfig.CIPHER_CCMP_128;
private static final String TEST_SSID = "\"Test_SSID\"";
private static final String TEST_PASSWORD = "password";
+ private static final String TEST_PASSWORD_MASKED = "*";
private static final byte[] TEST_COOKIE = new byte[]{1, 2, 3};
/**
@@ -134,8 +135,8 @@ public class PasnConfigTest {
.build();
String expectedString = "PasnConfig{" + "mBaseAkms=" + TEST_AKM + ", mCiphers="
- + TEST_CIPHER + ", mPassword='" + TEST_PASSWORD + '\'' + ", mWifiSsid=" + ssid
- + ", mPasnComebackCookie=" + Arrays.toString(TEST_COOKIE) + '}';
+ + TEST_CIPHER + ", mPassword='" + TEST_PASSWORD_MASKED + '\'' + ", mWifiSsid="
+ + ssid + ", mPasnComebackCookie=" + Arrays.toString(TEST_COOKIE) + '}';
assertEquals(expectedString, config.toString());
}