summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorZim <zezeozue@google.com>2021-03-03 12:39:55 +0000
committerZim <zezeozue@google.com>2021-03-03 12:46:46 +0000
commit055878b4331cbcf1d373b6d8078ecab2dad0e17c (patch)
tree84b0af89b6696682faacfb6e25ce2537ea60c9cb /core/java/android
parentcebc56614505e9cd40ef240171b8f2553dc23be8 (diff)
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
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/storage/StorageManager.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 7c8874cc1ea7..e5098980163a 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -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();
}