DO NOT MERGE: Drop prebuilt files to android source tree.

The following files have been updated as part of this change:

current/Android.bp
current/snapshot-creation-build-number.txt
current/licenses/build/soong/licenses/LICENSE
current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
current/sdk_library/module-lib/framework-mediaprovider-removed.txt
current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
current/sdk_library/module-lib/framework-mediaprovider.srcjar
current/sdk_library/module-lib/framework-mediaprovider.txt
current/sdk_library/module-lib/framework-mediaprovider_annotations.zip
current/sdk_library/public/framework-mediaprovider-removed.txt
current/sdk_library/public/framework-mediaprovider-stubs.jar
current/sdk_library/public/framework-mediaprovider.srcjar
current/sdk_library/public/framework-mediaprovider.txt
current/sdk_library/public/framework-mediaprovider_annotations.zip
current/sdk_library/system/framework-mediaprovider-removed.txt
current/sdk_library/system/framework-mediaprovider-stubs.jar
current/sdk_library/system/framework-mediaprovider.srcjar
current/sdk_library/system/framework-mediaprovider.txt
current/sdk_library/system/framework-mediaprovider_annotations.zip
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv

Built here: ab/T1007089

This build IS suitable for public release.

The change is generated with prebuilt drop tool.

Test: presubmit
Bug: 285888783
Change-Id: I45fe577163b6f80aeba04c6f3975bfb7797170da

