From 7e6f9ea49b9d2cce6ae31e341bd3fc9c99db191d Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Tue, 30 Mar 2021 14:33:19 -0700
Subject: [PATCH] Remove onError from translationResultCallback.

*onError is not needed, error code is embedded in the
TranslationResponse itself.

Bug: 176208267
Test: atest CtsTranslationTestCases
Change-Id: I67f42ae900cbac1d697de7ecae1bbffabd921c4a
---
 core/api/system-current.txt                   |  2 +-
 .../translation/ITranslationCallback.aidl     |  1 -
 .../OnTranslationResultCallbackWrapper.java   | 19 +++++--------------
 .../translation/TranslationService.java       |  2 ++
 .../android/view/translation/Translator.java  | 19 -------------------
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index b543411cea7a3..0d8b1e36d3333 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -10323,7 +10323,7 @@ package android.service.translation {
   }
 
   public static interface TranslationService.OnTranslationResultCallback {
-    method public void onError();
+    method @Deprecated public void onError();
     method public void onTranslationSuccess(@NonNull android.view.translation.TranslationResponse);
   }
 
diff --git a/core/java/android/service/translation/ITranslationCallback.aidl b/core/java/android/service/translation/ITranslationCallback.aidl
index 893c9d0ff661f..c7e63a0529d82 100644
--- a/core/java/android/service/translation/ITranslationCallback.aidl
+++ b/core/java/android/service/translation/ITranslationCallback.aidl
@@ -25,5 +25,4 @@ import android.view.translation.TranslationResponse;
  */
 oneway interface ITranslationCallback {
     void onTranslationResponse(in TranslationResponse translationResponse);
-    void onError();
 }
diff --git a/core/java/android/service/translation/OnTranslationResultCallbackWrapper.java b/core/java/android/service/translation/OnTranslationResultCallbackWrapper.java
index 10a2aa2379272..f5851551d5c44 100644
--- a/core/java/android/service/translation/OnTranslationResultCallbackWrapper.java
+++ b/core/java/android/service/translation/OnTranslationResultCallbackWrapper.java
@@ -66,22 +66,13 @@ final class OnTranslationResultCallbackWrapper implements
         }
     }
 
+    /**
+     * @deprecated use {@link #onTranslationSuccess} with error response instead.
+     */
     @Override
+    @Deprecated
     public void onError() {
-        assertNotCalled();
-        if (mCalled.getAndSet(true)) {
-            throw new IllegalStateException("Already called");
-        }
-
-        try {
-            mCallback.onError();
-        } catch (RemoteException e) {
-            if (e instanceof DeadObjectException) {
-                Log.w(TAG, "Process is dead, ignore.");
-                return;
-            }
-            throw e.rethrowAsRuntimeException();
-        }
+        // no-op.
     }
 
     private void assertNotCalled() {
diff --git a/core/java/android/service/translation/TranslationService.java b/core/java/android/service/translation/TranslationService.java
index 7edf2e23a528b..96654dfba624c 100644
--- a/core/java/android/service/translation/TranslationService.java
+++ b/core/java/android/service/translation/TranslationService.java
@@ -140,7 +140,9 @@ public abstract class TranslationService extends Service {
 
         /**
          * TODO: implement javadoc
+         * @deprecated use {@link #onTranslationSuccess} with an error response instead.
          */
+        @Deprecated
         void onError();
     }
 
diff --git a/core/java/android/view/translation/Translator.java b/core/java/android/view/translation/Translator.java
index 6b26e0698d125..f2ba44fb6f6e5 100644
--- a/core/java/android/view/translation/Translator.java
+++ b/core/java/android/view/translation/Translator.java
@@ -329,24 +329,5 @@ public class Translator {
                 }
             }
         }
-
-        @Override
-        public void onError() throws RemoteException {
-            final Consumer<TranslationResponse>  callback = mCallback.get();
-            final Runnable runnable = () -> callback.accept(
-                    new TranslationResponse.Builder(
-                            TranslationResponse.TRANSLATION_STATUS_UNKNOWN_ERROR)
-                            .build());
-
-            if (callback != null) {
-                final Executor executor = mExecutor.get();
-                final long token = Binder.clearCallingIdentity();
-                try {
-                    executor.execute(runnable);
-                } finally {
-                    restoreCallingIdentity(token);
-                }
-            }
-        }
     }
 }