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

Commit 44a711cc authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 9f692b52: am 9be305d1: Merge "Make the Context service constant for... 

am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev

* commit '9f692b52':
  Make the Context service constant for UsageStats public
parents 15913c80 9f692b52

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7277,6 +7277,7 @@ package android.content { 
    field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices";

    field public static final java.lang.String TV_INPUT_SERVICE = "tv_input";

    field public static final java.lang.String UI_MODE_SERVICE = "uimode";

    field public static final java.lang.String USAGE_STATS_SERVICE = "usagestats";

    field public static final java.lang.String USB_SERVICE = "usb";

    field public static final java.lang.String USER_SERVICE = "user";

    field public static final java.lang.String VIBRATOR_SERVICE = "vibrator";

core/java/android/content/Context.java

+1 −2
Original line number Diff line number Diff line
@@ -2877,11 +2877,10 @@ public abstract class Context { 


    /**

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

     * android.app.usage.UsageStatsManager} for interacting with the status bar.

     * android.app.usage.UsageStatsManager} for querying device usage stats.

     *

     * @see #getSystemService

     * @see android.app.usage.UsageStatsManager

     * @hide

     */

    public static final String USAGE_STATS_SERVICE = "usagestats";