commit f66042ce9e054f41f0e6f8f4ebaf06c508e79106
author Sanket Padawe <sanketpadawe@google.com> Wed Jan 06 20:44:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 06 20:44:15 2016 +0000
tree 72e1540b523916a0342fb42d51e6e62eff2a9e30
parent 1775090f009adcc2251f4d17a95f33a84c5dbbac
parent 703ed1a7e85f90729746ec98deef7fb8109389f8

getPreferredNetworkType should return int[] instead of -1 on error. am: cfc2d354cf
am: 703ed1a7e8

* commit '703ed1a7e85f90729746ec98deef7fb8109389f8':
  getPreferredNetworkType should return int[] instead of -1 on error.

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d61ef59..21b3b22 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -604,7 +604,7 @@
                     if (ar.exception == null && ar.result != null) {
                         request.result = ar.result;     // Integer
                     } else {
-                        request.result = -1;
+                        request.result = null;
                         if (ar.result == null) {
                             loge("getPreferredNetworkType: Empty response");
                         } else if (ar.exception instanceof CommandException) {