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

Merge "Address onAnrDelayStarted API comments" into sc-dev

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2021-03-25 19:35:47 +00:00
committed by Android (Google) Code Review
parent eadeea409a 308a048787
commit 3244637a97
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/module-lib-current.txt
View File

@@ -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 {

13
core/java/android/os/storage/StorageManager.java
View File

@@ -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 {}

2
core/java/android/service/storage/ExternalStorageService.java
View File

@@ -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,