Merge "Add missing argument and return annotations" (8c45f11b) · Commits · e / os / android_frameworks_base

api/system-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -405,9 +405,9 @@ package android.app {
		method public int describeContents();
		method public long getBeginTimeMillis();
		method public long getEndTimeMillis();
		method public int getUidCount();
		method @IntRange(from=0) public int getUidCount();
		method @Nullable public android.app.AppOpsManager.HistoricalUidOps getUidOps(int);
		method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(int);
		method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(@IntRange(from=0) int);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOps> CREATOR;
		}
		@@ -427,8 +427,8 @@ package android.app {
		public static final class AppOpsManager.HistoricalPackageOps implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.app.AppOpsManager.HistoricalOp getOp(@NonNull String);
		method @NonNull public android.app.AppOpsManager.HistoricalOp getOpAt(int);
		method public int getOpCount();
		method @NonNull public android.app.AppOpsManager.HistoricalOp getOpAt(@IntRange(from=0) int);
		method @IntRange(from=0) public int getOpCount();
		method @NonNull public String getPackageName();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalPackageOps> CREATOR;
		@@ -436,9 +436,9 @@ package android.app {

		public static final class AppOpsManager.HistoricalUidOps implements android.os.Parcelable {
		method public int describeContents();
		method public int getPackageCount();
		method @IntRange(from=0) public int getPackageCount();
		method @Nullable public android.app.AppOpsManager.HistoricalPackageOps getPackageOps(@NonNull String);
		method @NonNull public android.app.AppOpsManager.HistoricalPackageOps getPackageOpsAt(int);
		method @NonNull public android.app.AppOpsManager.HistoricalPackageOps getPackageOpsAt(@IntRange(from=0) int);
		method public int getUid();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalUidOps> CREATOR;

api/test-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -238,9 +238,9 @@ package android.app {
		method public int describeContents();
		method public long getBeginTimeMillis();
		method public long getEndTimeMillis();
		method public int getUidCount();
		method @IntRange(from=0) public int getUidCount();
		method @Nullable public android.app.AppOpsManager.HistoricalUidOps getUidOps(int);
		method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(int);
		method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(@IntRange(from=0) int);
		method public void increaseAccessCount(int, int, @NonNull String, int, int, long);
		method public void increaseAccessDuration(int, int, @NonNull String, int, int, long);
		method public void increaseRejectCount(int, int, @NonNull String, int, int, long);
		@@ -264,8 +264,8 @@ package android.app {
		public static final class AppOpsManager.HistoricalPackageOps implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.app.AppOpsManager.HistoricalOp getOp(@NonNull String);
		method @NonNull public android.app.AppOpsManager.HistoricalOp getOpAt(int);
		method public int getOpCount();
		method @NonNull public android.app.AppOpsManager.HistoricalOp getOpAt(@IntRange(from=0) int);
		method @IntRange(from=0) public int getOpCount();
		method @NonNull public String getPackageName();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalPackageOps> CREATOR;
		@@ -273,9 +273,9 @@ package android.app {

		public static final class AppOpsManager.HistoricalUidOps implements android.os.Parcelable {
		method public int describeContents();
		method public int getPackageCount();
		method @IntRange(from=0) public int getPackageCount();
		method @Nullable public android.app.AppOpsManager.HistoricalPackageOps getPackageOps(@NonNull String);
		method @NonNull public android.app.AppOpsManager.HistoricalPackageOps getPackageOpsAt(int);
		method @NonNull public android.app.AppOpsManager.HistoricalPackageOps getPackageOpsAt(@IntRange(from=0) int);
		method public int getUid();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalUidOps> CREATOR;

core/java/android/app/AppOpsManager.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app;

		import android.Manifest;
		import android.annotation.IntDef;
		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		@@ -3114,7 +3115,7 @@ public class AppOpsManager {
		*
		* @see #getUidOpsAt(int)
		*/
		public int getUidCount() {
		public @IntRange(from = 0) int getUidCount() {
		if (mHistoricalUidOps == null) {
		return 0;
		}
		@@ -3130,7 +3131,7 @@ public class AppOpsManager {
		*
		* @see #getUidCount()
		*/
		public @NonNull HistoricalUidOps getUidOpsAt(int index) {
		public @NonNull HistoricalUidOps getUidOpsAt(@IntRange(from = 0) int index) {
		if (mHistoricalUidOps == null) {
		throw new IndexOutOfBoundsException();
		}
		@@ -3391,7 +3392,7 @@ public class AppOpsManager {
		*
		* @see #getPackageOpsAt(int)
		*/
		public int getPackageCount() {
		public @IntRange(from = 0) int getPackageCount() {
		if (mHistoricalPackageOps == null) {
		return 0;
		}
		@@ -3407,7 +3408,7 @@ public class AppOpsManager {
		*
		* @see #getPackageCount()
		*/
		public @NonNull HistoricalPackageOps getPackageOpsAt(int index) {
		public @NonNull HistoricalPackageOps getPackageOpsAt(@IntRange(from = 0) int index) {
		if (mHistoricalPackageOps == null) {
		throw new IndexOutOfBoundsException();
		}
		@@ -3626,7 +3627,7 @@ public class AppOpsManager {
		* @return The number historical app ops.
		* @see #getOpAt(int)
		*/
		public int getOpCount() {
		public @IntRange(from = 0) int getOpCount() {
		if (mHistoricalOps == null) {
		return 0;
		}
		@@ -3640,7 +3641,7 @@ public class AppOpsManager {
		* @return The op at the given index.
		* @see #getOpCount()
		*/
		public @NonNull HistoricalOp getOpAt(int index) {
		public @NonNull HistoricalOp getOpAt(@IntRange(from = 0) int index) {
		if (mHistoricalOps == null) {
		throw new IndexOutOfBoundsException();
		}