commit d15d4e41a8b8cd6d5f1c0abf20b4c8479a1447a3
author Daniel Bright <dbright@google.com> Thu Aug 06 21:40:44 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 06 21:40:44 2020 +0000
tree be2c92906bab0780d89dc9ed04a2067458d97ae4
parent a8fbfa03134abe481acebceb9db1d279346f2ba6
parent e8ba43a38e3293c0d78325f204be5499da79ba70

Merge "Fix error response handling for RIL request"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e96fd7e..c4a669d 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -756,7 +756,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) {