Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[FW] Change the fake translation name to formal name." into sc-dev

Browse Source
This commit is contained in:
Joanne Chung
2021-04-16 07:16:25 +00:00
committed by Android (Google) Code Review
parent bb98628e59 ad099e9f2b
commit fa1aa404ee
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -2321,7 +2321,7 @@ package android.content {
field public static final String SYSTEM_CONFIG_SERVICE = "system_config"; 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 SYSTEM_UPDATE_SERVICE = "system_update";
field public static final String TETHERING_SERVICE = "tethering"; 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 UI_TRANSLATION_SERVICE = "ui_translation";
field public static final String VR_SERVICE = "vrmanager"; field public static final String VR_SERVICE = "vrmanager";
field public static final String WIFI_NL80211_SERVICE = "wifinl80211"; field public static final String WIFI_NL80211_SERVICE = "wifinl80211";

3
core/java/android/content/Context.java
View File

@@ -4705,10 +4705,9 @@ public abstract class Context {
* @hide * @hide
* @see #getSystemService(String) * @see #getSystemService(String)
*/ */
// TODO(b/176208267): change it back to translation before S release.
@SystemApi @SystemApi
@SuppressLint("ServiceName") @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. * Official published name of the translation service which supports ui translation function.