15 files changed, 43 insertions, 16 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 540961e..d2dd2de 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,14 +1,14 @@
 drops {
   android_build_drop {
-    build_id: "T1005166"
+    build_id: "T1007089"
     target: "train_build"
-    source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
+    source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/MediaProvider"
-  git_branch: "tm-qpr-dev"
+  git_branch: "udc-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
   }
diff --git a/current/Android.bp b/current/Android.bp
index b15cc1b..b457e21 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,5 +1,11 @@
 // This is auto-generated. DO NOT EDIT.
 
+// blueprint rules added by vendor/google/build/mainline_modules_sdks.py
+// to support coexistence.
+blueprint_package_includes {
+    match_all: ["com.android.mainline"]
+}
+
 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.
diff --git a/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml b/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
index fac2f6d..3c3f94e 100644
--- a/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
+++ b/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='utf-8'?>
 <config>
   <compat-change description="Allow apps holding {@link android.Manifest.permission#MANAGE_EXTERNAL_STORAGE} permission to request raw external storage access." enableAfterTargetSdk="30" id="178209446" name="ENABLE_RAW_MANAGE_EXTERNAL_STORAGE_ACCESS">
-    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:399" />
+    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:457" />
   </compat-change>
   <compat-change description="Allow apps holding {@link android.app.role}#SYSTEM_GALLERY role to request raw external storage access." enableSinceTargetSdk="30" id="183372781" name="ENABLE_RAW_SYSTEM_GALLERY_ACCESS">
-    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:407" />
+    <meta-data definedIn="com.android.providers.media.LocalCallingIdentity" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/LocalCallingIdentity.java:465" />
   </compat-change>
   <compat-change description="Enables checks to stop apps from inserting and updating to private files via media provider." enableAfterTargetSdk="30" id="172100307" name="ENABLE_CHECKS_FOR_PRIVATE_FILES">
-    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:304" />
+    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:360" />
   </compat-change>
   <compat-change description="Enable option to defer the scan triggered as part of MediaProvider#update()" enableAfterTargetSdk="30" id="180326732" name="ENABLE_DEFERRED_SCAN">
-    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:399" />
+    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:459" />
   </compat-change>
   <compat-change description="Enable option to include database rows of files from recently unmounted volume in MediaProvider#query" enableAfterTargetSdk="30" id="182734110" name="ENABLE_INCLUDE_ALL_VOLUMES">
-    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:407" />
+    <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:467" />
   </compat-change>
   <compat-change description="Force enable an app to support the HEVC media capability Apps should declare their supported media capabilities in their manifest but this flag can be used to force an app into supporting HEVC, hence avoiding transcoding while accessing media encoded in HEVC. Setting this flag will override any OS level defaults for apps. It is disabled by default, meaning that the OS defaults would take precedence. Setting this flag and {@code FORCE_DISABLE_HEVC_SUPPORT} is an undefined state and will result in the OS ignoring both flags." disabled="true" id="174228127" name="FORCE_ENABLE_HEVC_SUPPORT">
-    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:166" />
+    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:160" />
   </compat-change>
   <compat-change description="Force disable an app from supporting the HEVC media capability Apps should declare their supported media capabilities in their manifest but this flag can be used to force an app into not supporting HEVC, hence forcing transcoding while accessing media encoded in HEVC. Setting this flag will override any OS level defaults for apps. It is disabled by default, meaning that the OS defaults would take precedence. Setting this flag and {@code FORCE_ENABLE_HEVC_SUPPORT} is an undefined state and will result in the OS ignoring both flags." disabled="true" id="174227820" name="FORCE_DISABLE_HEVC_SUPPORT">
-    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:183" />
+    <meta-data definedIn="com.android.providers.media.TranscodeHelperImpl" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/TranscodeHelperImpl.java:177" />
   </compat-change>
 </config>
\ No newline at end of file
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 1f31b28..544e4d0 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -52,10 +52,12 @@ Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->LAST_MEDIA_SY
 Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 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;->HEIGHT: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;->ORIENTATION: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
@@ -63,6 +65,7 @@ Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_E
 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$MediaColumns;->WIDTH:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_LOOPING_PLAYBACK_ENABLED:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -318,8 +321,11 @@ Landroid/provider/MediaStore$PickerMediaColumns;->DATA:Ljava/lang/String;,public
 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;->HEIGHT: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;->ORIENTATION: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$PickerMediaColumns;->WIDTH:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;-><init>()V,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->CONTENT_TYPE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->DEFAULT_SORT_ORDER:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -375,6 +381,7 @@ Landroid/provider/MediaStore;->ACTION_PICK_IMAGES:Ljava/lang/String;,public-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_USER_SELECT_IMAGES_FOR_APP:Ljava/lang/String;,sdk,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_VIDEO_CAPTURE:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->AUTHORITY:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/provider/MediaStore;->AUTHORITY_LEGACY:Ljava/lang/String;,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 296e733..7e146ce 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -52,10 +52,12 @@ Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->LAST_MEDIA_SY
 Landroid/provider/CloudMediaProviderContract$MediaCollectionInfo;->MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,system-api,test-api
 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;->HEIGHT: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;->ORIENTATION: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
@@ -63,6 +65,7 @@ Landroid/provider/CloudMediaProviderContract$MediaColumns;->STANDARD_MIME_TYPE_E
 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$MediaColumns;->WIDTH:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_LOOPING_PLAYBACK_ENABLED:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/CloudMediaProviderContract;->EXTRA_MEDIA_COLLECTION_ID:Ljava/lang/String;,public-api,system-api,test-api
@@ -297,8 +300,11 @@ Landroid/provider/MediaStore$PickerMediaColumns;->DATA:Ljava/lang/String;,public
 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;->HEIGHT: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;->ORIENTATION: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$PickerMediaColumns;->WIDTH:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;-><init>()V,public-api,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->CONTENT_TYPE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore$Video$Media;->DEFAULT_SORT_ORDER:Ljava/lang/String;,public-api,system-api,test-api
@@ -346,6 +352,7 @@ Landroid/provider/MediaStore;->ACTION_PICK_IMAGES:Ljava/lang/String;,public-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_USER_SELECT_IMAGES_FOR_APP:Ljava/lang/String;,system-api,test-api
 Landroid/provider/MediaStore;->ACTION_VIDEO_CAPTURE:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->AUTHORITY:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/provider/MediaStore;->AUTHORITY_LEGACY:Ljava/lang/String;,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 233e7e0..9562066 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,1959,13,1959,96,maxTargetSdk=30&trackingBug=170729553L
-Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1968,13,1968,33,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1921,9,1921,29,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1927,9,1927,29,
-Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1933,9,1933,29,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2059,13,2059,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2068,13,2068,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2021,9,2021,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2027,9,2027,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2033,9,2033,29,
diff --git a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
index b1c39c3..cd91c64 100644
--- a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
diff --git a/current/sdk_library/module-lib/framework-mediaprovider.srcjar b/current/sdk_library/module-lib/framework-mediaprovider.srcjar
index 54f913e..42efe17 100644
--- a/current/sdk_library/module-lib/framework-mediaprovider.srcjar
+++ b/current/sdk_library/module-lib/framework-mediaprovider.srcjar
diff --git a/current/sdk_library/public/framework-mediaprovider-stubs.jar b/current/sdk_library/public/framework-mediaprovider-stubs.jar
index 35a1359..a18330e 100644
--- a/current/sdk_library/public/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/public/framework-mediaprovider-stubs.jar
diff --git a/current/sdk_library/public/framework-mediaprovider.srcjar b/current/sdk_library/public/framework-mediaprovider.srcjar
index 9c9068e..33530b4 100644
--- a/current/sdk_library/public/framework-mediaprovider.srcjar
+++ b/current/sdk_library/public/framework-mediaprovider.srcjar
diff --git a/current/sdk_library/public/framework-mediaprovider.txt b/current/sdk_library/public/framework-mediaprovider.txt
index 8e1691a..b0d655d 100644
--- a/current/sdk_library/public/framework-mediaprovider.txt
+++ b/current/sdk_library/public/framework-mediaprovider.txt
@@ -82,10 +82,12 @@ package android.provider {
   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 HEIGHT = "height";
     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 ORIENTATION = "orientation";
     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
@@ -93,6 +95,7 @@ package android.provider {
     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";
+    field public static final String WIDTH = "width";
   }
 
   public final class MediaStore {
@@ -464,8 +467,11 @@ package android.provider {
     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 HEIGHT = "height";
     field public static final String MIME_TYPE = "mime_type";
+    field public static final String ORIENTATION = "orientation";
     field public static final String SIZE = "_size";
+    field public static final String WIDTH = "width";
   }
 
   public static final class MediaStore.Video {
diff --git a/current/sdk_library/system/framework-mediaprovider-stubs.jar b/current/sdk_library/system/framework-mediaprovider-stubs.jar
index b1c39c3..cd91c64 100644
--- a/current/sdk_library/system/framework-mediaprovider-stubs.jar
+++ b/current/sdk_library/system/framework-mediaprovider-stubs.jar
diff --git a/current/sdk_library/system/framework-mediaprovider.srcjar b/current/sdk_library/system/framework-mediaprovider.srcjar
index 54f913e..42efe17 100644
--- a/current/sdk_library/system/framework-mediaprovider.srcjar
+++ b/current/sdk_library/system/framework-mediaprovider.srcjar
diff --git a/current/sdk_library/system/framework-mediaprovider.txt b/current/sdk_library/system/framework-mediaprovider.txt
index d29a6ed..cf915e4 100644
--- a/current/sdk_library/system/framework-mediaprovider.txt
+++ b/current/sdk_library/system/framework-mediaprovider.txt
@@ -6,6 +6,7 @@ package android.provider {
     method @NonNull @WorkerThread public static android.net.Uri scanFile(@NonNull android.content.ContentResolver, @NonNull java.io.File);
     method @WorkerThread public static void scanVolume(@NonNull android.content.ContentResolver, @NonNull String);
     method @WorkerThread public static void waitForIdle(@NonNull android.content.ContentResolver);
+    field public static final String ACTION_USER_SELECT_IMAGES_FOR_APP = "android.provider.action.USER_SELECT_IMAGES_FOR_APP";
     field public static final String AUTHORITY_LEGACY = "media_legacy";
     field @NonNull public static final android.net.Uri AUTHORITY_LEGACY_URI;
     field public static final String QUERY_ARG_DEFER_SCAN = "android:query-arg-defer-scan";
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index df75c7e..42ea358 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9279842
\ No newline at end of file
+10351819
\ No newline at end of file