commit bfcda5ba302aee1852a7ab44a8e6b9f765dc8125
author Calvin Pan <calvinpan@google.com> Fri Feb 05 02:52:38 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 05 02:52:38 2021 +0000
tree 76cce01129df53975047ae37c8af90aa0a3cc368
parent 98b24f819a9caa3fa6448e4c9a728c67834d4108
parent c99121acde78f6b61dc97e54751987b7f4ea03b6

Merge "Fix handleGettingEabContactCommand return null" am: 744045df84 am: 15ca56bbfa am: c99121acde

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3283476ab16746b77f9f0be9f25c17a63464a095

src/com/android/phone/TelephonyShellCommand.java

diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 9676e59..043552d 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -1668,7 +1668,7 @@
         if (VDBG) {
             Log.v(LOG_TAG, "uce remove-eab-contact -s " + subId + ", result: " + result);
         }
-        return result;
+        return 0;
     }
 
     private int handleGettingEabContactCommand() {
@@ -1689,6 +1689,7 @@
         if (VDBG) {
             Log.v(LOG_TAG, "uce get-eab-contact, result: " + result);
         }
+        getOutPrintWriter().println(result);
         return 0;
     }