DO NOT MERGE: Drop prebuilt files to android source tree. am: 2f63b17529
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/25487325
Change-Id: Id0e557a1c60a4b396831139b6dfbebe111294574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 04b96cf..0684882 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1007601"
+ build_id: "T1008598"
target: "train_build"
source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/MediaProvider"
- git_branch: "udc-d1-dev"
+ git_branch: "udc-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
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 3c3f94e..08e9c9f 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
@@ -7,13 +7,13 @@
<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:360" />
+ <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:362" />
</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:459" />
+ <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:461" />
</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:467" />
+ <meta-data definedIn="com.android.providers.media.MediaProvider" sourcePosition="packages/providers/MediaProvider/src/com/android/providers/media/MediaProvider.java:469" />
</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:160" />
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 544e4d0..f59c164 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -69,6 +69,7 @@
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
+Landroid/provider/CloudMediaProviderContract;->EXTRA_PAGE_SIZE:Ljava/lang/String;,public-api,sdk,system-api,test-api
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_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED:Ljava/lang/String;,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 7e146ce..7355693 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -69,6 +69,7 @@
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
+Landroid/provider/CloudMediaProviderContract;->EXTRA_PAGE_SIZE:Ljava/lang/String;,public-api,system-api,test-api
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_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED:Ljava/lang/String;,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 9562066..d73c6d5 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,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,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2076,13,2076,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2085,13,2085,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2038,9,2038,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2044,9,2044,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,2050,9,2050,29,
diff --git a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
index cd91c64..ab67c27 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 42efe17..39ff73c 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 a18330e..44eb9a4 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 33530b4..3306062 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 b0d655d..34825d1 100644
--- a/current/sdk_library/public/framework-mediaprovider.txt
+++ b/current/sdk_library/public/framework-mediaprovider.txt
@@ -56,6 +56,7 @@
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_SIZE = "android.provider.extra.PAGE_SIZE";
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";
diff --git a/current/sdk_library/system/framework-mediaprovider-stubs.jar b/current/sdk_library/system/framework-mediaprovider-stubs.jar
index cd91c64..ab67c27 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 42efe17..39ff73c 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
index d33d0a0..3c4cba4 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10572802
\ No newline at end of file
+10991675
\ No newline at end of file
