Merge Android 12L

Bug: 222710654
Merged-In: Iff8b424fd7f1389423308c1f270ccdf03f600e68
Change-Id: Iaf3086092c15657b6dc8bd416d2f894ae32e9b2d

10 files changed, 19 insertions, 3 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 0d61728..b2741e6 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: "7785618"
+    build_id: "8012820"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/mediaprovider-module-sdk-current.zip"
   }
@@ -8,7 +8,7 @@ drops {
   version: ""
   version_group: ""
   git_project: "platform/prebuilts/module_sdk/MediaProvider"
-  git_branch: "sc-qpr1-dev"
+  git_branch: "sc-v2-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
     rename {
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index e80d172..48b46b2 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -1,5 +1,6 @@
 Landroid/provider/Column;->readOnly()Z,blocked
 Landroid/provider/Column;->value()I,blocked
+Landroid/provider/ExportedSince;->osVersion()I,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
@@ -341,6 +342,7 @@ Landroid/provider/MediaStore;->CREATE_DELETE_REQUEST_CALL:Ljava/lang/String;,blo
 Landroid/provider/MediaStore;->CREATE_FAVORITE_REQUEST_CALL: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;->DEFAULT_USER_ID:I,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
@@ -439,11 +441,16 @@ Landroid/provider/MediaStore;->getRecentExternalVolumeNames(Landroid/content/Con
 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;->isCurrentSystemGallery(Landroid/content/ContentResolver;ILjava/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;->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 +460,5 @@ Landroid/provider/MediaStore;->setIncludePending(Landroid/net/Uri$Builder;)Landr
 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/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index 6fb3bd6..6789742 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -1,5 +1,6 @@
 Landroid/provider/Column;->readOnly()Z
 Landroid/provider/Column;->value()I
+Landroid/provider/ExportedSince;->osVersion()I
 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
@@ -341,6 +342,7 @@ Landroid/provider/MediaStore;->CREATE_DELETE_REQUEST_CALL:Ljava/lang/String;
 Landroid/provider/MediaStore;->CREATE_FAVORITE_REQUEST_CALL: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;->DEFAULT_USER_ID:I
 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
@@ -439,11 +441,16 @@ Landroid/provider/MediaStore;->getRecentExternalVolumeNames(Landroid/content/Con
 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;->isCurrentSystemGallery(Landroid/content/ContentResolver;ILjava/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;->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 +460,5 @@ Landroid/provider/MediaStore;->setIncludePending(Landroid/net/Uri$Builder;)Landr
 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/sdk_library/module-lib/framework-mediaprovider-stubs.jar b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar
index dabd7af..b83a414 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 37f7315..e2885bd 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 d26c767..b502333 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 949df78..112a082 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 2e6312c..0a53fb5 100644
--- a/current/sdk_library/public/framework-mediaprovider.txt
+++ b/current/sdk_library/public/framework-mediaprovider.txt
@@ -323,7 +323,7 @@ package android.provider {
     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";
diff --git a/current/sdk_library/system/framework-mediaprovider-stubs.jar b/current/sdk_library/system/framework-mediaprovider-stubs.jar
index dabd7af..b83a414 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 37f7315..e2885bd 100644
--- a/current/sdk_library/system/framework-mediaprovider.srcjar
+++ b/current/sdk_library/system/framework-mediaprovider.srcjar