diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-07 03:08:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-07 03:08:36 +0000 |
| commit | f72e85a9bc4cb54b489e6c72dba122b7c8a22df5 (patch) | |
| tree | 30e773d816d23c451e0984c23747f9235883cf7b /service | |
| parent | 7249dde083094c16b78ea4621b253a91be8a1464 (diff) | |
| parent | eb6343516fb91c3f7651e5979e047306aaf04554 (diff) | |
Merge "WifiConfigurationUtil: Ignore masked passwords"
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigurationUtil.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java index 5b20fd0b1..3ff4d73fd 100644 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java @@ -55,6 +55,8 @@ public class WifiConfigurationUtil { private static final int PSK_ASCII_MIN_LEN = 8 + ENCLOSING_QUTOES_LEN; private static final int PSK_ASCII_MAX_LEN = 63 + ENCLOSING_QUTOES_LEN; private static final int PSK_HEX_LEN = 128; + @VisibleForTesting + public static final String PASSWORD_MASK = "*"; /** * Check whether a network configuration is visible to a user or any of its managed profiles. @@ -300,6 +302,10 @@ public class WifiConfigurationUtil { Log.e(TAG, "validatePsk failed: empty string"); return false; } + // The app returned back the masked password, let it thru. WifiConfigManager will handle it. + if (psk.equals(PASSWORD_MASK)) { + return true; + } if (psk.startsWith("\"")) { // ASCII PSK string if (psk.length() < PSK_ASCII_MIN_LEN) { |