Merge "Made CacheQuotaHint testable." (47ca2ea1) · Commits · e / os / android_frameworks_base

api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -1451,20 +1451,20 @@ package android.app.time {
		package android.app.usage {

		public final class CacheQuotaHint implements android.os.Parcelable {
		ctor public CacheQuotaHint(android.app.usage.CacheQuotaHint.Builder);
		ctor public CacheQuotaHint(@NonNull android.app.usage.CacheQuotaHint.Builder);
		method public int describeContents();
		method public long getQuota();
		method public int getUid();
		method public android.app.usage.UsageStats getUsageStats();
		method public String getVolumeUuid();
		method public void writeToParcel(android.os.Parcel, int);
		method @Nullable public android.app.usage.UsageStats getUsageStats();
		method @Nullable public String getVolumeUuid();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.usage.CacheQuotaHint> CREATOR;
		field public static final long QUOTA_NOT_SET = -1L; // 0xffffffffffffffffL
		}

		public static final class CacheQuotaHint.Builder {
		ctor public CacheQuotaHint.Builder();
		ctor public CacheQuotaHint.Builder(android.app.usage.CacheQuotaHint);
		ctor public CacheQuotaHint.Builder(@NonNull android.app.usage.CacheQuotaHint);
		method @NonNull public android.app.usage.CacheQuotaHint build();
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setQuota(long);
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setUid(int);

api/test-current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -793,6 +793,28 @@ package android.app.role {

		package android.app.usage {

		public final class CacheQuotaHint implements android.os.Parcelable {
		ctor public CacheQuotaHint(@NonNull android.app.usage.CacheQuotaHint.Builder);
		method public int describeContents();
		method public long getQuota();
		method public int getUid();
		method @Nullable public android.app.usage.UsageStats getUsageStats();
		method @Nullable public String getVolumeUuid();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.usage.CacheQuotaHint> CREATOR;
		field public static final long QUOTA_NOT_SET = -1L; // 0xffffffffffffffffL
		}

		public static final class CacheQuotaHint.Builder {
		ctor public CacheQuotaHint.Builder();
		ctor public CacheQuotaHint.Builder(@NonNull android.app.usage.CacheQuotaHint);
		method @NonNull public android.app.usage.CacheQuotaHint build();
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setQuota(long);
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setUid(int);
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setUsageStats(@Nullable android.app.usage.UsageStats);
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setVolumeUuid(@Nullable String);
		}

		public class NetworkStatsManager {
		method public void setPollForce(boolean);
		}
		@@ -805,6 +827,10 @@ package android.app.usage {
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_CRATES) @WorkerThread public java.util.Collection<android.os.storage.CrateInfo> queryCratesForUser(@NonNull java.util.UUID, @NonNull android.os.UserHandle) throws java.io.IOException, android.content.pm.PackageManager.NameNotFoundException;
		}

		public final class UsageStats implements android.os.Parcelable {
		ctor public UsageStats();
		}

		public final class UsageStatsManager {
		method public void forceUsageSourceSettingRead();
		}

core/java/android/app/usage/CacheQuotaHint.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.app.usage;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -32,6 +33,7 @@ import java.util.Objects;
		* allows apps to understand how much cache to use.
		* {@hide}
		*/
		@TestApi
		@SystemApi
		public final class CacheQuotaHint implements Parcelable {
		public static final long QUOTA_NOT_SET = -1;
		@@ -44,14 +46,14 @@ public final class CacheQuotaHint implements Parcelable {
		* Create a new request.
		* @param builder A builder for this object.
		*/
		public CacheQuotaHint(Builder builder) {
		public CacheQuotaHint(@NonNull Builder builder) {
		this.mUuid = builder.mUuid;
		this.mUid = builder.mUid;
		this.mUsageStats = builder.mUsageStats;
		this.mQuota = builder.mQuota;
		}

		public String getVolumeUuid() {
		@Nullable public String getVolumeUuid() {
		return mUuid;
		}

		@@ -63,12 +65,12 @@ public final class CacheQuotaHint implements Parcelable {
		return mQuota;
		}

		public UsageStats getUsageStats() {
		@Nullable public UsageStats getUsageStats() {
		return mUsageStats;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		dest.writeString(mUuid);
		dest.writeInt(mUid);
		dest.writeLong(mQuota);
		@@ -106,7 +108,7 @@ public final class CacheQuotaHint implements Parcelable {
		public Builder() {
		}

		public Builder(CacheQuotaHint hint) {
		public Builder(@NonNull CacheQuotaHint hint) {
		setVolumeUuid(hint.getVolumeUuid());
		setUid(hint.getUid());
		setUsageStats(hint.getUsageStats());

core/java/android/app/usage/UsageStats.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import static android.app.usage.UsageEvents.Event.ROLLOVER_FOREGROUND_SERVICE;
		import static android.app.usage.UsageEvents.Event.USER_INTERACTION;

		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Build;
		import android.os.Bundle;
		@@ -155,6 +156,7 @@ public final class UsageStats implements Parcelable {
		/**
		* {@hide}
		*/
		@TestApi
		public UsageStats() {
		}

non-updatable-api/system-current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -1391,20 +1391,20 @@ package android.app.time {
		package android.app.usage {

		public final class CacheQuotaHint implements android.os.Parcelable {
		ctor public CacheQuotaHint(android.app.usage.CacheQuotaHint.Builder);
		ctor public CacheQuotaHint(@NonNull android.app.usage.CacheQuotaHint.Builder);
		method public int describeContents();
		method public long getQuota();
		method public int getUid();
		method public android.app.usage.UsageStats getUsageStats();
		method public String getVolumeUuid();
		method public void writeToParcel(android.os.Parcel, int);
		method @Nullable public android.app.usage.UsageStats getUsageStats();
		method @Nullable public String getVolumeUuid();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.usage.CacheQuotaHint> CREATOR;
		field public static final long QUOTA_NOT_SET = -1L; // 0xffffffffffffffffL
		}

		public static final class CacheQuotaHint.Builder {
		ctor public CacheQuotaHint.Builder();
		ctor public CacheQuotaHint.Builder(android.app.usage.CacheQuotaHint);
		ctor public CacheQuotaHint.Builder(@NonNull android.app.usage.CacheQuotaHint);
		method @NonNull public android.app.usage.CacheQuotaHint build();
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setQuota(long);
		method @NonNull public android.app.usage.CacheQuotaHint.Builder setUid(int);