commit c99121acde78f6b61dc97e54751987b7f4ea03b6
author Calvin Pan <calvinpan@google.com> Fri Feb 05 01:53:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 05 01:53:41 2021 +0000
tree 03b0049ad3e5acc06b9a164f908975a4e45c4262
parent 89a6e1bf3624e5ef247e1795d84e491470279a24
parent 15ca56bbfa3bc9d474eddfa12f239e4d9b15c38c

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie59ab1db1b3aa632eed26fdd20a22a33dbc6268e

src/com/android/phone/TelephonyShellCommand.java

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