Merge "Address onAnrDelayStarted API comments" into sc-dev (3244637a) · Commits · e / os / android_frameworks_base

core/api/module-lib-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,8 @@ package android.os.storage {
		public class StorageManager {
		method public void notifyAppIoBlocked(@NonNull java.util.UUID, int, int, int);
		method public void notifyAppIoResumed(@NonNull java.util.UUID, int, int, int);
		field public static final int APP_IO_BLOCKED_REASON_TRANSCODING = 0; // 0x0
		field public static final int APP_IO_BLOCKED_REASON_TRANSCODING = 1; // 0x1
		field public static final int APP_IO_BLOCKED_REASON_UNKNOWN = 0; // 0x0
		}

		public final class StorageVolume implements android.os.Parcelable {

+11 −2

Original line number	Diff line number	Diff line
		@@ -2795,13 +2795,21 @@ public class StorageManager {
		}
		}

		/**
		* Reason to provide if app IO is blocked/resumed for unknown reasons
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final int APP_IO_BLOCKED_REASON_UNKNOWN = 0;

		/**
		* Reason to provide if app IO is blocked/resumed because of transcoding
		*
		* @hide
		*/
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final int APP_IO_BLOCKED_REASON_TRANSCODING = 0;
		public static final int APP_IO_BLOCKED_REASON_TRANSCODING = 1;

		/**
		* Constants for use with
		@@ -2812,7 +2820,8 @@ public class StorageManager {
		*/
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(prefix = { "APP_IO_BLOCKED_REASON_" }, value = {
		APP_IO_BLOCKED_REASON_TRANSCODING
		APP_IO_BLOCKED_REASON_TRANSCODING,
		APP_IO_BLOCKED_REASON_UNKNOWN,
		})
		public @interface AppIoBlockedReason {}

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ public abstract class ExternalStorageService extends Service {
		*
		* @param packageName the package name of the ANR'ing app
		* @param uid the uid of the ANR'ing app
		* @param tid the tid of the ANR'ing app
		* @param tid the thread id of the ANR'ing app
		* @param reason the reason the app is ANR'ing
		*/
		public void onAnrDelayStarted(@NonNull String packageName, int uid, int tid,