commit 16c307d7a11b181fa6b3b20fdf3eaaa10ce632bf
author Sanket Padawe <sanketpadawe@google.com> Wed Jan 06 20:48:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 06 20:48:21 2016 +0000
tree f7359141d10310d4f34cfcaf4c681a9e753d844b
parent 3da0ebbb40b908afd0cafbe6e31ebd31f849fcfa
parent f66042ce9e054f41f0e6f8f4ebaf06c508e79106

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

* commit 'f66042ce9e054f41f0e6f8f4ebaf06c508e79106':
  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 b996f69..06e1ebe 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -600,7 +600,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) {