am 59d208dd: Merge "Remove UsageEvents#resetToStart() as it doesn\'t work" into lmp-dev (8078954a) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

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

+3 −9

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		*/
		package android.app.usage;

		import android.content.ComponentName;
		import android.content.res.Configuration;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -94,14 +93,6 @@ public final class UsageEvents implements Parcelable {
		*/
		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.
		*/
		@@ -233,6 +224,9 @@ public final class UsageEvents implements Parcelable {

		/**
		* 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() {
		mIndex = 0;