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

Commit c4efa1d5 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Add a SystemApi constant for TIME_MANAGER_SERVICE"

parents 7e446988 023accd8

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3270,6 +3270,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 TIME_MANAGER_SERVICE = "time_manager";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

    field public static final String UWB_SERVICE = "uwb";

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,7 @@ public final class SystemServiceRegistry { 
                        return new TimeZoneDetectorImpl();

                    }});



        registerService(Context.TIME_MANAGER, TimeManager.class,

        registerService(Context.TIME_MANAGER_SERVICE, TimeManager.class,

                new CachedServiceFetcher<TimeManager>() {

                    @Override

                    public TimeManager createService(ContextImpl ctx)

core/java/android/app/time/TimeManager.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.concurrent.Executor; 
 * @hide

 */

@SystemApi

@SystemService(Context.TIME_MANAGER)

@SystemService(Context.TIME_MANAGER_SERVICE)

public final class TimeManager {

    private static final String TAG = "time.TimeManager";

    private static final boolean DEBUG = false;

core/java/android/content/Context.java

+6 −4
Original line number Diff line number Diff line
@@ -5854,7 +5854,7 @@ public abstract class Context { 
    public static final String SECURE_ELEMENT_SERVICE = "secure_element";



    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.app.timedetector.TimeDetector}.

     * @hide

     *
@@ -5863,7 +5863,7 @@ public abstract class Context { 
    public static final String TIME_DETECTOR_SERVICE = "time_detector";



    /**

     * Use with {@link #getSystemService(String)} to retrieve an

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.app.timezonedetector.TimeZoneDetector}.

     * @hide

     *
@@ -5872,12 +5872,14 @@ public abstract class Context { 
    public static final String TIME_ZONE_DETECTOR_SERVICE = "time_zone_detector";



    /**

     * Use with {@link #getSystemService(String)} to retrieve an {@link TimeManager}.

     * Use with {@link #getSystemService(String)} to retrieve a {@link TimeManager}.

     * @hide

     *

     * @see #getSystemService(String)

     */

    public static final String TIME_MANAGER = "time_manager";

    @SystemApi

    @SuppressLint("ServiceName")

    public static final String TIME_MANAGER_SERVICE = "time_manager";



    /**

     * Binder service name for {@link AppBindingService}.