commit 509e2ced819ebaece2abb21693cb2046b5524c5b
author Daniel Sandler <dsandler@android.com> Tue Sep 25 11:52:42 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 25 11:52:43 2012 -0700
tree 5ad496b5cc0078e772a5767474c28f50e0079da8
parent 9b3a7f798eea3ebec6828f2692c5a3dab1f8d686
parent 173bae2c674b2bc25cf376cbb4e150bd86703049

Merge "Improvements to notification/settings panels:" into jb-mr1-dev

wifi/java/android/net/wifi/WifiManager.java

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index aa59158..75b8bcf 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -540,7 +540,8 @@
      * <li>allowedGroupCiphers</li>
      * </ul>
      * @return a list of network configurations in the form of a list
-     * of {@link WifiConfiguration} objects.
+     * of {@link WifiConfiguration} objects. Upon failure to fetch or
+     * when when Wi-Fi is turned off, it can be null.
      */
     public List<WifiConfiguration> getConfiguredNetworks() {
         try {