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

Merge "Remove UsageEvents#resetToStart() as it doesn't work" into lmp-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-10-08 20:34:54 +00:00
committed by Android (Google) Code Review
parent 49c5ddd677 54e064bcea
commit 59d208ddc1
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -5587,7 +5587,6 @@ package android.app.usage {
method public int describeContents(); method public int describeContents();
method public boolean getNextEvent(android.app.usage.UsageEvents.Event); method public boolean getNextEvent(android.app.usage.UsageEvents.Event);
method public boolean hasNextEvent(); method public boolean hasNextEvent();
method public void resetToStart();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR; field public static final android.os.Parcelable.Creator CREATOR;
} }

12
core/java/android/app/usage/UsageEvents.java
View File

@@ -15,7 +15,6 @@
*/ */
package android.app.usage; package android.app.usage;
import android.content.ComponentName;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -94,14 +93,6 @@ public final class UsageEvents implements Parcelable {
*/ */
public Configuration mConfiguration; public Configuration mConfiguration;
/**
* TODO(adamlesinski): Removed before release.
* {@hide}
*/
public ComponentName getComponent() {
return new ComponentName(mPackage, mClass);
}
/** /**
* The package name of the source of this event. * The package name of the source of this event.
*/ */
@@ -233,6 +224,9 @@ public final class UsageEvents implements Parcelable {
/** /**
* Resets the collection so that it can be iterated over from the beginning. * Resets the collection so that it can be iterated over from the beginning.
*
* @hide When this object is iterated to completion, the parcel is destroyed and
* so resetToStart doesn't work.
*/ */
public void resetToStart() { public void resetToStart() {
mIndex = 0; mIndex = 0;