From f187b6dc5188664b9690333133afec01347e3629 Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Mon, 19 Apr 2021 13:47:39 -0700
Subject: [PATCH] Add back deprecated Translator.translate() method

* Deprecatede method was @hide hidden by mistake.

Bug: 185793893
Test: atest CtsTranslationTestCases
Change-Id: I6acfcf866d926d5efd5baf3f711d9906dd95a34e
---
 core/api/removed.txt                               | 8 ++++++++
 core/java/android/view/translation/Translator.java | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/api/removed.txt b/core/api/removed.txt
index a99178d51d77c..ef35c593ed291 100644
--- a/core/api/removed.txt
+++ b/core/api/removed.txt
@@ -535,6 +535,14 @@ package android.view {
 
 }
 
+package android.view.translation {
+
+  public class Translator {
+    method @Deprecated @Nullable public void translate(@NonNull android.view.translation.TranslationRequest, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.view.translation.TranslationResponse>);
+  }
+
+}
+
 package android.webkit {
 
   public class WebViewClient {
diff --git a/core/java/android/view/translation/Translator.java b/core/java/android/view/translation/Translator.java
index 188d5629e9091..94305c19b9a71 100644
--- a/core/java/android/view/translation/Translator.java
+++ b/core/java/android/view/translation/Translator.java
@@ -231,9 +231,8 @@ public class Translator {
      *
      * @throws IllegalStateException if this Translator session was destroyed when called.
      *
-     * @deprecated use {@link #translate(TranslationRequest, CancellationSignal,
+     * @removed use {@link #translate(TranslationRequest, CancellationSignal,
      *             Executor, Consumer)} instead.
-     * @hide
      */
     @Deprecated
     @Nullable