Accept UUID instead of String in notifyAppIo APIs

UUID is more strongly typed and encouraged from an API
perspective.

Also added null checks

Test: m
Bug: 170486601
CTS-Coverage-Bug: 181222557
Change-Id: I25565711ca51e8459a89142ac5ac1b767a6326f9
This commit is contained in:
Zim
2021-03-03 12:39:55 +00:00
parent cebc566145
commit 055878b433
2 changed files with 8 additions and 6 deletions

View File

@@ -217,8 +217,8 @@ package android.os {
package android.os.storage {
public class StorageManager {
method public void notifyAppIoBlocked(@NonNull String, int, int, int);
method public void notifyAppIoResumed(@NonNull String, int, int, int);
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
}

View File

@@ -2738,10 +2738,11 @@ public class StorageManager {
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void notifyAppIoBlocked(@NonNull String volumeUuid, int uid, int tid,
public void notifyAppIoBlocked(@NonNull UUID volumeUuid, int uid, int tid,
@AppIoBlockedReason int reason) {
Objects.requireNonNull(volumeUuid);
try {
mStorageManager.notifyAppIoBlocked(volumeUuid, uid, tid, reason);
mStorageManager.notifyAppIoBlocked(convert(volumeUuid), uid, tid, reason);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -2764,10 +2765,11 @@ public class StorageManager {
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public void notifyAppIoResumed(@NonNull String volumeUuid, int uid, int tid,
public void notifyAppIoResumed(@NonNull UUID volumeUuid, int uid, int tid,
@AppIoBlockedReason int reason) {
Objects.requireNonNull(volumeUuid);
try {
mStorageManager.notifyAppIoResumed(volumeUuid, uid, tid, reason);
mStorageManager.notifyAppIoResumed(convert(volumeUuid), uid, tid, reason);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}