[FP4S-671]mainline_s_2022_aug_t1004687 Change-Id: Id7c421a7d03db73fc27d1de82758a60418364fd5

commit: 5f5fb605c5876bbcb46fdaf0f80d93d68a64b1d1 [log] [tgz]
author: android-t1 <xiaocong.gu@t2mobile.com> Wed Oct 12 13:51:37 2022 +0800
committer: android-t1 <xiaocong.gu@t2mobile.com> Wed Oct 12 13:51:37 2022 +0800
tree: 8c0f01f6721e178e06c83e76f4031cc2a3f49baa
parent: a52491830a15ab0f6a0a70817c77947cb7bc4b46 [diff]
diff --git a/current/Android.bp b/current/Android.bp
index 969e5e5..da17389 100644
--- a/current/Android.bp
+++ b/current/Android.bp

@@ -1,11 +1,6 @@
 // This is auto-generated. DO NOT EDIT.
 
-package {
-    // A default list here prevents the license LSC from adding its own list which would
-    // be unnecessary as every module in the sdk already has its own licenses property.
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
 soong_config_module_type_import {
     from: "packages/modules/common/Android.bp",
     module_types: [
@@ -14,25 +9,38 @@
     ],
 }
 
+package {
+    // A default list here prevents the license LSC from adding its own list which would
+    // be unnecessary as every module in the sdk already has its own licenses property.
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 prebuilt_bootclasspath_fragment {
     name: "mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current",
     sdk_member_name: "com.android.mediaprovider-bootclasspath-fragment",
     visibility: ["//visibility:public"],
     apex_available: ["com.android.mediaprovider"],
-    licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license@current"],
+    licenses: ["mediaprovider-module-sdk_Android-Apache-2.0@current"],
     contents: ["mediaprovider-module-sdk_framework-mediaprovider@current"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
     hidden_api: {
         max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
         annotation_flags: "hiddenapi/annotation-flags.csv",
         metadata: "hiddenapi/metadata.csv",
         index: "hiddenapi/index.csv",
+        stub_flags: "hiddenapi/stub-flags.csv",
         all_flags: "hiddenapi/all-flags.csv",
     },
 }
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.mediaprovider-bootclasspath-fragment",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -41,14 +49,20 @@
     },
     visibility: ["//visibility:public"],
     apex_available: ["com.android.mediaprovider"],
-    licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
+    licenses: ["mediaprovider-module-sdk_Android-Apache-2.0"],
     contents: ["framework-mediaprovider"],
+    fragments: [
+        {
+            apex: "com.android.art",
+            module: "art-bootclasspath-fragment",
+        },
+    ],
     hidden_api: {
         max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
-        stub_flags: "hiddenapi/stub-flags.csv",
         annotation_flags: "hiddenapi/annotation-flags.csv",
         metadata: "hiddenapi/metadata.csv",
         index: "hiddenapi/index.csv",
+        stub_flags: "hiddenapi/stub-flags.csv",
         all_flags: "hiddenapi/all-flags.csv",
     },
 }
@@ -61,7 +75,7 @@
         "com.android.mediaprovider",
         "test_com.android.mediaprovider",
     ],
