Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632

am: 6b6f1b9e12 Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
2017-03-17 17:33:06 +00:00
parent cef08e7482 6b6f1b9e12
commit 28212c1b29
1 changed files with 3 additions and 1 deletions
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -281,7 +281,9 @@ public class WifiConfiguration implements Parcelable {
    public int apChannel = 0;

    /**
-     * Pre-shared key for use with WPA-PSK.
+     * Pre-shared key for use with WPA-PSK. Either an ASCII string enclosed in
+     * double quotation marks (e.g., {@code "abcdefghij"} for PSK passphrase or
+     * a string of 64 hex digits for raw PSK.
     * <p/>
     * When the value of this key is read, the actual key is
     * not returned, just a "*" if the key has a value, or the null