Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev am: 555767b616

am: 5cca011bd1

Change-Id: I9f94bbb867d3d55e3f03f6af4e89bb00216e4b97
This commit is contained in:
Amith Yamasani
2018-04-10 20:41:03 -07:00
committed by android-build-merger
2 changed files with 13 additions and 3 deletions

View File

@@ -7476,12 +7476,12 @@ package android.app.usage {
public static final class UsageEvents.Event {
ctor public UsageEvents.Event();
method public int getAppStandbyBucket();
method public java.lang.String getClassName();
method public android.content.res.Configuration getConfiguration();
method public int getEventType();
method public java.lang.String getPackageName();
method public java.lang.String getShortcutId();
method public int getStandbyBucket();
method public long getTimeStamp();
field public static final int CONFIGURATION_CHANGE = 5; // 0x5
field public static final int KEYGUARD_HIDDEN = 18; // 0x12

View File

@@ -111,7 +111,7 @@ public final class UsageEvents implements Parcelable {
/**
* An event type denoting a change in App Standby Bucket. The new bucket can be
* retrieved by calling {@link #getStandbyBucket()}.
* retrieved by calling {@link #getAppStandbyBucket()}.
*
* @see UsageStatsManager#getAppStandbyBucket()
*/
@@ -326,12 +326,22 @@ public final class UsageEvents implements Parcelable {
* Returns the standby bucket of the app, if the event is of type
* {@link #STANDBY_BUCKET_CHANGED}, otherwise returns 0.
* @return the standby bucket associated with the event.
*
* @hide
*/
public int getStandbyBucket() {
return (mBucketAndReason & 0xFFFF0000) >>> 16;
}
/**
* Returns the standby bucket of the app, if the event is of type
* {@link #STANDBY_BUCKET_CHANGED}, otherwise returns 0.
* @return the standby bucket associated with the event.
*
*/
public int getAppStandbyBucket() {
return (mBucketAndReason & 0xFFFF0000) >>> 16;
}
/**
* Returns the reason for the bucketing, if the event is of type
* {@link #STANDBY_BUCKET_CHANGED}, otherwise returns 0. Reason values include