commit 26c98abafc056cd6130ac2464f32e2f51a60910a
author Daisuke Niwa <daisuke.x.niwa@sonymobile.com> Thu Oct 05 01:05:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 05 01:05:22 2017 +0000
tree 49dfd0725bcecf71674addb3bbf96845bce293a8
parent fb77c3dc21dc99a7a94b05e656994b34efa863da
parent 5ab7f53cbd9fa683dc21a6d7a92608cc4cdf64e5

Remove hostapd.conf before starting Tethering am: dc24ed7ffb
am: 5ab7f53cbd

Change-Id: Id2ed587ed4080013fb2b146871147f8ed6851594

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 3649f8f..bf5d08b 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -1883,9 +1883,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) {