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

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

Browse Source 
* commit '9be305d146fb422a0e65e5284af2ce081cdc6a69':
  Make the Context service constant for UsageStats public
This commit is contained in:
Adam Lesinski
2014-11-25 00:56:00 +00:00
committed by Android Git Automerger
parent cda2dafd36 9be305d146
commit 9f692b5202
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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 TEXT_SERVICES_MANAGER_SERVICE = "textservices";
field public static final java.lang.String TV_INPUT_SERVICE = "tv_input"; 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 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 USB_SERVICE = "usb";
field public static final java.lang.String USER_SERVICE = "user"; field public static final java.lang.String USER_SERVICE = "user";
field public static final java.lang.String VIBRATOR_SERVICE = "vibrator"; field public static final java.lang.String VIBRATOR_SERVICE = "vibrator";

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

@@ -2877,11 +2877,10 @@ public abstract class Context {
/** /**
* Use with {@link #getSystemService} to retrieve a {@link * 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 #getSystemService
* @see android.app.usage.UsageStatsManager * @see android.app.usage.UsageStatsManager
* @hide
*/ */
public static final String USAGE_STATS_SERVICE = "usagestats"; public static final String USAGE_STATS_SERVICE = "usagestats";