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

Commit cbe1f922 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Open up getCloudMediaProvider to mainline modules." into tm-dev am: 872eecc6 

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

Change-Id: I43c2d7860be67563dadd77f86c53e3f87c98da02
parents d72c6589 872eecc6

core/api/module-lib-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -413,6 +413,7 @@ package android.os.storage { 




  public class StorageManager {

  public class StorageManager {

    method public long computeStorageCacheBytes(@NonNull java.io.File);

    method public long computeStorageCacheBytes(@NonNull java.io.File);

    method @Nullable public String getCloudMediaProvider();

    method public void notifyAppIoBlocked(@NonNull java.util.UUID, 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);

    method public void notifyAppIoResumed(@NonNull java.util.UUID, int, int, int);

    method public void setCloudMediaProvider(@Nullable String);

    method public void setCloudMediaProvider(@Nullable String);

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

+10 −2
Original line number Original line Diff line number Diff line
@@ -3022,9 +3022,17 @@ public class StorageManager { 
        }

        }

    }

    }





    /** @hide */

    /**

    @TestApi

     * Returns the authority of the current cloud media provider that was set by the

     * {@link android.service.storage.ExternalStorageService} holding the

     * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE} permission via

     * {@link #setCloudMediaProvider(String)}.

     *

     * @hide

     */

    @Nullable

    @Nullable

    @TestApi

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public String getCloudMediaProvider() {

    public String getCloudMediaProvider() {

        try {

        try {

            return mStorageManager.getCloudMediaProvider();

            return mStorageManager.getCloudMediaProvider();