commit 3b1718971915fb7d486fa43d2888902a98f59bd1
author Aleks Rozman <arozman@google.com> Thu Sep 07 01:40:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 07 01:40:30 2017 +0000
tree af3120d36a19186d230f4ccab92f1ff150ddb3c8
parent 39fef5621f25785f725048af4bdd57af70036bb6
parent 3abc7f056111caae01f0cd47f57798903bf7b054

Handle a condition when the result of getting configured networks returns null
am: 3abc7f0561

Change-Id: Icec60ffafda1366688fa3045d9be929f3cfb99cc

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 0d33ba3..6e5e28e 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2016,9 +2016,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;
+        }
     }
 
     /**