commit 15ca56bbfa3bc9d474eddfa12f239e4d9b15c38c
author Calvin Pan <calvinpan@google.com> Fri Feb 05 01:34:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 05 01:34:26 2021 +0000
tree c0c8393786d5ad81dc8f6c92e37ead163488f534
parent c1743106e8a6d3d5126d2d84da373f63bf81dd74
parent 744045df842b4429af967309f65b1773eeabef1d

Merge "Fix handleGettingEabContactCommand return null" am: 744045df84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic157ad262105fe950832be64414a3cd86d10c15e

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;
     }