Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d70c6f authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Accept UUID instead of String in notifyAppIo APIs" into sc-dev am: 3d28144b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13748908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1733e7e3beb9f2eda06e9d42ef0f2677bf38091b
parents 06c5d5c1 3d28144b

core/api/module-lib-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -241,8 +241,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

  }

core/java/android/os/storage/StorageManager.java

+6 −4
Original line number Diff line number Diff line
@@ -2766,10 +2766,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();

        }
@@ -2792,10 +2793,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();

        }