commit fcdec2c17f08f9413563b442841fc74b26aec036
author Daniel Bright <dbright@google.com> Thu Aug 06 22:13:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 06 22:13:38 2020 +0000
tree 3382e9e0aa9947405dbad6d68e2441ea5bfc7385
parent e4b4bd0c8f246c23f9ad343cd08bce8230609f9f
parent 2058e9356b1e138ca91bcb7cc5c423aa25e1452b

Merge "Fix error response handling for RIL request" am: d15d4e41a8 am: 2058e9356b

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1374156

Change-Id: I99e2230e50e4ace3a5fd82a852f5045ea310ed25

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8098519..88d8472 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -761,7 +761,9 @@
                     if (ar.exception == null && ar.result != null) {
                         request.result = ar.result;     // Integer
                     } else {
-                        request.result = null;
+                        // request.result must be set to something non-null
+                        // for the calling thread to unblock
+                        request.result = new int[]{-1};
                         if (ar.result == null) {
                             loge("getPreferredNetworkType: Empty response");
                         } else if (ar.exception instanceof CommandException) {