commit b200a1eb5bc5ba5bad1f6f4fa538741c2b4c775c
author Paul Stewart <pstew@google.com> Thu Jan 05 12:26:44 2017 -0800
committer Paul Stewart <pstew@google.com> Thu Jan 05 12:38:20 2017 -0800
tree a0ea90794355f3f06bea4732aa1a41fbf28966ef
parent 48f3c173f6c0be06d5e5f2a8a598f0bcdddc4736

DO NOT MERGE: Fix null dereference in carrier networks

WifiStateMachine can respond to CMD_HAS_CARRIER_CONFIGURED_NETWORKS
with a null object if it is not in a state to handle this.  Therefore
syncHasCarrierConfiguredNetworks must check for null before
attempting to cast the result object back to boolean.

Bug: 34050164
Test: Compile
Change-Id: I21b80ef3989ca2d6a09784f9c9a44f4af19b5850

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 9cc26b1..d5e9d02 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -2031,7 +2031,7 @@
             int uuid, AsyncChannel channel) {
         Message resultMsg = channel.sendMessageSynchronously(
                 CMD_HAS_CARRIER_CONFIGURED_NETWORKS, uuid);
-        boolean result = (boolean) resultMsg.obj;
+        boolean result = resultMsg.obj != null && (boolean) resultMsg.obj;
         resultMsg.recycle();
         return result;
     }