Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa1aa404 authored by Joanne Chung's avatar Joanne Chung Committed by Android (Google) Code Review
Browse files

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

parents bb98628e ad099e9f

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/Context.java

+1 −2
Original line number Diff line number Diff line
@@ -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.