commit 703ed1a7e85f90729746ec98deef7fb8109389f8
author Sanket Padawe <sanketpadawe@google.com> Wed Jan 06 20:41:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 06 20:41:26 2016 +0000
tree 643d10a5b9e25daee9f0267494702cac896a2c20
parent 06f08f2ba5b0585e6e4113154f901424eea5a6c2
parent cfc2d354cfd2d421b2f3d6cb105ca2e0f763b802

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

* commit 'cfc2d354cfd2d421b2f3d6cb105ca2e0f763b802':
  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) {