From fdae3e8060ff34bd1af836e29e8c4cd4dc43289d Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Tue, 22 Feb 2022 20:08:56 +0000 Subject: [PATCH] Open up getCloudMediaProvider to mainline modules. Bug: 220890919 Test: atest CtsPhotoPickerTest Change-Id: I2933b622eede53f87baff94da12cc9b3cc532456 --- core/api/module-lib-current.txt | 1 + core/java/android/os/storage/StorageManager.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 594f46b6694bc..7ec239d681d0a 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -413,6 +413,7 @@ package android.os.storage { public class StorageManager { 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 notifyAppIoResumed(@NonNull java.util.UUID, int, int, int); method public void setCloudMediaProvider(@Nullable String); diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index cc9833997102e..48e2827f19e15 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -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 + @TestApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) public String getCloudMediaProvider() { try { return mStorageManager.getCloudMediaProvider();