diff options
| author | Jeff Davidson <jpd@google.com> | 2014-11-06 00:12:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-06 00:12:44 +0000 |
| commit | e40ea96f9725ea5d71e63979256fadfd2229c8e3 (patch) | |
| tree | 67cde822a2ca884385a66c7929ff90ac45c03ea0 /wifi | |
| parent | ac418e07f7a726c6888f1f4f9871fcae8c46798d (diff) | |
| parent | a45e98974e571ca539436b295a98d513faa10d19 (diff) | |
| download | frameworks_base-e40ea96f9725ea5d71e63979256fadfd2229c8e3.zip frameworks_base-e40ea96f9725ea5d71e63979256fadfd2229c8e3.tar.gz frameworks_base-e40ea96f9725ea5d71e63979256fadfd2229c8e3.tar.bz2 | |
am a45e9897: am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev
* commit 'a45e98974e571ca539436b295a98d513faa10d19':
Fix incorrect doc for WifiInfo#getSSID().
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 5bf3470..75198e5 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -286,7 +286,7 @@ public class WifiInfo implements Parcelable { * Returns the service set identifier (SSID) of the current 802.11 network. * If the SSID can be decoded as UTF-8, it will be returned surrounded by double * quotation marks. Otherwise, it is returned as a string of hex digits. The - * SSID may be {@code null} if there is no network currently connected. + * SSID may be <unknown ssid> if there is no network currently connected. * @return the SSID */ public String getSSID() { |