commit 21ac7c1225d539cab26f2d4c43b70778d6da7e9b
author Aleks Rozman <arozman@google.com> Thu Sep 07 01:59:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 07 01:59:02 2017 +0000
tree 0d1a1f59dc3f9fbebfade48fe4d60f0bec0eb194
parent 28318bc886b3f188995de95f000a1dceb156e11d
parent fb77c3dc21dc99a7a94b05e656994b34efa863da

Handle a condition when the result of getting configured networks returns null am: 3abc7f0561 am: 3b17189719 am: 1e779938f2 am: fb9027f897
am: fb77c3dc21

Change-Id: Iac98eee54bc8f30646d6043986359f094033a1dc

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index b950cf2..1d26f04 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -1913,9 +1913,13 @@
 
     public List<WifiConfiguration> syncGetConfiguredNetworks(int uuid, AsyncChannel channel) {
         Message resultMsg = channel.sendMessageSynchronously(CMD_GET_CONFIGURED_NETWORKS, uuid);
-        List<WifiConfiguration> result = (List<WifiConfiguration>) resultMsg.obj;
-        resultMsg.recycle();
-        return result;
+        if (resultMsg == null) { // an error has occurred
+            return null;
+        } else {
+            List<WifiConfiguration> result = (List<WifiConfiguration>) resultMsg.obj;
+            resultMsg.recycle();
+            return result;
+        }
     }
 
     public List<WifiConfiguration> syncGetPrivilegedConfiguredNetwork(AsyncChannel channel) {