diff options
| author | 2025-03-11 22:23:34 -0700 | |
|---|---|---|
| committer | 2025-03-14 16:13:56 -0700 | |
| commit | 5d83e0c385fc4989895a2d4b2deb1bad85b56ff3 (patch) | |
| tree | 67572605206139d97a16e6a2ab65b430bbc6714a | |
| parent | 0727149d1dc2a400c8b2a29fe0ce7c1a08e36e0e (diff) | |
Mask the password string for PASN config
Bug: 397619419
Test: Build
Flag: EXEMPT bug fix
Change-Id: Ie0c45836b7b22cf38860657a1436d46bc6b158cd
| -rw-r--r-- | framework/java/android/net/wifi/rtt/PasnConfig.java | 3 | ||||
| -rw-r--r-- | framework/tests/src/android/net/wifi/rtt/PasnConfigTest.java | 5 |
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 d420154cba..898e521aa7 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 d986e251f3..748b7d60db 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()); } |