diff options
| author | 2021-04-16 07:16:25 +0000 | |
|---|---|---|
| committer | 2021-04-16 07:16:25 +0000 | |
| commit | fa1aa404eeccf512135a69fce9a71014b045de34 (patch) | |
| tree | b02ef39a5ed1ac320dbbabf4fb80cff143a7eb64 | |
| parent | bb98628e597badcb31501f3e044fff483205683b (diff) | |
| parent | ad099e9f2bc21e5fde7211f207968c5c9b4e0586 (diff) | |
Merge "[FW] Change the fake translation name to formal name." into sc-dev
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 661e9abf9e58..71a0d95ca42b 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -2321,7 +2321,7 @@ package android.content { field public static final String SYSTEM_CONFIG_SERVICE = "system_config"; field public static final String SYSTEM_UPDATE_SERVICE = "system_update"; field public static final String TETHERING_SERVICE = "tethering"; - field public static final String TRANSLATION_MANAGER_SERVICE = "transformer"; + field public static final String TRANSLATION_MANAGER_SERVICE = "translation"; field public static final String UI_TRANSLATION_SERVICE = "ui_translation"; field public static final String VR_SERVICE = "vrmanager"; field public static final String WIFI_NL80211_SERVICE = "wifinl80211"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 318913f3bec0..a88c9edd3017 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -4705,10 +4705,9 @@ public abstract class Context { * @hide * @see #getSystemService(String) */ - // TODO(b/176208267): change it back to translation before S release. @SystemApi @SuppressLint("ServiceName") - public static final String TRANSLATION_MANAGER_SERVICE = "transformer"; + public static final String TRANSLATION_MANAGER_SERVICE = "translation"; /** * Official published name of the translation service which supports ui translation function. |