commit cfbc9559cec2209b79b8e4770ffc279a6d212565
author Nathan Harold <nharold@google.com> Tue Oct 02 22:06:43 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 02 22:06:43 2018 +0000
tree 6ac244518c9b2470b257cedf2849870352902709
parent f8a53f869052383639c36d80964fff4ef520a400
parent 8d0f1743a551d64e1fd1e98e7b60d03957bec199

Merge "Fix Binder Crash due to CellInfo Timeout"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ecb4861..cef0e53 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -990,7 +990,9 @@
                 case EVENT_GET_ALL_CELL_INFO_DONE:
                     ar = (AsyncResult) msg.obj;
                     request = (MainThreadRequest) ar.userObj;
-                    request.result = (ar.exception == null) ? ar.result : new ArrayList<CellInfo>();
+                    // If a timeout occurs, the response will be null
+                    request.result = (ar.exception == null && ar.result != null)
+                            ? ar.result : new ArrayList<CellInfo>();
                     synchronized (request) {
                         request.notifyAll();
                     }