-    licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license@current"],
+    licenses: ["mediaprovider-module-sdk_Android-Apache-2.0@current"],
     shared_library: false,
     permitted_packages: ["android.provider"],
     public: {
@@ -89,6 +103,7 @@
 
 module_java_sdk_library_import {
     name: "framework-mediaprovider",
+    // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
     prefer: true,
     soong_config_variables: {
         module_build_from_source: {
@@ -100,7 +115,7 @@
         "com.android.mediaprovider",
         "test_com.android.mediaprovider",
     ],
-    licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
+    licenses: ["mediaprovider-module-sdk_Android-Apache-2.0"],
     shared_library: false,
     permitted_packages: ["android.provider"],
     public: {
@@ -127,18 +142,18 @@
 }
 
 license {
-    name: "mediaprovider-module-sdk_packages_providers_MediaProvider_license@current",
-    sdk_member_name: "packages_providers_MediaProvider_license",
+    name: "mediaprovider-module-sdk_Android-Apache-2.0@current",
+    sdk_member_name: "Android-Apache-2.0",
     visibility: ["//visibility:private"],
     license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/packages/providers/MediaProvider/NOTICE"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
 }
 
 license {
-    name: "mediaprovider-module-sdk_packages_providers_MediaProvider_license",
+    name: "mediaprovider-module-sdk_Android-Apache-2.0",
     visibility: ["//visibility:private"],
     license_kinds: ["SPDX-license-identifier-Apache-2.0"],
-    license_text: ["licenses/packages/providers/MediaProvider/NOTICE"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
 }
 
 sdk_snapshot {

diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index e80d172..8be0572 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv

@@ -1,5 +1,240 @@
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;-><init>(Landroid/provider/AsyncContentProvider;Ljava/util/concurrent/CompletableFuture;)V,blocked
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;->f$0:Landroid/provider/AsyncContentProvider;,blocked
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;->f$1:Ljava/util/concurrent/CompletableFuture;,blocked
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;->onResult(Landroid/os/Bundle;)V,sdk,system-api,test-api
+Landroid/provider/AsyncContentProvider;-><init>(Landroid/provider/IAsyncContentProvider;)V,blocked
+Landroid/provider/AsyncContentProvider;->TIMEOUT_IN_SECONDS:J,blocked
+Landroid/provider/AsyncContentProvider;->lambda$openMedia$0$android-provider-AsyncContentProvider(Ljava/util/concurrent/CompletableFuture;Landroid/os/Bundle;)V,blocked
+Landroid/provider/AsyncContentProvider;->mAsyncContentProvider:Landroid/provider/IAsyncContentProvider;,blocked
+Landroid/provider/AsyncContentProvider;->openMedia(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;,blocked
+Landroid/provider/AsyncContentProvider;->setResult(Landroid/os/Bundle;Ljava/util/concurrent/CompletableFuture;)V,blocked
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;-><init>(Landroid/provider/CloudMediaProvider;)V,blocked
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;-><init>(Landroid/provider/CloudMediaProvider;Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper-IA;)V,blocked
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V,blocked
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;->sendResult(Landroid/os/ParcelFileDescriptor;Ljava/lang/Throwable;Landroid/os/RemoteCallback;)V,blocked
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;->this$0:Landroid/provider/CloudMediaProvider;,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;-><init>()V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onConfigChange(Landroid/os/Bundle;)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onDestroy()V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onMediaPause(I)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onMediaPlay(I)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onMediaSeekTo(IJ)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onPlayerCreate()V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onPlayerRelease()V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onSurfaceChanged(IIII)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onSurfaceDestroyed(I)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;-><init>(Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->mSurfaceController:Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onConfigChange(Landroid/os/Bundle;)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onDestroy()V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onMediaPause(I)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onMediaPlay(I)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onMediaSeekTo(IJ)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onPlayerCreate()V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onPlayerRelease()V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onSurfaceChanged(IIII)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onSurfaceDestroyed(I)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;-><init>(Landroid/provider/ICloudMediaSurfaceStateChangedCallback;)V,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_BUFFERING:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_COMPLETED:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_ERROR_PERMANENT_FAILURE:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_ERROR_RETRIABLE_FAILURE:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_MEDIA_SIZE_CHANGED:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_PAUSED:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_READY:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_STARTED:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->getIBinder()Landroid/os/IBinder;,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->mCallback:Landroid/provider/ICloudMediaSurfaceStateChangedCallback;,blocked
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->setPlaybackState(IILandroid/os/Bundle;)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;-><init>()V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->DEFAULT_LOOPING_PLAYBACK_ENABLED:Z,blocked
+Landroid/provider/CloudMediaProvider;->DEFAULT_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED:Z,blocked
+Landroid/provider/CloudMediaProvider;->MATCH_ALBUMS:I,blocked
+Landroid/provider/CloudMediaProvider;->MATCH_DELETED_MEDIAS:I,blocked
+Landroid/provider/CloudMediaProvider;->MATCH_MEDIAS:I,blocked
+Landroid/provider/CloudMediaProvider;->MATCH_MEDIA_COLLECTION_INFO:I,blocked
+Landroid/provider/CloudMediaProvider;->MATCH_SURFACE_CONTROLLER:I,blocked
+Landroid/provider/CloudMediaProvider;->TAG:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProvider;->attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->call(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->callUnchecked(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;,blocked
+Landroid/provider/CloudMediaProvider;->canonicalize(Landroid/net/Uri;)Landroid/net/Uri;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->getType(Landroid/net/Uri;)Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->insert(Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->mAsyncContentProviderWrapper:Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;,blocked
+Landroid/provider/CloudMediaProvider;->mMatcher:Landroid/content/UriMatcher;,blocked
+Landroid/provider/CloudMediaProvider;->mMediaStoreAuthorityAppId:I,blocked
+Landroid/provider/CloudMediaProvider;->onCreateCloudMediaSurfaceController(Landroid/os/Bundle;)Landroid/os/Bundle;,blocked
+Landroid/provider/CloudMediaProvider;->onCreateCloudMediaSurfaceController(Landroid/os/Bundle;Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;)Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onGetAsyncContentProvider()Landroid/os/Bundle;,blocked
+Landroid/provider/CloudMediaProvider;->onGetMediaCollectionInfo(Landroid/os/Bundle;)Landroid/os/Bundle;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onOpenMedia(Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/os/ParcelFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onOpenPreview(Ljava/lang/String;Landroid/graphics/Point;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/content/res/AssetFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onQueryAlbums(Landroid/os/Bundle;)Landroid/database/Cursor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onQueryDeletedMedia(Landroid/os/Bundle;)Landroid/database/Cursor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onQueryMedia(Landroid/os/Bundle;)Landroid/database/Cursor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openFile(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/CancellationSignal;)Landroid/os/ParcelFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openTypedAssetFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/res/AssetFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openTypedAssetFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/content/res/AssetFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->query(Landroid/net/Uri;[Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/database/Cursor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Landroid/os/CancellationSignal;)Landroid/database/Cursor;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProvider;->registerAuthority(Ljava/lang/String;)V,blocked
+Landroid/provider/CloudMediaProvider;->update(Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;-><clinit>()V,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;-><init>()V,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_CAMERA:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_DOWNLOADS:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_FAVORITES:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_SCREENSHOTS:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_VIDEOS:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALL_PROJECTION:[Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->AUTHORITY:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->DATE_TAKEN_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->DISPLAY_NAME:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->IS_LOCAL:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->MEDIA_COUNT:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->MEDIA_COVER_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;-><init>()V,blocked
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->ACCOUNT_CONFIGURATION_INTENT:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->ACCOUNT_NAME:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->LAST_MEDIA_SYNC_GENERATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;-><clinit>()V,blocked
+Landroid/provider/CloudMediaProviderContract$MediaColumns;-><init>()V,blocked
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->ALL_PROJECTION:[Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->AUTHORITY:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->DATA:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->DATE_TAKEN_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->IS_FAVORITE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->MEDIA_STORE_URI:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->SIZE_BYTES:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_GIF:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_NONE:I,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->SYNC_GENERATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;-><init>()V,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_ASYNC_CONTENT_PROVIDER:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_AUTHORITY:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_ERROR_MESSAGE:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_FILE_DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_LOOPING_PLAYBACK_ENABLED:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIASTORE_THUMB:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_MIME_TYPE:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_PAGE_TOKEN:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_PREVIEW_THUMBNAIL:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SIZE_LIMIT_BYTES:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SURFACE_CONTROLLER:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SURFACE_STATE_CALLBACK:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SYNC_GENERATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->MANAGE_CLOUD_MEDIA_PROVIDERS_PERMISSION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->METHOD_CREATE_SURFACE_CONTROLLER:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->METHOD_GET_ASYNC_CONTENT_PROVIDER:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->METHOD_GET_MEDIA_COLLECTION_INFO:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->PROVIDER_INTERFACE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->TAG:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_ALBUM:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_DELETED_MEDIA:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_MEDIA:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_MEDIA_COLLECTION_INFO:Ljava/lang/String;,blocked
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_SURFACE_CONTROLLER:Ljava/lang/String;,blocked
 Landroid/provider/Column;->readOnly()Z,blocked
 Landroid/provider/Column;->value()I,blocked
+Landroid/provider/ExportedSince;->osVersion()I,blocked
+Landroid/provider/IAsyncContentProvider$Default;-><init>()V,blocked
+Landroid/provider/IAsyncContentProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/IAsyncContentProvider$Default;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V,blocked
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V,blocked
+Landroid/provider/IAsyncContentProvider$Stub;-><init>()V,blocked
+Landroid/provider/IAsyncContentProvider$Stub;->TRANSACTION_openMedia:I,blocked
+Landroid/provider/IAsyncContentProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/IAsyncContentProvider$Stub;->asInterface(Landroid/os/IBinder;)Landroid/provider/IAsyncContentProvider;,blocked
+Landroid/provider/IAsyncContentProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/provider/IAsyncContentProvider;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/provider/IAsyncContentProvider;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;-><init>()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController$Default;->onConfigChange(Landroid/os/Bundle;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onDestroy()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onMediaPause(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onMediaPlay(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onMediaSeekTo(IJ)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onPlayerCreate()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onPlayerRelease()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onSurfaceChanged(IIII)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Default;->onSurfaceDestroyed(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onConfigChange(Landroid/os/Bundle;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onDestroy()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onMediaPause(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onMediaPlay(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onMediaSeekTo(IJ)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onPlayerCreate()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onPlayerRelease()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onSurfaceChanged(IIII)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onSurfaceDestroyed(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;-><init>()V,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onConfigChange:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onDestroy:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onMediaPause:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onMediaPlay:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onMediaSeekTo:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onPlayerCreate:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onPlayerRelease:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onSurfaceChanged:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onSurfaceCreated:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onSurfaceDestroyed:I,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/provider/ICloudMediaSurfaceController;,blocked
+Landroid/provider/ICloudMediaSurfaceController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onConfigChange(Landroid/os/Bundle;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onDestroy()V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onMediaPause(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onMediaPlay(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onMediaSeekTo(IJ)V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onPlayerCreate()V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onPlayerRelease()V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onSurfaceChanged(IIII)V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V,blocked
+Landroid/provider/ICloudMediaSurfaceController;->onSurfaceDestroyed(I)V,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;-><init>()V,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->setPlaybackState(IILandroid/os/Bundle;)V,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->setPlaybackState(IILandroid/os/Bundle;)V,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;-><init>()V,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->TRANSACTION_setPlaybackState:I,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/provider/ICloudMediaSurfaceStateChangedCallback;,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback;->DESCRIPTOR:Ljava/lang/String;,blocked
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback;->setPlaybackState(IILandroid/os/Bundle;)V,blocked
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -150,6 +385,11 @@
 Landroid/provider/MediaStore$Files$FileColumns;->_MODIFIER_CR_PENDING_METADATA:I,blocked
 Landroid/provider/MediaStore$Files$FileColumns;->_MODIFIER_FUSE:I,blocked
 Landroid/provider/MediaStore$Files$FileColumns;->_MODIFIER_MEDIA_SCAN:I,blocked
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_ANIMATED_WEBP:I,blocked
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_GIF:I,blocked
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_MOTION_PHOTO:I,blocked
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_NONE:I,blocked
 Landroid/provider/MediaStore$Files$FileColumns;->_TRANSCODE_STATUS:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore$Files$FileColumns;->_USER_ID:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore$Files$FileColumns;->_VIDEO_CODEC_TYPE:Ljava/lang/String;,blocked
@@ -267,6 +507,13 @@
 Landroid/provider/MediaStore$MediaColumns;->WRITER:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$MediaColumns;->XMP:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$MediaColumns;->YEAR:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;-><init>()V,blocked
+Landroid/provider/MediaStore$PickerMediaColumns;->DATA:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->DATE_TAKEN:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->DISPLAY_NAME:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->SIZE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$ThumbnailConstants;-><clinit>()V,blocked
 Landroid/provider/MediaStore$ThumbnailConstants;-><init>()V,blocked
 Landroid/provider/MediaStore$ThumbnailConstants;->FULL_SCREEN_KIND:I,blocked
@@ -330,6 +577,8 @@
 Landroid/provider/MediaStore;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_IMAGE_CAPTURE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_IMAGE_CAPTURE_SECURE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->ACTION_PICK_IMAGES:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->ACTION_PICK_IMAGES_SETTINGS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_REVIEW:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_REVIEW_SECURE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_VIDEO_CAPTURE:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -339,12 +588,15 @@
 Landroid/provider/MediaStore;->AUTHORITY_URI:Landroid/net/Uri;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->CREATE_DELETE_REQUEST_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->CREATE_FAVORITE_REQUEST_CALL:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->CREATE_SURFACE_CONTROLLER:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->CREATE_TRASH_REQUEST_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->CREATE_WRITE_REQUEST_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->EXTERNAL_STORAGE_PROVIDER_AUTHORITY:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->EXTRA_ACCEPT_ORIGINAL_MEDIA_FORMAT:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_BRIGHTNESS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_CLIP_DATA:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->EXTRA_CLOUD_PROVIDER:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->EXTRA_CLOUD_PROVIDER_RESULT:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->EXTRA_CONTENT_VALUES:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->EXTRA_DURATION_LIMIT:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_FILE_DESCRIPTOR:Ljava/lang/String;,blocked
@@ -361,7 +613,9 @@
 Landroid/provider/MediaStore;->EXTRA_MEDIA_PLAYLIST:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_MEDIA_RADIO_CHANNEL:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_MEDIA_TITLE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->EXTRA_MODE:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->EXTRA_OUTPUT:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->EXTRA_PICK_IMAGES_MAX:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_RESULT:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->EXTRA_SCREEN_ORIENTATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_SHOW_ACTION_ICONS:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -385,6 +639,8 @@
 Landroid/provider/MediaStore;->INTENT_ACTION_TEXT_OPEN_FROM_SEARCH:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->INTENT_ACTION_VIDEO_CAMERA:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->IS_CURRENT_CLOUD_PROVIDER_CALL:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->IS_SUPPORTED_CLOUD_PROVIDER_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->IS_SYSTEM_GALLERY_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->MATCH_DEFAULT:I,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->MATCH_EXCLUDE:I,public-api,sdk,system-api,test-api
@@ -394,31 +650,47 @@
 Landroid/provider/MediaStore;->MEDIA_SCANNER_VOLUME:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->META_DATA_REVIEW_GALLERY_PREWARM_SERVICE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->MY_UID:I,blocked
+Landroid/provider/MediaStore;->MY_USER_ID:I,blocked
+Landroid/provider/MediaStore;->NOTIFY_CLOUD_MEDIA_CHANGED_EVENT_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->PARAM_DELETE_DATA:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/provider/MediaStore;->PARAM_INCLUDE_PENDING:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->PARAM_LIMIT:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->PARAM_PROGRESS:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->PARAM_REQUIRE_ORIGINAL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->PATTERN_VOLUME_NAME:Ljava/util/regex/Pattern;,blocked
+Landroid/provider/MediaStore;->PER_USER_RANGE:I,blocked
+Landroid/provider/MediaStore;->PICK_IMAGES_MAX_LIMIT:I,blocked
+Landroid/provider/MediaStore;->QUERY_ARG_ALBUM_AUTHORITY:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->QUERY_ARG_ALBUM_ID:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->QUERY_ARG_ALLOW_MOVEMENT:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->QUERY_ARG_DEFER_SCAN:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/provider/MediaStore;->QUERY_ARG_INCLUDE_RECENTLY_UNMOUNTED_VOLUMES:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->QUERY_ARG_LIMIT:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->QUERY_ARG_MATCH_FAVORITE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->QUERY_ARG_MATCH_PENDING:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->QUERY_ARG_MATCH_TRASHED:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->QUERY_ARG_MIME_TYPE:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->QUERY_ARG_REDACTED_URI:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->QUERY_ARG_RELATED_URI:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->QUERY_ARG_SIZE_BYTES:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->RESOLVE_PLAYLIST_MEMBERS_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->RUN_IDLE_MAINTENANCE_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->SCAN_FILE_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->SCAN_VOLUME_CALL:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->SET_CLOUD_PROVIDER_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->START_LEGACY_MIGRATION_CALL:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->SYNC_PROVIDERS_CALL:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->TAG:Ljava/lang/String;,lo-prio,max-target-o
 Landroid/provider/MediaStore;->UNKNOWN_STRING:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->USES_FUSE_PASSTHROUGH:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->USES_FUSE_PASSTHROUGH_RESULT:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->VOLUME_DEMO:Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->VOLUME_EXTERNAL:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->VOLUME_EXTERNAL_PRIMARY:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->VOLUME_INTERNAL:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->WAIT_FOR_IDLE_CALL:Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->callForCloudProvider(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;)Z,blocked
 Landroid/provider/MediaStore;->canManageMedia(Landroid/content/Context;)Z,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->checkArgumentVolumeName(Ljava/lang/String;)Ljava/lang/String;,blocked
 Landroid/provider/MediaStore;->createDeleteRequest(Landroid/content/ContentResolver;Ljava/util/Collection;)Landroid/app/PendingIntent;,public-api,sdk,system-api,test-api
@@ -435,15 +707,24 @@
 Landroid/provider/MediaStore;->getMediaScannerUri()Landroid/net/Uri;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getMediaUri(Landroid/content/Context;Landroid/net/Uri;)Landroid/net/Uri;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getOriginalMediaFormatFileDescriptor(Landroid/content/Context;Landroid/os/ParcelFileDescriptor;)Landroid/os/ParcelFileDescriptor;,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->getPickImagesMaxLimit()I,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getRecentExternalVolumeNames(Landroid/content/Context;)Ljava/util/Set;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getRedactedUri(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/net/Uri;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getRedactedUri(Landroid/content/ContentResolver;Ljava/util/List;)Ljava/util/List;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getRequireOriginal(Landroid/net/Uri;)Z,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->getUserIdFromUri(Landroid/net/Uri;)I,blocked
 Landroid/provider/MediaStore;->getVersion(Landroid/content/Context;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getVersion(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getVolumeName(Landroid/net/Uri;)Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->getVolumeName(Ljava/io/File;)Ljava/lang/String;,blocked
+Landroid/provider/MediaStore;->isCurrentCloudMediaProviderAuthority(Landroid/content/ContentResolver;Ljava/lang/String;)Z,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->isCurrentSystemGallery(Landroid/content/ContentResolver;ILjava/lang/String;)Z,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->isSupportedCloudMediaProviderAuthority(Landroid/content/ContentResolver;Ljava/lang/String;)Z,public-api,sdk,system-api,test-api
+Landroid/provider/MediaStore;->maybeAddUserId(Landroid/net/Uri;Ljava/lang/String;)Landroid/net/Uri;,blocked
+Landroid/provider/MediaStore;->maybeAddUserId(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;,blocked
+Landroid/provider/MediaStore;->maybeRemoveUserId(Landroid/net/Uri;)Landroid/net/Uri;,blocked
+Landroid/provider/MediaStore;->maybeRemoveUserId(Ljava/util/List;)Ljava/util/List;,blocked
+Landroid/provider/MediaStore;->notifyCloudMediaChangedEvent(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;)V,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->resolvePlaylistMembers(Landroid/content/ContentResolver;Landroid/net/Uri;)V,blocked
 Landroid/provider/MediaStore;->rewriteToLegacy(Landroid/net/Uri;)Landroid/net/Uri;,sdk,system-api,test-api
 Landroid/provider/MediaStore;->runIdleMaintenance(Landroid/content/ContentResolver;)V,blocked
@@ -453,4 +734,5 @@
 Landroid/provider/MediaStore;->setIncludePending(Landroid/net/Uri;)Landroid/net/Uri;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->setRequireOriginal(Landroid/net/Uri;)Landroid/net/Uri;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->startLegacyMigration(Landroid/content/ContentResolver;Ljava/lang/String;)V,blocked
+Landroid/provider/MediaStore;->verifyUrisBelongToSingleUserId(Ljava/util/List;)V,blocked
 Landroid/provider/MediaStore;->waitForIdle(Landroid/content/ContentResolver;)V,sdk,system-api,test-api

diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 28be2ec..6aa253e 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv

@@ -1,6 +1,6 @@
 signature,file,startline,startcol,endline,endcol,properties
-Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1766,13,1766,96,maxTargetSdk=30&trackingBug=170729553L
-Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1775,13,1775,33,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1728,9,1728,29,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1734,9,1734,29,
-Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1740,9,1740,29,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1953,13,1953,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1962,13,1962,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1915,9,1915,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1921,9,1921,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1927,9,1927,29,

diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index 6fb3bd6..9efce73 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv

@@ -1,5 +1,240 @@
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;-><init>(Landroid/provider/AsyncContentProvider;Ljava/util/concurrent/CompletableFuture;)V
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;->f$0:Landroid/provider/AsyncContentProvider;
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;->f$1:Ljava/util/concurrent/CompletableFuture;
+Landroid/provider/AsyncContentProvider$$ExternalSyntheticLambda0;->onResult(Landroid/os/Bundle;)V,system-api,test-api
+Landroid/provider/AsyncContentProvider;-><init>(Landroid/provider/IAsyncContentProvider;)V
+Landroid/provider/AsyncContentProvider;->TIMEOUT_IN_SECONDS:J
+Landroid/provider/AsyncContentProvider;->lambda$openMedia$0$android-provider-AsyncContentProvider(Ljava/util/concurrent/CompletableFuture;Landroid/os/Bundle;)V
+Landroid/provider/AsyncContentProvider;->mAsyncContentProvider:Landroid/provider/IAsyncContentProvider;
+Landroid/provider/AsyncContentProvider;->openMedia(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;
+Landroid/provider/AsyncContentProvider;->setResult(Landroid/os/Bundle;Ljava/util/concurrent/CompletableFuture;)V
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;-><init>(Landroid/provider/CloudMediaProvider;)V
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;-><init>(Landroid/provider/CloudMediaProvider;Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper-IA;)V
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;->sendResult(Landroid/os/ParcelFileDescriptor;Ljava/lang/Throwable;Landroid/os/RemoteCallback;)V
+Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;->this$0:Landroid/provider/CloudMediaProvider;
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;-><init>()V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onConfigChange(Landroid/os/Bundle;)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onDestroy()V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onMediaPause(I)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onMediaPlay(I)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onMediaSeekTo(IJ)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onPlayerCreate()V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onPlayerRelease()V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onSurfaceChanged(IIII)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;->onSurfaceDestroyed(I)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;-><init>(Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->mSurfaceController:Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onConfigChange(Landroid/os/Bundle;)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onDestroy()V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onMediaPause(I)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onMediaPlay(I)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onMediaSeekTo(IJ)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onPlayerCreate()V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onPlayerRelease()V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onSurfaceChanged(IIII)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceControllerWrapper;->onSurfaceDestroyed(I)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;-><init>(Landroid/provider/ICloudMediaSurfaceStateChangedCallback;)V
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_BUFFERING:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_COMPLETED:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_ERROR_PERMANENT_FAILURE:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_ERROR_RETRIABLE_FAILURE:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_MEDIA_SIZE_CHANGED:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_PAUSED:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_READY:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->PLAYBACK_STATE_STARTED:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->getIBinder()Landroid/os/IBinder;
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->mCallback:Landroid/provider/ICloudMediaSurfaceStateChangedCallback;
+Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;->setPlaybackState(IILandroid/os/Bundle;)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;-><init>()V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->DEFAULT_LOOPING_PLAYBACK_ENABLED:Z
+Landroid/provider/CloudMediaProvider;->DEFAULT_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED:Z
+Landroid/provider/CloudMediaProvider;->MATCH_ALBUMS:I
+Landroid/provider/CloudMediaProvider;->MATCH_DELETED_MEDIAS:I
+Landroid/provider/CloudMediaProvider;->MATCH_MEDIAS:I
+Landroid/provider/CloudMediaProvider;->MATCH_MEDIA_COLLECTION_INFO:I
+Landroid/provider/CloudMediaProvider;->MATCH_SURFACE_CONTROLLER:I
+Landroid/provider/CloudMediaProvider;->TAG:Ljava/lang/String;
+Landroid/provider/CloudMediaProvider;->attachInfo(Landroid/content/Context;Landroid/content/pm/ProviderInfo;)V,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->call(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->callUnchecked(Ljava/lang/String;Ljava/lang/String;Landroid/os/Bundle;)Landroid/os/Bundle;
+Landroid/provider/CloudMediaProvider;->canonicalize(Landroid/net/Uri;)Landroid/net/Uri;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->delete(Landroid/net/Uri;Ljava/lang/String;[Ljava/lang/String;)I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->getType(Landroid/net/Uri;)Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->insert(Landroid/net/Uri;Landroid/content/ContentValues;)Landroid/net/Uri;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->mAsyncContentProviderWrapper:Landroid/provider/CloudMediaProvider$AsyncContentProviderWrapper;
+Landroid/provider/CloudMediaProvider;->mMatcher:Landroid/content/UriMatcher;
+Landroid/provider/CloudMediaProvider;->mMediaStoreAuthorityAppId:I
+Landroid/provider/CloudMediaProvider;->onCreateCloudMediaSurfaceController(Landroid/os/Bundle;)Landroid/os/Bundle;
+Landroid/provider/CloudMediaProvider;->onCreateCloudMediaSurfaceController(Landroid/os/Bundle;Landroid/provider/CloudMediaProvider$CloudMediaSurfaceStateChangedCallback;)Landroid/provider/CloudMediaProvider$CloudMediaSurfaceController;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onGetAsyncContentProvider()Landroid/os/Bundle;
+Landroid/provider/CloudMediaProvider;->onGetMediaCollectionInfo(Landroid/os/Bundle;)Landroid/os/Bundle;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onOpenMedia(Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/os/ParcelFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onOpenPreview(Ljava/lang/String;Landroid/graphics/Point;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/content/res/AssetFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onQueryAlbums(Landroid/os/Bundle;)Landroid/database/Cursor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onQueryDeletedMedia(Landroid/os/Bundle;)Landroid/database/Cursor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->onQueryMedia(Landroid/os/Bundle;)Landroid/database/Cursor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openFile(Landroid/net/Uri;Ljava/lang/String;)Landroid/os/ParcelFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/CancellationSignal;)Landroid/os/ParcelFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openTypedAssetFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;)Landroid/content/res/AssetFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->openTypedAssetFile(Landroid/net/Uri;Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/content/res/AssetFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->query(Landroid/net/Uri;[Ljava/lang/String;Landroid/os/Bundle;Landroid/os/CancellationSignal;)Landroid/database/Cursor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;)Landroid/database/Cursor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->query(Landroid/net/Uri;[Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;Landroid/os/CancellationSignal;)Landroid/database/Cursor;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProvider;->registerAuthority(Ljava/lang/String;)V
+Landroid/provider/CloudMediaProvider;->update(Landroid/net/Uri;Landroid/content/ContentValues;Ljava/lang/String;[Ljava/lang/String;)I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;-><clinit>()V
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;-><init>()V
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_CAMERA:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_DOWNLOADS:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_FAVORITES:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_SCREENSHOTS:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALBUM_ID_VIDEOS:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ALL_PROJECTION:[Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->AUTHORITY:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->DATE_TAKEN_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->DISPLAY_NAME:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->ID:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->IS_LOCAL:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->MEDIA_COUNT:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$AlbumColumns;->MEDIA_COVER_ID:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;-><init>()V
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->ACCOUNT_CONFIGURATION_INTENT:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->ACCOUNT_NAME:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->LAST_MEDIA_SYNC_GENERATION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;-><clinit>()V
+Landroid/provider/CloudMediaProviderContract$MediaColumns;-><init>()V
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->ALL_PROJECTION:[Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->AUTHORITY:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->DATA:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->DATE_TAKEN_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->ID:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->IS_FAVORITE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->MEDIA_STORE_URI:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->SIZE_BYTES:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_GIF:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_EXTENSION_NONE:I,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract$MediaColumns;->SYNC_GENERATION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;-><init>()V
+Landroid/provider/CloudMediaProviderContract;->EXTRA_ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_ASYNC_CONTENT_PROVIDER:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_AUTHORITY:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_ERROR_MESSAGE:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_FILE_DESCRIPTOR:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_LOOPING_PLAYBACK_ENABLED:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIASTORE_THUMB:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_MIME_TYPE:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_PAGE_TOKEN:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_PREVIEW_THUMBNAIL:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SIZE_LIMIT_BYTES:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SURFACE_CONTROLLER:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SURFACE_STATE_CALLBACK:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->EXTRA_SYNC_GENERATION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->MANAGE_CLOUD_MEDIA_PROVIDERS_PERMISSION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->METHOD_CREATE_SURFACE_CONTROLLER:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->METHOD_GET_ASYNC_CONTENT_PROVIDER:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->METHOD_GET_MEDIA_COLLECTION_INFO:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->PROVIDER_INTERFACE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/CloudMediaProviderContract;->TAG:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_ALBUM:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_DELETED_MEDIA:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_MEDIA:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_MEDIA_COLLECTION_INFO:Ljava/lang/String;
+Landroid/provider/CloudMediaProviderContract;->URI_PATH_SURFACE_CONTROLLER:Ljava/lang/String;
 Landroid/provider/Column;->readOnly()Z
 Landroid/provider/Column;->value()I
+Landroid/provider/ExportedSince;->osVersion()I
+Landroid/provider/IAsyncContentProvider$Default;-><init>()V
+Landroid/provider/IAsyncContentProvider$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/IAsyncContentProvider$Default;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/provider/IAsyncContentProvider$Stub$Proxy;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V
+Landroid/provider/IAsyncContentProvider$Stub;-><init>()V
+Landroid/provider/IAsyncContentProvider$Stub;->TRANSACTION_openMedia:I
+Landroid/provider/IAsyncContentProvider$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/IAsyncContentProvider$Stub;->asInterface(Landroid/os/IBinder;)Landroid/provider/IAsyncContentProvider;
+Landroid/provider/IAsyncContentProvider$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/provider/IAsyncContentProvider;->DESCRIPTOR:Ljava/lang/String;
+Landroid/provider/IAsyncContentProvider;->openMedia(Ljava/lang/String;Landroid/os/RemoteCallback;)V
+Landroid/provider/ICloudMediaSurfaceController$Default;-><init>()V
+Landroid/provider/ICloudMediaSurfaceController$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController$Default;->onConfigChange(Landroid/os/Bundle;)V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onDestroy()V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onMediaPause(I)V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onMediaPlay(I)V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onMediaSeekTo(IJ)V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onPlayerCreate()V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onPlayerRelease()V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onSurfaceChanged(IIII)V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V
+Landroid/provider/ICloudMediaSurfaceController$Default;->onSurfaceDestroyed(I)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onConfigChange(Landroid/os/Bundle;)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onDestroy()V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onMediaPause(I)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onMediaPlay(I)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onMediaSeekTo(IJ)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onPlayerCreate()V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onPlayerRelease()V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onSurfaceChanged(IIII)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V
+Landroid/provider/ICloudMediaSurfaceController$Stub$Proxy;->onSurfaceDestroyed(I)V
+Landroid/provider/ICloudMediaSurfaceController$Stub;-><init>()V
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onConfigChange:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onDestroy:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onMediaPause:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onMediaPlay:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onMediaSeekTo:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onPlayerCreate:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onPlayerRelease:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onSurfaceChanged:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onSurfaceCreated:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->TRANSACTION_onSurfaceDestroyed:I
+Landroid/provider/ICloudMediaSurfaceController$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController$Stub;->asInterface(Landroid/os/IBinder;)Landroid/provider/ICloudMediaSurfaceController;
+Landroid/provider/ICloudMediaSurfaceController$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceController;->DESCRIPTOR:Ljava/lang/String;
+Landroid/provider/ICloudMediaSurfaceController;->onConfigChange(Landroid/os/Bundle;)V
+Landroid/provider/ICloudMediaSurfaceController;->onDestroy()V
+Landroid/provider/ICloudMediaSurfaceController;->onMediaPause(I)V
+Landroid/provider/ICloudMediaSurfaceController;->onMediaPlay(I)V
+Landroid/provider/ICloudMediaSurfaceController;->onMediaSeekTo(IJ)V
+Landroid/provider/ICloudMediaSurfaceController;->onPlayerCreate()V
+Landroid/provider/ICloudMediaSurfaceController;->onPlayerRelease()V
+Landroid/provider/ICloudMediaSurfaceController;->onSurfaceChanged(IIII)V
+Landroid/provider/ICloudMediaSurfaceController;->onSurfaceCreated(ILandroid/view/Surface;Ljava/lang/String;)V
+Landroid/provider/ICloudMediaSurfaceController;->onSurfaceDestroyed(I)V
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;-><init>()V
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Default;->setPlaybackState(IILandroid/os/Bundle;)V
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub$Proxy;->setPlaybackState(IILandroid/os/Bundle;)V
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;-><init>()V
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->TRANSACTION_setPlaybackState:I
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/provider/ICloudMediaSurfaceStateChangedCallback;
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback;->DESCRIPTOR:Ljava/lang/String;
+Landroid/provider/ICloudMediaSurfaceStateChangedCallback;->setPlaybackState(IILandroid/os/Bundle;)V
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api
@@ -150,6 +385,11 @@
 Landroid/provider/MediaStore$Files$FileColumns;->_MODIFIER_CR_PENDING_METADATA:I
 Landroid/provider/MediaStore$Files$FileColumns;->_MODIFIER_FUSE:I
 Landroid/provider/MediaStore$Files$FileColumns;->_MODIFIER_MEDIA_SCAN:I
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT:Ljava/lang/String;
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_ANIMATED_WEBP:I
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_GIF:I
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_MOTION_PHOTO:I
+Landroid/provider/MediaStore$Files$FileColumns;->_SPECIAL_FORMAT_NONE:I
 Landroid/provider/MediaStore$Files$FileColumns;->_TRANSCODE_STATUS:Ljava/lang/String;
 Landroid/provider/MediaStore$Files$FileColumns;->_USER_ID:Ljava/lang/String;
 Landroid/provider/MediaStore$Files$FileColumns;->_VIDEO_CODEC_TYPE:Ljava/lang/String;
@@ -267,6 +507,13 @@
 Landroid/provider/MediaStore$MediaColumns;->WRITER:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$MediaColumns;->XMP:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$MediaColumns;->YEAR:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;-><init>()V
+Landroid/provider/MediaStore$PickerMediaColumns;->DATA:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->DATE_TAKEN:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->DISPLAY_NAME:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->DURATION_MILLIS:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->MIME_TYPE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore$PickerMediaColumns;->SIZE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$ThumbnailConstants;-><clinit>()V
 Landroid/provider/MediaStore$ThumbnailConstants;-><init>()V
 Landroid/provider/MediaStore$ThumbnailConstants;->FULL_SCREEN_KIND:I
@@ -330,6 +577,8 @@
 Landroid/provider/MediaStore;-><init>()V,public-api,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_IMAGE_CAPTURE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_IMAGE_CAPTURE_SECURE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->ACTION_PICK_IMAGES:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->ACTION_PICK_IMAGES_SETTINGS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_REVIEW:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_REVIEW_SECURE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_VIDEO_CAPTURE:Ljava/lang/String;,public-api,system-api,test-api
@@ -339,12 +588,15 @@
 Landroid/provider/MediaStore;->AUTHORITY_URI:Landroid/net/Uri;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->CREATE_DELETE_REQUEST_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->CREATE_FAVORITE_REQUEST_CALL:Ljava/lang/String;
+Landroid/provider/MediaStore;->CREATE_SURFACE_CONTROLLER:Ljava/lang/String;
 Landroid/provider/MediaStore;->CREATE_TRASH_REQUEST_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->CREATE_WRITE_REQUEST_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->EXTERNAL_STORAGE_PROVIDER_AUTHORITY:Ljava/lang/String;
 Landroid/provider/MediaStore;->EXTRA_ACCEPT_ORIGINAL_MEDIA_FORMAT:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_BRIGHTNESS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_CLIP_DATA:Ljava/lang/String;
+Landroid/provider/MediaStore;->EXTRA_CLOUD_PROVIDER:Ljava/lang/String;
+Landroid/provider/MediaStore;->EXTRA_CLOUD_PROVIDER_RESULT:Ljava/lang/String;
 Landroid/provider/MediaStore;->EXTRA_CONTENT_VALUES:Ljava/lang/String;
 Landroid/provider/MediaStore;->EXTRA_DURATION_LIMIT:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_FILE_DESCRIPTOR:Ljava/lang/String;
@@ -361,7 +613,9 @@
 Landroid/provider/MediaStore;->EXTRA_MEDIA_PLAYLIST:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_MEDIA_RADIO_CHANNEL:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_MEDIA_TITLE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->EXTRA_MODE:Ljava/lang/String;
 Landroid/provider/MediaStore;->EXTRA_OUTPUT:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->EXTRA_PICK_IMAGES_MAX:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_RESULT:Ljava/lang/String;
 Landroid/provider/MediaStore;->EXTRA_SCREEN_ORIENTATION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->EXTRA_SHOW_ACTION_ICONS:Ljava/lang/String;,public-api,system-api,test-api
@@ -385,6 +639,8 @@
 Landroid/provider/MediaStore;->INTENT_ACTION_TEXT_OPEN_FROM_SEARCH:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->INTENT_ACTION_VIDEO_CAMERA:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->IS_CURRENT_CLOUD_PROVIDER_CALL:Ljava/lang/String;
+Landroid/provider/MediaStore;->IS_SUPPORTED_CLOUD_PROVIDER_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->IS_SYSTEM_GALLERY_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->MATCH_DEFAULT:I,public-api,system-api,test-api
 Landroid/provider/MediaStore;->MATCH_EXCLUDE:I,public-api,system-api,test-api
@@ -394,31 +650,47 @@
 Landroid/provider/MediaStore;->MEDIA_SCANNER_VOLUME:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->META_DATA_REVIEW_GALLERY_PREWARM_SERVICE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->MY_UID:I
+Landroid/provider/MediaStore;->MY_USER_ID:I
+Landroid/provider/MediaStore;->NOTIFY_CLOUD_MEDIA_CHANGED_EVENT_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->PARAM_DELETE_DATA:Ljava/lang/String;
 Landroid/provider/MediaStore;->PARAM_INCLUDE_PENDING:Ljava/lang/String;
 Landroid/provider/MediaStore;->PARAM_LIMIT:Ljava/lang/String;
 Landroid/provider/MediaStore;->PARAM_PROGRESS:Ljava/lang/String;
 Landroid/provider/MediaStore;->PARAM_REQUIRE_ORIGINAL:Ljava/lang/String;
 Landroid/provider/MediaStore;->PATTERN_VOLUME_NAME:Ljava/util/regex/Pattern;
+Landroid/provider/MediaStore;->PER_USER_RANGE:I
+Landroid/provider/MediaStore;->PICK_IMAGES_MAX_LIMIT:I
+Landroid/provider/MediaStore;->QUERY_ARG_ALBUM_AUTHORITY:Ljava/lang/String;
+Landroid/provider/MediaStore;->QUERY_ARG_ALBUM_ID:Ljava/lang/String;
 Landroid/provider/MediaStore;->QUERY_ARG_ALLOW_MOVEMENT:Ljava/lang/String;
 Landroid/provider/MediaStore;->QUERY_ARG_DEFER_SCAN:Ljava/lang/String;,system-api,test-api
 Landroid/provider/MediaStore;->QUERY_ARG_INCLUDE_RECENTLY_UNMOUNTED_VOLUMES:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->QUERY_ARG_LIMIT:Ljava/lang/String;
 Landroid/provider/MediaStore;->QUERY_ARG_MATCH_FAVORITE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->QUERY_ARG_MATCH_PENDING:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->QUERY_ARG_MATCH_TRASHED:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->QUERY_ARG_MIME_TYPE:Ljava/lang/String;
+Landroid/provider/MediaStore;->QUERY_ARG_REDACTED_URI:Ljava/lang/String;
 Landroid/provider/MediaStore;->QUERY_ARG_RELATED_URI:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->QUERY_ARG_SIZE_BYTES:Ljava/lang/String;
 Landroid/provider/MediaStore;->RESOLVE_PLAYLIST_MEMBERS_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->RUN_IDLE_MAINTENANCE_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->SCAN_FILE_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->SCAN_VOLUME_CALL:Ljava/lang/String;
+Landroid/provider/MediaStore;->SET_CLOUD_PROVIDER_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->START_LEGACY_MIGRATION_CALL:Ljava/lang/String;
+Landroid/provider/MediaStore;->SYNC_PROVIDERS_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->TAG:Ljava/lang/String;
 Landroid/provider/MediaStore;->UNKNOWN_STRING:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->USES_FUSE_PASSTHROUGH:Ljava/lang/String;
+Landroid/provider/MediaStore;->USES_FUSE_PASSTHROUGH_RESULT:Ljava/lang/String;
 Landroid/provider/MediaStore;->VOLUME_DEMO:Ljava/lang/String;
 Landroid/provider/MediaStore;->VOLUME_EXTERNAL:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->VOLUME_EXTERNAL_PRIMARY:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->VOLUME_INTERNAL:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->WAIT_FOR_IDLE_CALL:Ljava/lang/String;
+Landroid/provider/MediaStore;->callForCloudProvider(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;)Z
 Landroid/provider/MediaStore;->canManageMedia(Landroid/content/Context;)Z,public-api,system-api,test-api
 Landroid/provider/MediaStore;->checkArgumentVolumeName(Ljava/lang/String;)Ljava/lang/String;
 Landroid/provider/MediaStore;->createDeleteRequest(Landroid/content/ContentResolver;Ljava/util/Collection;)Landroid/app/PendingIntent;,public-api,system-api,test-api
@@ -435,15 +707,24 @@
 Landroid/provider/MediaStore;->getMediaScannerUri()Landroid/net/Uri;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getMediaUri(Landroid/content/Context;Landroid/net/Uri;)Landroid/net/Uri;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getOriginalMediaFormatFileDescriptor(Landroid/content/Context;Landroid/os/ParcelFileDescriptor;)Landroid/os/ParcelFileDescriptor;,public-api,system-api,test-api
+Landroid/provider/MediaStore;->getPickImagesMaxLimit()I,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getRecentExternalVolumeNames(Landroid/content/Context;)Ljava/util/Set;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getRedactedUri(Landroid/content/ContentResolver;Landroid/net/Uri;)Landroid/net/Uri;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getRedactedUri(Landroid/content/ContentResolver;Ljava/util/List;)Ljava/util/List;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getRequireOriginal(Landroid/net/Uri;)Z,public-api,system-api,test-api
+Landroid/provider/MediaStore;->getUserIdFromUri(Landroid/net/Uri;)I
 Landroid/provider/MediaStore;->getVersion(Landroid/content/Context;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getVersion(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getVolumeName(Landroid/net/Uri;)Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->getVolumeName(Ljava/io/File;)Ljava/lang/String;
+Landroid/provider/MediaStore;->isCurrentCloudMediaProviderAuthority(Landroid/content/ContentResolver;Ljava/lang/String;)Z,public-api,system-api,test-api
 Landroid/provider/MediaStore;->isCurrentSystemGallery(Landroid/content/ContentResolver;ILjava/lang/String;)Z,public-api,system-api,test-api
+Landroid/provider/MediaStore;->isSupportedCloudMediaProviderAuthority(Landroid/content/ContentResolver;Ljava/lang/String;)Z,public-api,system-api,test-api
+Landroid/provider/MediaStore;->maybeAddUserId(Landroid/net/Uri;Ljava/lang/String;)Landroid/net/Uri;
+Landroid/provider/MediaStore;->maybeAddUserId(Ljava/util/List;Ljava/lang/String;)Ljava/util/List;
+Landroid/provider/MediaStore;->maybeRemoveUserId(Landroid/net/Uri;)Landroid/net/Uri;
+Landroid/provider/MediaStore;->maybeRemoveUserId(Ljava/util/List;)Ljava/util/List;
+Landroid/provider/MediaStore;->notifyCloudMediaChangedEvent(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;)V,public-api,system-api,test-api
 Landroid/provider/MediaStore;->resolvePlaylistMembers(Landroid/content/ContentResolver;Landroid/net/Uri;)V
 Landroid/provider/MediaStore;->rewriteToLegacy(Landroid/net/Uri;)Landroid/net/Uri;,system-api,test-api
 Landroid/provider/MediaStore;->runIdleMaintenance(Landroid/content/ContentResolver;)V
@@ -453,4 +734,5 @@
 Landroid/provider/MediaStore;->setIncludePending(Landroid/net/Uri;)Landroid/net/Uri;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->setRequireOriginal(Landroid/net/Uri;)Landroid/net/Uri;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->startLegacyMigration(Landroid/content/ContentResolver;Ljava/lang/String;)V
+Landroid/provider/MediaStore;->verifyUrisBelongToSingleUserId(Ljava/util/List;)V
 Landroid/provider/MediaStore;->waitForIdle(Landroid/content/ContentResolver;)V,system-api,test-api

diff --git a/current/licenses/build/soong/licenses/LICENSE b/current/licenses/build/soong/licenses/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/current/licenses/build/soong/licenses/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

diff --git a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
index dabd7af..b1c39c3 100644
--- a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
Binary files differ

diff --git a/current/sdk_library/module-lib/framework-mediaprovider.srcjar b/current/sdk_library/module-lib/framework-mediaprovider.srcjar
index 37f7315..54f913e 100644
--- a/current/sdk_library/module-lib/framework-mediaprovider.srcjar
+++ b/current/sdk_library/module-lib/framework-mediaprovider.srcjar
Binary files differ

diff --git a/current/sdk_library/public/framework-mediaprovider-stubs.jar b/current/sdk_library/public/framework-mediaprovider-stubs.jar
index d26c767..35a1359 100644
--- a/current/sdk_library/public/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/public/framework-mediaprovider-stubs.jar
Binary files differ

diff --git a/current/sdk_library/public/framework-mediaprovider.srcjar b/current/sdk_library/public/framework-mediaprovider.srcjar
index 949df78..9c9068e 100644
--- a/current/sdk_library/public/framework-mediaprovider.srcjar
+++ b/current/sdk_library/public/framework-mediaprovider.srcjar
Binary files differ

diff --git a/current/sdk_library/public/framework-mediaprovider.txt b/current/sdk_library/public/framework-mediaprovider.txt
index 2e6312c..8e1691a 100644
--- a/current/sdk_library/public/framework-mediaprovider.txt
+++ b/current/sdk_library/public/framework-mediaprovider.txt

@@ -1,6 +1,100 @@
 // Signature format: 2.0
 package android.provider {
 
+  public abstract class CloudMediaProvider extends android.content.ContentProvider {
+    ctor public CloudMediaProvider();
+    method public final void attachInfo(@NonNull android.content.Context, @NonNull android.content.pm.ProviderInfo);
+    method @NonNull public final android.os.Bundle call(@NonNull String, @Nullable String, @Nullable android.os.Bundle);
+    method @NonNull public final android.net.Uri canonicalize(@NonNull android.net.Uri);
+    method public final int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]);
+    method @NonNull public final String getType(@NonNull android.net.Uri);
+    method @NonNull public final android.net.Uri insert(@NonNull android.net.Uri, @NonNull android.content.ContentValues);
+    method @Nullable public android.provider.CloudMediaProvider.CloudMediaSurfaceController onCreateCloudMediaSurfaceController(@NonNull android.os.Bundle, @NonNull android.provider.CloudMediaProvider.CloudMediaSurfaceStateChangedCallback);
+    method @NonNull public abstract android.os.Bundle onGetMediaCollectionInfo(@NonNull android.os.Bundle);
+    method @NonNull public abstract android.os.ParcelFileDescriptor onOpenMedia(@NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
+    method @NonNull public abstract android.content.res.AssetFileDescriptor onOpenPreview(@NonNull String, @NonNull android.graphics.Point, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
+    method @NonNull public android.database.Cursor onQueryAlbums(@NonNull android.os.Bundle);
+    method @NonNull public abstract android.database.Cursor onQueryDeletedMedia(@NonNull android.os.Bundle);
+    method @NonNull public abstract android.database.Cursor onQueryMedia(@NonNull android.os.Bundle);
+    method @NonNull public final android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException;
+    method @NonNull public final android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
+    method @NonNull public final android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle) throws java.io.FileNotFoundException;
+    method @NonNull public final android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException;
+    method @NonNull public final android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal);
+    method @NonNull public final android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String);
+    method @NonNull public final android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable android.os.CancellationSignal);
+    method public final int update(@NonNull android.net.Uri, @NonNull android.content.ContentValues, @Nullable String, @Nullable String[]);
+  }
+
+  public abstract static class CloudMediaProvider.CloudMediaSurfaceController {
+    ctor public CloudMediaProvider.CloudMediaSurfaceController();
+    method public abstract void onConfigChange(@NonNull android.os.Bundle);
+    method public abstract void onDestroy();
+    method public abstract void onMediaPause(int);
+    method public abstract void onMediaPlay(int);
+    method public abstract void onMediaSeekTo(int, long);
+    method public abstract void onPlayerCreate();
+    method public abstract void onPlayerRelease();
+    method public abstract void onSurfaceChanged(int, int, int, int);
+    method public abstract void onSurfaceCreated(int, @NonNull android.view.Surface, @NonNull String);
+    method public abstract void onSurfaceDestroyed(int);
+  }
+
+  public static final class CloudMediaProvider.CloudMediaSurfaceStateChangedCallback {
+    method public void setPlaybackState(int, int, @Nullable android.os.Bundle);
+    field public static final int PLAYBACK_STATE_BUFFERING = 1; // 0x1
+    field public static final int PLAYBACK_STATE_COMPLETED = 5; // 0x5
+    field public static final int PLAYBACK_STATE_ERROR_PERMANENT_FAILURE = 7; // 0x7
+    field public static final int PLAYBACK_STATE_ERROR_RETRIABLE_FAILURE = 6; // 0x6
+    field public static final int PLAYBACK_STATE_MEDIA_SIZE_CHANGED = 8; // 0x8
+    field public static final int PLAYBACK_STATE_PAUSED = 4; // 0x4
+    field public static final int PLAYBACK_STATE_READY = 2; // 0x2
+    field public static final int PLAYBACK_STATE_STARTED = 3; // 0x3
+  }
+
+  public final class CloudMediaProviderContract {
+    field public static final String EXTRA_ALBUM_ID = "android.provider.extra.ALBUM_ID";
+    field public static final String EXTRA_LOOPING_PLAYBACK_ENABLED = "android.provider.extra.LOOPING_PLAYBACK_ENABLED";
+    field public static final String EXTRA_MEDIA_COLLECTION_ID = "android.provider.extra.MEDIA_COLLECTION_ID";
+    field public static final String EXTRA_PAGE_TOKEN = "android.provider.extra.PAGE_TOKEN";
+    field public static final String EXTRA_PREVIEW_THUMBNAIL = "android.provider.extra.PREVIEW_THUMBNAIL";
+    field public static final String EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED = "android.provider.extra.SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED";
+    field public static final String EXTRA_SYNC_GENERATION = "android.provider.extra.SYNC_GENERATION";
+    field public static final String MANAGE_CLOUD_MEDIA_PROVIDERS_PERMISSION = "com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS";
+    field public static final String PROVIDER_INTERFACE = "android.content.action.CLOUD_MEDIA_PROVIDER";
+  }
+
+  public static final class CloudMediaProviderContract.AlbumColumns {
+    field public static final String DATE_TAKEN_MILLIS = "date_taken_millis";
+    field public static final String DISPLAY_NAME = "display_name";
+    field public static final String ID = "id";
+    field public static final String MEDIA_COUNT = "album_media_count";
+    field public static final String MEDIA_COVER_ID = "album_media_cover_id";
+  }
+
+  public static final class CloudMediaProviderContract.MediaCollectionInfo {
+    field public static final String ACCOUNT_CONFIGURATION_INTENT = "account_configuration_intent";
+    field public static final String ACCOUNT_NAME = "account_name";
+    field public static final String LAST_MEDIA_SYNC_GENERATION = "last_media_sync_generation";
+    field public static final String MEDIA_COLLECTION_ID = "media_collection_id";
+  }
+
+  public static final class CloudMediaProviderContract.MediaColumns {
+    field public static final String DATE_TAKEN_MILLIS = "date_taken_millis";
+    field public static final String DURATION_MILLIS = "duration_millis";
+    field public static final String ID = "id";
+    field public static final String IS_FAVORITE = "is_favorite";
+    field public static final String MEDIA_STORE_URI = "media_store_uri";
+    field public static final String MIME_TYPE = "mime_type";
+    field public static final String SIZE_BYTES = "size_bytes";
+    field public static final String STANDARD_MIME_TYPE_EXTENSION = "standard_mime_type_extension";
+    field public static final int STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP = 3; // 0x3
+    field public static final int STANDARD_MIME_TYPE_EXTENSION_GIF = 1; // 0x1
+    field public static final int STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO = 2; // 0x2
+    field public static final int STANDARD_MIME_TYPE_EXTENSION_NONE = 0; // 0x0
+    field public static final String SYNC_GENERATION = "sync_generation";
+  }
+
   public final class MediaStore {
     ctor public MediaStore();
     method public static boolean canManageMedia(@NonNull android.content.Context);
@@ -14,6 +108,7 @@
     method public static android.net.Uri getMediaScannerUri();
     method @Nullable public static android.net.Uri getMediaUri(@NonNull android.content.Context, @NonNull android.net.Uri);
     method @NonNull public static android.os.ParcelFileDescriptor getOriginalMediaFormatFileDescriptor(@NonNull android.content.Context, @NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;
+    method public static int getPickImagesMaxLimit();
     method @NonNull public static java.util.Set<java.lang.String> getRecentExternalVolumeNames(@NonNull android.content.Context);
     method @Nullable public static android.net.Uri getRedactedUri(@NonNull android.content.ContentResolver, @NonNull android.net.Uri);
     method @NonNull public static java.util.List<android.net.Uri> getRedactedUri(@NonNull android.content.ContentResolver, @NonNull java.util.List<android.net.Uri>);
@@ -21,11 +116,16 @@
     method @NonNull public static String getVersion(@NonNull android.content.Context);
     method @NonNull public static String getVersion(@NonNull android.content.Context, @NonNull String);
     method @NonNull public static String getVolumeName(@NonNull android.net.Uri);
+    method public static boolean isCurrentCloudMediaProviderAuthority(@NonNull android.content.ContentResolver, @NonNull String);
     method public static boolean isCurrentSystemGallery(@NonNull android.content.ContentResolver, int, @NonNull String);
+    method public static boolean isSupportedCloudMediaProviderAuthority(@NonNull android.content.ContentResolver, @NonNull String);
+    method public static void notifyCloudMediaChangedEvent(@NonNull android.content.ContentResolver, @NonNull String, @NonNull String) throws java.lang.SecurityException;
     method @Deprecated @NonNull public static android.net.Uri setIncludePending(@NonNull android.net.Uri);
     method @NonNull public static android.net.Uri setRequireOriginal(@NonNull android.net.Uri);
     field public static final String ACTION_IMAGE_CAPTURE = "android.media.action.IMAGE_CAPTURE";
     field public static final String ACTION_IMAGE_CAPTURE_SECURE = "android.media.action.IMAGE_CAPTURE_SECURE";
+    field public static final String ACTION_PICK_IMAGES = "android.provider.action.PICK_IMAGES";
+    field public static final String ACTION_PICK_IMAGES_SETTINGS = "android.provider.action.PICK_IMAGES_SETTINGS";
     field public static final String ACTION_REVIEW = "android.provider.action.REVIEW";
     field public static final String ACTION_REVIEW_SECURE = "android.provider.action.REVIEW_SECURE";
     field public static final String ACTION_VIDEO_CAPTURE = "android.media.action.VIDEO_CAPTURE";
@@ -46,6 +146,7 @@
     field public static final String EXTRA_MEDIA_RADIO_CHANNEL = "android.intent.extra.radio_channel";
     field public static final String EXTRA_MEDIA_TITLE = "android.intent.extra.title";
     field public static final String EXTRA_OUTPUT = "output";
+    field public static final String EXTRA_PICK_IMAGES_MAX = "android.provider.extra.PICK_IMAGES_MAX";
     field public static final String EXTRA_SCREEN_ORIENTATION = "android.intent.extra.screenOrientation";
     field public static final String EXTRA_SHOW_ACTION_ICONS = "android.intent.extra.showActionIcons";
     field public static final String EXTRA_SIZE_LIMIT = "android.intent.extra.sizeLimit";
@@ -323,7 +424,7 @@
     field public static final String CD_TRACK_NUMBER = "cd_track_number";
     field public static final String COMPILATION = "compilation";
     field public static final String COMPOSER = "composer";
-    field @Deprecated public static final String DATA = "_data";
+    field public static final String DATA = "_data";
     field public static final String DATE_ADDED = "date_added";
     field public static final String DATE_EXPIRES = "date_expires";
     field public static final String DATE_MODIFIED = "date_modified";
@@ -358,6 +459,15 @@
     field public static final String YEAR = "year";
   }
 
+  public static class MediaStore.PickerMediaColumns {
+    field public static final String DATA = "_data";
+    field public static final String DATE_TAKEN = "datetaken";
+    field public static final String DISPLAY_NAME = "_display_name";
+    field public static final String DURATION_MILLIS = "duration";
+    field public static final String MIME_TYPE = "mime_type";
+    field public static final String SIZE = "_size";
+  }
+
   public static final class MediaStore.Video {
     ctor public MediaStore.Video();
     method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);

diff --git a/current/sdk_library/system/framework-mediaprovider-stubs.jar b/current/sdk_library/system/framework-mediaprovider-stubs.jar
index dabd7af..b1c39c3 100644
--- a/current/sdk_library/system/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/system/framework-mediaprovider-stubs.jar
Binary files differ

diff --git a/current/sdk_library/system/framework-mediaprovider.srcjar b/current/sdk_library/system/framework-mediaprovider.srcjar
index 37f7315..54f913e 100644
--- a/current/sdk_library/system/framework-mediaprovider.srcjar
+++ b/current/sdk_library/system/framework-mediaprovider.srcjar
Binary files differ

diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
new file mode 100644
index 0000000..34055cd
--- /dev/null
+++ b/current/snapshot-creation-build-number.txt

@@ -0,0 +1 @@
+8817912
\ No newline at end of file
commit	5f5fb605c5876bbcb46fdaf0f80d93d68a64b1d1	[log] [tgz]
author	android-t1 <xiaocong.gu@t2mobile.com>	Wed Oct 12 13:51:37 2022 +0800
committer	android-t1 <xiaocong.gu@t2mobile.com>	Wed Oct 12 13:51:37 2022 +0800
tree	8c0f01f6721e178e06c83e76f4031cc2a3f49baa
parent	a52491830a15ab0f6a0a70817c77947cb7bc4b46 [diff]