Snap for 8505378 from 90fb2d68e3c50066e12e44c96a2f893436f29854 to mainline-go-ipsec-release

Change-Id: Idda625d018c007c687c452064d3d363e5e2329d7
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2022-04-28 19:48:55 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2022-04-28 19:48:55 +0000
commit: 6079ecd5046b41b791b9c4494a9d575893ffb43e (patch)
tree: fabd43a3cd84376983abfa9e0e619bc116e3fa8c
parent: 9184ed1a8f0f9609aaa2e0ef6a7ae40cafa750ac (diff)
parent: 90fb2d68e3c50066e12e44c96a2f893436f29854 (diff)
download: sdk-6079ecd5046b41b791b9c4494a9d575893ffb43e.tar.gz
112 files changed, 693 insertions, 160 deletions
diff --git a/28/public/api/removed.txt b/28/public/api/android-removed.txt
index f35348ec8..f35348ec8 100644
--- a/28/public/api/removed.txt
+++ b/28/public/api/android-removed.txt
diff --git a/30/module-lib/api/removed.txt b/30/module-lib/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/30/module-lib/api/removed.txt
+++ b/30/module-lib/api/android-removed.txt
diff --git a/30/public/api/removed.txt b/30/public/api/android-removed.txt
index cddccb3e6..cddccb3e6 100644
--- a/30/public/api/removed.txt
+++ b/30/public/api/android-removed.txt
diff --git a/30/system-server/api/removed.txt b/30/system-server/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/30/system-server/api/removed.txt
+++ b/30/system-server/api/android-removed.txt
diff --git a/30/system/api/removed.txt b/30/system/api/android-removed.txt
index 09544c11f..09544c11f 100644
--- a/30/system/api/removed.txt
+++ b/30/system/api/android-removed.txt
diff --git a/31/module-lib/api/removed.txt b/31/module-lib/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/31/module-lib/api/removed.txt
+++ b/31/module-lib/api/android-removed.txt
diff --git a/31/public/api/removed.txt b/31/public/api/android-removed.txt
index 4abdb918c..4abdb918c 100644
--- a/31/public/api/removed.txt
+++ b/31/public/api/android-removed.txt
diff --git a/31/system-server/api/removed.txt b/31/system-server/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/31/system-server/api/removed.txt
+++ b/31/system-server/api/android-removed.txt
diff --git a/31/system/api/removed.txt b/31/system/api/android-removed.txt
index 1c484dd9d..1c484dd9d 100644
--- a/31/system/api/removed.txt
+++ b/31/system/api/android-removed.txt
diff --git a/31/test/api/removed.txt b/31/test/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/31/test/api/removed.txt
+++ b/31/test/api/android-removed.txt
diff --git a/32/module-lib/api/removed.txt b/32/module-lib/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/32/module-lib/api/removed.txt
+++ b/32/module-lib/api/android-removed.txt
diff --git a/32/public/api/removed.txt b/32/public/api/android-removed.txt
index 4abdb918c..4abdb918c 100644
--- a/32/public/api/removed.txt
+++ b/32/public/api/android-removed.txt
diff --git a/32/system-server/api/removed.txt b/32/system-server/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/32/system-server/api/removed.txt
+++ b/32/system-server/api/android-removed.txt
diff --git a/32/system/api/removed.txt b/32/system/api/android-removed.txt
index 1c484dd9d..1c484dd9d 100644
--- a/32/system/api/removed.txt
+++ b/32/system/api/android-removed.txt
diff --git a/32/test/api/removed.txt b/32/test/api/android-removed.txt
index d802177e2..d802177e2 100644
--- a/32/test/api/removed.txt
+++ b/32/test/api/android-removed.txt
diff --git a/Android.bp b/Android.bp
index ef3948788..cb56e26e9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,14 +42,6 @@ license {
 subdirs=["tools"]
 
 filegroup {
-    name: "api-version-xml",
-    srcs: [
-        "*/public/api/android.txt",
-        "*/public/api/android.xml",
-    ],
-}
-
-filegroup {
     name: "current-support-api",
     srcs: [
         "current/support-api.txt",
diff --git a/BUILD.bazel b/BUILD.bazel
index f276e818e..38fd9ed40 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -50,6 +50,7 @@ java_import(
     name = "public_current_android_sdk_java_import",
     jars = ["//prebuilts/sdk/current:public/android.jar"],
     visibility = ["//visibility:public"],
+    neverlink = True,
 )
 
 android_toolchain(
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b65e..e4055db23 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,6 +44,8 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
+$(call add-clean-step, chmod -R =rwX $(OUT_DIR)/target/common/obj/APPS/*_intermediates/jacoco/work/classes-to-instrument/classes)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/current/aaos-libs/Android.bp b/current/aaos-libs/Android.bp
index 3af2d1e0d..de0e8e7a8 100644
--- a/current/aaos-libs/Android.bp
+++ b/current/aaos-libs/Android.bp
@@ -147,11 +147,15 @@ android_library {
     sdk_version: "31",
     static_libs:[
         "car-telephony-common-nodeps",
+        "androidx.exifinterface_exifinterface",
         "androidx.legacy_legacy-support-v4",
         "androidx.lifecycle_lifecycle-common-java8",
         "androidx.lifecycle_lifecycle-extensions",
         "car-apps-common-nodeps",
         "glide-prebuilt",
+        "glide-gifdecoder-prebuilt",
+        "glide-disklrucache-prebuilt",
+        "glide-annotation-and-compiler-prebuilt",
         "guava",
         "libphonenumber",
     ]
@@ -162,11 +166,15 @@ android_library_import {
     aars: ["car-telephony-common.aar"],
     sdk_version: "31",
     static_libs:[
+        "androidx.exifinterface_exifinterface",
         "androidx.legacy_legacy-support-v4",
         "androidx.lifecycle_lifecycle-common-java8",
         "androidx.lifecycle_lifecycle-extensions",
         "car-apps-common-nodeps",
         "glide-prebuilt",
+        "glide-gifdecoder-prebuilt",
+        "glide-disklrucache-prebuilt",
+        "glide-annotation-and-compiler-prebuilt",
         "guava",
         "libphonenumber",
     ]
diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index fa103f36f..f5fc3f83f 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -2889,7 +2889,7 @@ android_library {
 
 android_library_import {
     name: "androidx.media_media-nodeps",
-    aars: ["m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar"],
+    aars: ["m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar"],
     sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
@@ -4847,7 +4847,7 @@ android_library {
 
 android_library_import {
     name: "androidx.window_window-nodeps",
-    aars: ["m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar"],
+    aars: ["m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar"],
     sdk_version: "31",
     apex_available: [
         "//apex_available:platform",
@@ -4855,10 +4855,10 @@ android_library_import {
     ],
     min_sdk_version: "14",
     static_libs: [
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
         "androidx.annotation_annotation",
         "androidx.collection_collection",
+        "kotlin-stdlib",
+        "kotlinx_coroutines_android",
         "androidx.core_core",
     ],
 }
@@ -4874,10 +4874,10 @@ android_library {
     manifest: "manifests/androidx.window_window/AndroidManifest.xml",
     static_libs: [
         "androidx.window_window-nodeps",
-        "kotlin-stdlib",
-        "kotlinx_coroutines_android",
         "androidx.annotation_annotation",
         "androidx.collection_collection",
+        "kotlin-stdlib",
+        "kotlinx_coroutines_android",
         "androidx.core_core",
     ],
     optional_uses_libs: [
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar
deleted file mode 100644
index 4cd7fb9e3..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar
+++ /dev/null
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.md5 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.md5
deleted file mode 100644
index f0efb9549..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-88be42309c491fb2876ca271a0c54d9f
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha1 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha1
deleted file mode 100644
index 50934d706..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c31b48e2a1656356f6e54173865309e0fcacc268
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha256 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha256
deleted file mode 100644
index efa1b41b5..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b31c2a95c202a5d050abec3a22274feee3b24c1a3eaa0104d8ed31c1e3275374
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha512 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha512
deleted file mode 100644
index 47bafa5b9..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01-sources.jar.sha512
+++ /dev/null
@@ -1 +0,0 @@
-0f77106cc621a1034afebe284cceba3f04626c2459b9ac3e89bbe808c76aec5da8451de9589776af2aa00def28614a5fdec92d35ed70b4c6a124a9079c3d5ed8
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar
deleted file mode 100644
index 82fb61404..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar
+++ /dev/null
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.md5 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.md5
deleted file mode 100644
index 17197b6c8..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.md5
+++ /dev/null
@@ -1 +0,0 @@
-615e9cfd0ef0c025f89ad2ab45b7717d
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha1 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha1
deleted file mode 100644
index e4b8438ab..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24375856a1b905590fa56b2adbbbf6f46d586942
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha256 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha256
deleted file mode 100644
index bc6b32b79..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-86d79b7fe03451965a1272f80eecb12891a207a43bfd9d12dae3dbbbe77d7406
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha512 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha512
deleted file mode 100644
index c212409d4..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.aar.sha512
+++ /dev/null
@@ -1 +0,0 @@
-55d71753d75835b7c77c1430bb80ea28f2bbf0311de6d54a2a1457b1c459fce7c94e0104b6446e93bc9420070b75467fd00c4e465dd946ddf270e60a98bcff23
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.md5 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.md5
deleted file mode 100644
index 4f29bf094..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.md5
+++ /dev/null
@@ -1 +0,0 @@
-7382dfbb19504dd61a1b177764286147
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha1 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha1
deleted file mode 100644
index 41ae886b3..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5815f48f3c894f8ee4bd8341be14e8470b7c2bd7
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha256 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha256
deleted file mode 100644
index 724459470..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a11c334c93fcfdfb3a112cb965be7221879357a9841cf764477ab74bd65f6474
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha512 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha512
deleted file mode 100644
index d1cf20db9..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module.sha512
+++ /dev/null
@@ -1 +0,0 @@
-ba3f8d3d8f457789e65cb9a7417956707996de017ffcbd67b6dac7dc857f9cf841bf7a0c6f01e3a686ae7d0c7a3731965ce52f653500450cd67d353c39449ad0
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.md5 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.md5
deleted file mode 100644
index c5a571f60..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-7f295cb757efe07615a5c0720cd9dd59
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha1 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha1
deleted file mode 100644
index 0015ca4d2..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-acc6600ec4cf3cdf2f6d914a536fac3a6dc011c4
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha256 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha256
deleted file mode 100644
index 74f64c0d0..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha256
+++ /dev/null
@@ -1 +0,0 @@
-64ad1cc1bfa80741312d6d486f8857682895e173cb907d202461708ea6983ef5
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha512 b/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha512
deleted file mode 100644
index 10d150c75..000000000
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom.sha512
+++ /dev/null
@@ -1 +0,0 @@
-21b403f5af92bb4adf3026f2c1990fc88255cf73cdd9697a1bac18e6b3a20134ac1ff385412db07139dd9c31a40b7b909269b8d3e328cdd52a2312227779864d
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar
new file mode 100644
index 000000000..4b1366095
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.md5
new file mode 100644
index 000000000..d2bf1753f
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.md5
@@ -0,0 +1 @@
+18342543b08ce35f1e5556fdfc19cb75
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha1
new file mode 100644
index 000000000..ac00eeec2
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha1
@@ -0,0 +1 @@
+312df766d4f9ebf0d4ed43b73e8fc3ae89b3f8f5
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha256
new file mode 100644
index 000000000..a4b950a4e
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha256
@@ -0,0 +1 @@
+3ad883d72593b22837306f51430e1fcf5d7a5c05dba48f005cc699991a8eb6b3
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha512
new file mode 100644
index 000000000..383755b70
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01-sources.jar.sha512
@@ -0,0 +1 @@
+3c4e05520a46870ee0e8b2217bd828e6cbe49c3633b6deabb0d706cb54e6481786e59b27e3de49df5f2c26ce543292d003f2b7cdf3479de72ba9888b21f55f5c
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar
new file mode 100644
index 000000000..d46cbd792
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.md5
new file mode 100644
index 000000000..620d03f3f
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.md5
@@ -0,0 +1 @@
+b4efa75b7c90d3761385e014c0086038
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha1
new file mode 100644
index 000000000..c6d5598e8
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha1
@@ -0,0 +1 @@
+6e67176c8d7fe168b040f38159981fcd849078a4
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha256
new file mode 100644
index 000000000..edc11ec64
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha256
@@ -0,0 +1 @@
+0607adcbb72f683d78921e461be9d69be1cc7b8a7bea690187a0104f3e84a661
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha512
new file mode 100644
index 000000000..9d82136f4
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.aar.sha512
@@ -0,0 +1 @@
+7d3a2ddfcbffdb8431a98d3d9ad28cdb7efab474a61581ac1c0e100edaeac96e775aa228e241edabb1f23d30bc6bb0b08bd4b5e7811331520138fc5b50de1547
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module
index 984bc917b..d423c61da 100644
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.module
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module
@@ -3,14 +3,14 @@
   "component": {
     "group": "androidx.media",
     "module": "media",
-    "version": "1.5.0-alpha01",
+    "version": "1.6.0-rc01",
     "attributes": {
       "org.gradle.status": "release"
     }
   },
   "createdBy": {
     "gradle": {
-      "version": "7.2"
+      "version": "7.4"
     }
   },
   "variants": [
@@ -33,13 +33,13 @@
       ],
       "files": [
         {
-          "name": "media-1.5.0-alpha01.aar",
-          "url": "media-1.5.0-alpha01.aar",
-          "size": 335047,
-          "sha512": "55d71753d75835b7c77c1430bb80ea28f2bbf0311de6d54a2a1457b1c459fce7c94e0104b6446e93bc9420070b75467fd00c4e465dd946ddf270e60a98bcff23",
-          "sha256": "86d79b7fe03451965a1272f80eecb12891a207a43bfd9d12dae3dbbbe77d7406",
-          "sha1": "24375856a1b905590fa56b2adbbbf6f46d586942",
-          "md5": "615e9cfd0ef0c025f89ad2ab45b7717d"
+          "name": "media-1.6.0-rc01.aar",
+          "url": "media-1.6.0-rc01.aar",
+          "size": 338460,
+          "sha512": "7d3a2ddfcbffdb8431a98d3d9ad28cdb7efab474a61581ac1c0e100edaeac96e775aa228e241edabb1f23d30bc6bb0b08bd4b5e7811331520138fc5b50de1547",
+          "sha256": "0607adcbb72f683d78921e461be9d69be1cc7b8a7bea690187a0104f3e84a661",
+          "sha1": "6e67176c8d7fe168b040f38159981fcd849078a4",
+          "md5": "b4efa75b7c90d3761385e014c0086038"
         }
       ]
     },
@@ -76,13 +76,13 @@
       ],
       "files": [
         {
-          "name": "media-1.5.0-alpha01.aar",
-          "url": "media-1.5.0-alpha01.aar",
-          "size": 335047,
-          "sha512": "55d71753d75835b7c77c1430bb80ea28f2bbf0311de6d54a2a1457b1c459fce7c94e0104b6446e93bc9420070b75467fd00c4e465dd946ddf270e60a98bcff23",
-          "sha256": "86d79b7fe03451965a1272f80eecb12891a207a43bfd9d12dae3dbbbe77d7406",
-          "sha1": "24375856a1b905590fa56b2adbbbf6f46d586942",
-          "md5": "615e9cfd0ef0c025f89ad2ab45b7717d"
+          "name": "media-1.6.0-rc01.aar",
+          "url": "media-1.6.0-rc01.aar",
+          "size": 338460,
+          "sha512": "7d3a2ddfcbffdb8431a98d3d9ad28cdb7efab474a61581ac1c0e100edaeac96e775aa228e241edabb1f23d30bc6bb0b08bd4b5e7811331520138fc5b50de1547",
+          "sha256": "0607adcbb72f683d78921e461be9d69be1cc7b8a7bea690187a0104f3e84a661",
+          "sha1": "6e67176c8d7fe168b040f38159981fcd849078a4",
+          "md5": "b4efa75b7c90d3761385e014c0086038"
         }
       ]
     },
@@ -96,15 +96,15 @@
       },
       "files": [
         {
-          "name": "media-1.5.0-alpha01-sources.jar",
-          "url": "media-1.5.0-alpha01-sources.jar",
-          "size": 143958,
-          "sha512": "0f77106cc621a1034afebe284cceba3f04626c2459b9ac3e89bbe808c76aec5da8451de9589776af2aa00def28614a5fdec92d35ed70b4c6a124a9079c3d5ed8",
-          "sha256": "b31c2a95c202a5d050abec3a22274feee3b24c1a3eaa0104d8ed31c1e3275374",
-          "sha1": "c31b48e2a1656356f6e54173865309e0fcacc268",
-          "md5": "88be42309c491fb2876ca271a0c54d9f"
+          "name": "media-1.6.0-rc01-sources.jar",
+          "url": "media-1.6.0-rc01-sources.jar",
+          "size": 145735,
+          "sha512": "3c4e05520a46870ee0e8b2217bd828e6cbe49c3633b6deabb0d706cb54e6481786e59b27e3de49df5f2c26ce543292d003f2b7cdf3479de72ba9888b21f55f5c",
+          "sha256": "3ad883d72593b22837306f51430e1fcf5d7a5c05dba48f005cc699991a8eb6b3",
+          "sha1": "312df766d4f9ebf0d4ed43b73e8fc3ae89b3f8f5",
+          "md5": "18342543b08ce35f1e5556fdfc19cb75"
         }
       ]
     }
   ]
-}
+}
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.md5
new file mode 100644
index 000000000..933a0df4f
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.md5
@@ -0,0 +1 @@
+f6bf3969553497fa2c5963d5d6115781
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha1
new file mode 100644
index 000000000..d471105f7
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha1
@@ -0,0 +1 @@
+e17624d037c3424b14bc5103a2fbf0a706bd2d64
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha256
new file mode 100644
index 000000000..c1eba92b4
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha256
@@ -0,0 +1 @@
+be8169440ae1234dd79f68074362803777cfc2435bb96f33b99c8046a3d783f7
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha512
new file mode 100644
index 000000000..3f356b117
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.module.sha512
@@ -0,0 +1 @@
+361fec885011f68a6d2df44d70de40f8f3a052a66b806a749941f652a74e31676b6aca5c9a3d479a435cdb5e3b74c795dc0afc1a4b0660540c45698713254d9e
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom
index 98c1c6bbc..70891aadf 100644
--- a/current/androidx/m2repository/androidx/media/media/1.5.0-alpha01/media-1.5.0-alpha01.pom
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom
@@ -8,11 +8,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.media</groupId>
   <artifactId>media</artifactId>
-  <version>1.5.0-alpha01</version>
+  <version>1.6.0-rc01</version>
   <packaging>aar</packaging>
   <name>Android Support Library media compat</name>
   <description>The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.</description>
-  <url>https://developer.android.com/jetpack/androidx/releases/media#1.5.0-alpha01</url>
+  <url>https://developer.android.com/jetpack/androidx/releases/media#1.6.0-rc01</url>
   <inceptionYear>2011</inceptionYear>
   <licenses>
     <license>
@@ -32,13 +32,6 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>androidx.core</groupId>
-      <artifactId>core</artifactId>
-      <version>1.6.0</version>
-      <scope>compile</scope>
-      <type>aar</type>
-    </dependency>
-    <dependency>
       <groupId>androidx.annotation</groupId>
       <artifactId>annotation</artifactId>
       <version>1.2.0</version>
@@ -50,5 +43,12 @@
       <version>1.1.0</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>androidx.core</groupId>
+      <artifactId>core</artifactId>
+      <version>1.6.0</version>
+      <scope>compile</scope>
+      <type>aar</type>
+    </dependency>
   </dependencies>
 </project>
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.md5 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.md5
new file mode 100644
index 000000000..327878f7c
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.md5
@@ -0,0 +1 @@
+4e750fd7481a498431827080c3db12bd
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha1 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha1
new file mode 100644
index 000000000..4989a22cc
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha1
@@ -0,0 +1 @@
+6dc606558e97f7687c88bf2e0c807372a7fc78d9
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha256 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha256
new file mode 100644
index 000000000..2e102971b
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha256
@@ -0,0 +1 @@
+94fad62ba0326078b6cf8908c703d0363c7bae3e66e1f9db1bbb3d833c16f49a
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha512 b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha512
new file mode 100644
index 000000000..1b0864f4e
--- /dev/null
+++ b/current/androidx/m2repository/androidx/media/media/1.6.0-rc01/media-1.6.0-rc01.pom.sha512
@@ -0,0 +1 @@
+40e39e8dbdc47d521fb8ee0617219bf2c0eb489965afd1ca3f47f2422453eb6430217e61126541fbfb03172be1b41ceb4346220214817d133c4b1408e46769c5
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar
deleted file mode 100644
index a8d44a2da..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar
+++ /dev/null
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.md5 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.md5
deleted file mode 100644
index 9f2eb6d4c..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.md5
+++ /dev/null
@@ -1 +0,0 @@
-f48113ee3c187c44100b2c7f6f82b54c
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha1 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha1
deleted file mode 100644
index 22b0956a1..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c11c6cab673bbc879e3bfdf6184a7f85e768db64
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha256 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha256
deleted file mode 100644
index 1f0d5a44a..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-2b09de33d813f7e6b1b1f4c025b78fc74bb9531dd3c07a45f3b454244e444813
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha512 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha512
deleted file mode 100644
index 7bef46e43..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03-sources.jar.sha512
+++ /dev/null
@@ -1 +0,0 @@
-28e4df8f56a2c70c4667ba36290e888ba23b88f7880e5888b37535b11707e1fd6c706ab70b6cde0238bf93f842a975c790e227c7835f80fa9a967e1c37678e29
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar
deleted file mode 100644
index 3c16bdedb..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar
+++ /dev/null
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.md5 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.md5
deleted file mode 100644
index 5ffde4a7f..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.md5
+++ /dev/null
@@ -1 +0,0 @@
-8c14c6ffeae67923fe48ce725b27b225
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha1 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha1
deleted file mode 100644
index 4e5fefbe4..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7fff03ad4330bcd03bd00ae3b5054539ac6189a
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha256 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha256
deleted file mode 100644
index 984833b40..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha256
+++ /dev/null
@@ -1 +0,0 @@
-1bfc44aac00b6d47a7c685fa80cb5fd20b4c82128cbfd421723f4cacb17601fc
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha512 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha512
deleted file mode 100644
index 2da1d07a2..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.aar.sha512
+++ /dev/null
@@ -1 +0,0 @@
-903c258fa388a49516b0aa8e988d883dbd896cc176a47d6b2f60a66a00f25ed568a25c0d988853aaa43c147a47b4f4638a4fc313af5f294babeac9564362fbef
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.md5 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.md5
deleted file mode 100644
index 72bf62197..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.md5
+++ /dev/null
@@ -1 +0,0 @@
-13c5045bff3bcabd9987f394dd5783c4
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha1 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha1
deleted file mode 100644
index 39b137443..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1830f196b7ff45920d46acc3fbfea79576d7db33
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha256 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha256
deleted file mode 100644
index 8ab53778b..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha256
+++ /dev/null
@@ -1 +0,0 @@
-cfdde0537d01d63cb4dc589f7b9e3108248b8cd88f5364d114f2db823d74e814
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha512 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha512
deleted file mode 100644
index 8a93c1001..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module.sha512
+++ /dev/null
@@ -1 +0,0 @@
-1d46adc4d19d65efa47aeef00d7e422d20b0fa65d877b6566de5b98a30fe89f0524f4a9de4e0e9f796140d225164a9c6cf0fbb1baca0d5abdc05c076274c002d
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.md5 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.md5
deleted file mode 100644
index 8d9de8786..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.md5
+++ /dev/null
@@ -1 +0,0 @@
-e73e1e252282c330caca6921401fc537
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha1 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha1
deleted file mode 100644
index 5e88eaa0b..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha1
+++ /dev/null
@@ -1 +0,0 @@
-69b52441c26e8d7f65b2511aed85bd9d9c0775ec
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha256 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha256
deleted file mode 100644
index dbc0ea6cc..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha256
+++ /dev/null
@@ -1 +0,0 @@
-deaef851832b48114fe3cd8ba3159e23b4a13f7f37313ad300e8707e456934d3
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha512 b/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha512
deleted file mode 100644
index 88e79eb39..000000000
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom.sha512
+++ /dev/null
@@ -1 +0,0 @@
-5c580087e408bfbdafb63d18681174bb21ea43a1e78d0c880034a89ca6d4e5065db40f749051cef21170497a8b2ea4b2f664006b70e2e81d9ad4a16979e97299
-\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar
new file mode 100644
index 000000000..6cb39dce5
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.md5 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.md5
new file mode 100644
index 000000000..14ffb628f
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.md5
@@ -0,0 +1 @@
+082b0929d6dc2566028dd7a0e30257fb
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha1 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha1
new file mode 100644
index 000000000..9318f852b
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha1
@@ -0,0 +1 @@
+af5b0d75e8b267496008113bb3f9195e0cc44665
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha256 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha256
new file mode 100644
index 000000000..b901e5281
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha256
@@ -0,0 +1 @@
+5353ce424418f612f876a9fda61f9d6e0ab5d70e0958d13d60d0aff8a7f2aa3c
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha512 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha512
new file mode 100644
index 000000000..48b02ee29
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01-sources.jar.sha512
@@ -0,0 +1 @@
+3d015fcaf0170ec11733893b8cbece36ae5d640c6ded0791434a8bc41de766a3dcfd4236b00b292e4554c7eda963ce62765e6fc7efdf3d77395f12bf4e1a2a09
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar
new file mode 100644
index 000000000..96c7e6a21
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.md5 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.md5
new file mode 100644
index 000000000..377509e24
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.md5
@@ -0,0 +1 @@
+fbf429081900c504645f413602c1b448
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha1 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha1
new file mode 100644
index 000000000..ac4e2462f
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha1
@@ -0,0 +1 @@
+6544170f5ef0b3790b5852ffaa1f5df28524cb28
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha256 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha256
new file mode 100644
index 000000000..8acff732a
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha256
@@ -0,0 +1 @@
+5f2fbff4439b282395b20d6dccebcb4ffa8189eabcd8067e707d8818751bbcdc
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha512 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha512
new file mode 100644
index 000000000..9862fa537
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.aar.sha512
@@ -0,0 +1 @@
+3599141a1879e34d86a5c54f09754a2ca70477daa0248b948d67eff758fe45391fd3c18b61e638dde7408868605014eefe101afaecaf3f9722883210ccdb51d7
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module
index d11590f6e..94f53b1cc 100644
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.module
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module
@@ -3,14 +3,14 @@
   "component": {
     "group": "androidx.window",
     "module": "window",
-    "version": "1.0.0-beta03",
+    "version": "1.1.0-alpha01",
     "attributes": {
       "org.gradle.status": "release"
     }
   },
   "createdBy": {
     "gradle": {
-      "version": "7.2"
+      "version": "7.4.2"
     }
   },
   "variants": [
@@ -27,26 +27,26 @@
           "group": "org.jetbrains.kotlin",
           "module": "kotlin-stdlib",
           "version": {
-            "requires": "1.5.30"
+            "requires": "1.6.20"
           }
         },
         {
           "group": "org.jetbrains.kotlinx",
           "module": "kotlinx-coroutines-android",
           "version": {
-            "requires": "1.5.0"
+            "requires": "1.6.0"
           }
         }
       ],
       "files": [
         {
-          "name": "window-1.0.0-beta03.aar",
-          "url": "window-1.0.0-beta03.aar",
-          "size": 83600,
-          "sha512": "903c258fa388a49516b0aa8e988d883dbd896cc176a47d6b2f60a66a00f25ed568a25c0d988853aaa43c147a47b4f4638a4fc313af5f294babeac9564362fbef",
-          "sha256": "1bfc44aac00b6d47a7c685fa80cb5fd20b4c82128cbfd421723f4cacb17601fc",
-          "sha1": "f7fff03ad4330bcd03bd00ae3b5054539ac6189a",
-          "md5": "8c14c6ffeae67923fe48ce725b27b225"
+          "name": "window-1.1.0-alpha01.aar",
+          "url": "window-1.1.0-alpha01.aar",
+          "size": 199968,
+          "sha512": "3599141a1879e34d86a5c54f09754a2ca70477daa0248b948d67eff758fe45391fd3c18b61e638dde7408868605014eefe101afaecaf3f9722883210ccdb51d7",
+          "sha256": "5f2fbff4439b282395b20d6dccebcb4ffa8189eabcd8067e707d8818751bbcdc",
+          "sha1": "6544170f5ef0b3790b5852ffaa1f5df28524cb28",
+          "md5": "fbf429081900c504645f413602c1b448"
         }
       ]
     },
@@ -60,24 +60,10 @@
       },
       "dependencies": [
         {
-          "group": "org.jetbrains.kotlin",
-          "module": "kotlin-stdlib",
-          "version": {
-            "requires": "1.5.30"
-          }
-        },
-        {
-          "group": "org.jetbrains.kotlinx",
-          "module": "kotlinx-coroutines-android",
-          "version": {
-            "requires": "1.5.0"
-          }
-        },
-        {
           "group": "androidx.annotation",
           "module": "annotation",
           "version": {
-            "requires": "1.1.0"
+            "requires": "1.2.0"
           }
         },
         {
@@ -93,17 +79,31 @@
           "version": {
             "requires": "1.3.2"
           }
+        },
+        {
+          "group": "org.jetbrains.kotlin",
+          "module": "kotlin-stdlib",
+          "version": {
+            "requires": "1.6.20"
+          }
+        },
+        {
+          "group": "org.jetbrains.kotlinx",
+          "module": "kotlinx-coroutines-android",
+          "version": {
+            "requires": "1.6.0"
+          }
         }
       ],
       "files": [
         {
-          "name": "window-1.0.0-beta03.aar",
-          "url": "window-1.0.0-beta03.aar",
-          "size": 83600,
-          "sha512": "903c258fa388a49516b0aa8e988d883dbd896cc176a47d6b2f60a66a00f25ed568a25c0d988853aaa43c147a47b4f4638a4fc313af5f294babeac9564362fbef",
-          "sha256": "1bfc44aac00b6d47a7c685fa80cb5fd20b4c82128cbfd421723f4cacb17601fc",
-          "sha1": "f7fff03ad4330bcd03bd00ae3b5054539ac6189a",
-          "md5": "8c14c6ffeae67923fe48ce725b27b225"
+          "name": "window-1.1.0-alpha01.aar",
+          "url": "window-1.1.0-alpha01.aar",
+          "size": 199968,
+          "sha512": "3599141a1879e34d86a5c54f09754a2ca70477daa0248b948d67eff758fe45391fd3c18b61e638dde7408868605014eefe101afaecaf3f9722883210ccdb51d7",
+          "sha256": "5f2fbff4439b282395b20d6dccebcb4ffa8189eabcd8067e707d8818751bbcdc",
+          "sha1": "6544170f5ef0b3790b5852ffaa1f5df28524cb28",
+          "md5": "fbf429081900c504645f413602c1b448"
         }
       ]
     },
@@ -117,15 +117,15 @@
       },
       "files": [
         {
-          "name": "window-1.0.0-beta03-sources.jar",
-          "url": "window-1.0.0-beta03-sources.jar",
-          "size": 33605,
-          "sha512": "28e4df8f56a2c70c4667ba36290e888ba23b88f7880e5888b37535b11707e1fd6c706ab70b6cde0238bf93f842a975c790e227c7835f80fa9a967e1c37678e29",
-          "sha256": "2b09de33d813f7e6b1b1f4c025b78fc74bb9531dd3c07a45f3b454244e444813",
-          "sha1": "c11c6cab673bbc879e3bfdf6184a7f85e768db64",
-          "md5": "f48113ee3c187c44100b2c7f6f82b54c"
+          "name": "window-1.1.0-alpha01-sources.jar",
+          "url": "window-1.1.0-alpha01-sources.jar",
+          "size": 78117,
+          "sha512": "3d015fcaf0170ec11733893b8cbece36ae5d640c6ded0791434a8bc41de766a3dcfd4236b00b292e4554c7eda963ce62765e6fc7efdf3d77395f12bf4e1a2a09",
+          "sha256": "5353ce424418f612f876a9fda61f9d6e0ab5d70e0958d13d60d0aff8a7f2aa3c",
+          "sha1": "af5b0d75e8b267496008113bb3f9195e0cc44665",
+          "md5": "082b0929d6dc2566028dd7a0e30257fb"
         }
       ]
     }
   ]
-}
+}
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.md5 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.md5
new file mode 100644
index 000000000..8f6fb40e2
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.md5
@@ -0,0 +1 @@
+cd4b9e63d135143e732b1190220960f7
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha1 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha1
new file mode 100644
index 000000000..1f2dfeab1
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha1
@@ -0,0 +1 @@
+203cfc85309c854e816820da98e6d640f4d2261c
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha256 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha256
new file mode 100644
index 000000000..55841b9ed
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha256
@@ -0,0 +1 @@
+46048b77c27c0fb0ea4d6a250dd258f7845191a7d5910ab7c0119c81ff9a5727
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha512 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha512
new file mode 100644
index 000000000..2d89093eb
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.module.sha512
@@ -0,0 +1 @@
+f1900acf195de09f54f5398b670e27d40fc44c770d035262337bfc09831b05df471e3f872ea6c021f4dc7de25478d9365cf8a9f497049a4b286faa154a76cf9b
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom
index 05cc35d15..8f09ef86c 100644
--- a/current/androidx/m2repository/androidx/window/window/1.0.0-beta03/window-1.0.0-beta03.pom
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <!-- This module was also published with a richer model, Gradle metadata,  -->
   <!-- which should be used instead. Do not delete the following line which  -->
   <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
@@ -8,11 +8,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>androidx.window</groupId>
   <artifactId>window</artifactId>
-  <version>1.0.0-beta03</version>
+  <version>1.1.0-alpha01</version>
   <packaging>aar</packaging>
   <name>Jetpack WindowManager Library</name>
   <description>WindowManager Jetpack library. Currently only provides additional functionality on foldable devices.</description>
-  <url>https://developer.android.com/jetpack/androidx/releases/window#1.0.0-beta03</url>
+  <url>https://developer.android.com/jetpack/androidx/releases/window#1.1.0-alpha01</url>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>
@@ -32,21 +32,9 @@
   </scm>
   <dependencies>
     <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.5.30</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlinx</groupId>
-      <artifactId>kotlinx-coroutines-android</artifactId>
-      <version>1.5.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>androidx.annotation</groupId>
       <artifactId>annotation</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -62,5 +50,17 @@
       <scope>runtime</scope>
       <type>aar</type>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>1.6.20</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlinx</groupId>
+      <artifactId>kotlinx-coroutines-android</artifactId>
+      <version>1.6.0</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
-</project>
+</project>
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.md5 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.md5
new file mode 100644
index 000000000..fbe4f68d5
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.md5
@@ -0,0 +1 @@
+3a7e9c554c28bbb5814933f6464d283e
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha1 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha1
new file mode 100644
index 000000000..1cc620224
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha1
@@ -0,0 +1 @@
+13e27e6c97cdb97d3859180cdd3230ea06e00586
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha256 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha256
new file mode 100644
index 000000000..34c579f9c
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha256
@@ -0,0 +1 @@
+b648ed2be8f260eb4235cf3007fd1ab0fdec1a14698578be36086e4ca8ea70f4
+\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha512 b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha512
new file mode 100644
index 000000000..ffcdf8096
--- /dev/null
+++ b/current/androidx/m2repository/androidx/window/window/1.1.0-alpha01/window-1.1.0-alpha01.pom.sha512
@@ -0,0 +1 @@
+d805521f2fc209505bd379cdb7eab15c26a94654a7cfac674c87f7f0f45a133cc07e2ef6e8c921ed8919d24bd74ba621b20fe1e800bf070f7cdc6186866451b7
+\ No newline at end of file
diff --git a/current/androidx/manifests/androidx.media_media/AndroidManifest.xml b/current/androidx/manifests/androidx.media_media/AndroidManifest.xml
index 96c692b69..8ed30a668 100644
--- a/current/androidx/manifests/androidx.media_media/AndroidManifest.xml
+++ b/current/androidx/manifests/androidx.media_media/AndroidManifest.xml
@@ -21,10 +21,4 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="31" />
 
-    <queries>
-        <intent>
-            <action android:name="android.media.browse.MediaBrowserService" />
-        </intent>
-    </queries>
-
 </manifest>
 \ No newline at end of file
diff --git a/extensions/2/module-lib/api/framework-mediaprovider-removed.txt b/extensions/2/module-lib/api/framework-mediaprovider-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/module-lib/api/framework-mediaprovider-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/module-lib/api/framework-mediaprovider.txt b/extensions/2/module-lib/api/framework-mediaprovider.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/module-lib/api/framework-mediaprovider.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/module-lib/api/framework-sdkextensions-removed.txt b/extensions/2/module-lib/api/framework-sdkextensions-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/module-lib/api/framework-sdkextensions-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/module-lib/api/framework-sdkextensions.txt b/extensions/2/module-lib/api/framework-sdkextensions.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/module-lib/api/framework-sdkextensions.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/public/api/framework-mediaprovider-removed.txt b/extensions/2/public/api/framework-mediaprovider-removed.txt
new file mode 100644
index 000000000..183a7c9a8
--- /dev/null
+++ b/extensions/2/public/api/framework-mediaprovider-removed.txt
@@ -0,0 +1,43 @@
+// Signature format: 2.0
+package android.provider {
+
+  public static interface MediaStore.Audio.AudioColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String ALBUM = "album";
+    field public static final String ARTIST = "artist";
+    field public static final String COMPOSER = "composer";
+    field public static final String DURATION = "duration";
+  }
+
+  public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns {
+    field @Deprecated public static final String DESCRIPTION = "description";
+  }
+
+  public static interface MediaStore.Files.FileColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String TITLE = "title";
+  }
+
+  public static interface MediaStore.Images.ImageColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name";
+    field public static final String BUCKET_ID = "bucket_id";
+    field public static final String DATE_TAKEN = "datetaken";
+    field public static final String GROUP_ID = "group_id";
+    field public static final String ORIENTATION = "orientation";
+  }
+
+  public static interface MediaStore.MediaColumns extends android.provider.BaseColumns {
+    field @Deprecated public static final String GROUP_ID = "group_id";
+  }
+
+  public static interface MediaStore.Video.VideoColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String ALBUM = "album";
+    field public static final String ARTIST = "artist";
+    field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name";
+    field public static final String BUCKET_ID = "bucket_id";
+    field public static final String DATE_TAKEN = "datetaken";
+    field public static final String DURATION = "duration";
+    field public static final String GROUP_ID = "group_id";
+    field public static final String RESOLUTION = "resolution";
+  }
+
+}
+
diff --git a/extensions/2/public/api/framework-mediaprovider.txt b/extensions/2/public/api/framework-mediaprovider.txt
new file mode 100644
index 000000000..3ea467edc
--- /dev/null
+++ b/extensions/2/public/api/framework-mediaprovider.txt
@@ -0,0 +1,426 @@
+// Signature format: 2.0
+package android.provider {
+
+  public final class MediaStore {
+    ctor public MediaStore();
+    method public static boolean canManageMedia(@NonNull android.content.Context);
+    method @NonNull public static android.app.PendingIntent createDeleteRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>);
+    method @NonNull public static android.app.PendingIntent createFavoriteRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>, boolean);
+    method @NonNull public static android.app.PendingIntent createTrashRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>, boolean);
+    method @NonNull public static android.app.PendingIntent createWriteRequest(@NonNull android.content.ContentResolver, @NonNull java.util.Collection<android.net.Uri>);
+    method @Nullable public static android.net.Uri getDocumentUri(@NonNull android.content.Context, @NonNull android.net.Uri);
+    method @NonNull public static java.util.Set<java.lang.String> getExternalVolumeNames(@NonNull android.content.Context);
+    method public static long getGeneration(@NonNull android.content.Context, @NonNull String);
+    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>);
+    method public static boolean getRequireOriginal(@NonNull android.net.Uri);
+    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 isCurrentSystemGallery(@NonNull android.content.ContentResolver, int, @NonNull String);
+    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_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";
+    field public static final String AUTHORITY = "media";
+    field @NonNull public static final android.net.Uri AUTHORITY_URI;
+    field public static final String EXTRA_ACCEPT_ORIGINAL_MEDIA_FORMAT = "android.provider.extra.ACCEPT_ORIGINAL_MEDIA_FORMAT";
+    field public static final String EXTRA_BRIGHTNESS = "android.provider.extra.BRIGHTNESS";
+    field public static final String EXTRA_DURATION_LIMIT = "android.intent.extra.durationLimit";
+    field public static final String EXTRA_FINISH_ON_COMPLETION = "android.intent.extra.finishOnCompletion";
+    field public static final String EXTRA_FULL_SCREEN = "android.intent.extra.fullScreen";
+    field public static final String EXTRA_MEDIA_ALBUM = "android.intent.extra.album";
+    field public static final String EXTRA_MEDIA_ARTIST = "android.intent.extra.artist";
+    field public static final String EXTRA_MEDIA_CAPABILITIES = "android.provider.extra.MEDIA_CAPABILITIES";
+    field public static final String EXTRA_MEDIA_CAPABILITIES_UID = "android.provider.extra.MEDIA_CAPABILITIES_UID";
+    field public static final String EXTRA_MEDIA_FOCUS = "android.intent.extra.focus";
+    field public static final String EXTRA_MEDIA_GENRE = "android.intent.extra.genre";
+    field @Deprecated public static final String EXTRA_MEDIA_PLAYLIST = "android.intent.extra.playlist";
+    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";
+    field public static final String EXTRA_VIDEO_QUALITY = "android.intent.extra.videoQuality";
+    field public static final String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH = "android.media.action.MEDIA_PLAY_FROM_SEARCH";
+    field public static final String INTENT_ACTION_MEDIA_SEARCH = "android.intent.action.MEDIA_SEARCH";
+    field @Deprecated public static final String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";
+    field public static final String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA";
+    field public static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE";
+    field public static final String INTENT_ACTION_TEXT_OPEN_FROM_SEARCH = "android.media.action.TEXT_OPEN_FROM_SEARCH";
+    field public static final String INTENT_ACTION_VIDEO_CAMERA = "android.media.action.VIDEO_CAMERA";
+    field public static final String INTENT_ACTION_VIDEO_PLAY_FROM_SEARCH = "android.media.action.VIDEO_PLAY_FROM_SEARCH";
+    field public static final int MATCH_DEFAULT = 0; // 0x0
+    field public static final int MATCH_EXCLUDE = 2; // 0x2
+    field public static final int MATCH_INCLUDE = 1; // 0x1
+    field public static final int MATCH_ONLY = 3; // 0x3
+    field public static final String MEDIA_IGNORE_FILENAME = ".nomedia";
+    field public static final String MEDIA_SCANNER_VOLUME = "volume";
+    field public static final String META_DATA_REVIEW_GALLERY_PREWARM_SERVICE = "android.media.review_gallery_prewarm_service";
+    field public static final String META_DATA_STILL_IMAGE_CAMERA_PREWARM_SERVICE = "android.media.still_image_camera_preview_service";
+    field public static final String QUERY_ARG_INCLUDE_RECENTLY_UNMOUNTED_VOLUMES = "android:query-arg-recently-unmounted-volumes";
+    field public static final String QUERY_ARG_MATCH_FAVORITE = "android:query-arg-match-favorite";
+    field public static final String QUERY_ARG_MATCH_PENDING = "android:query-arg-match-pending";
+    field public static final String QUERY_ARG_MATCH_TRASHED = "android:query-arg-match-trashed";
+    field public static final String QUERY_ARG_RELATED_URI = "android:query-arg-related-uri";
+    field public static final String UNKNOWN_STRING = "<unknown>";
+    field public static final String VOLUME_EXTERNAL = "external";
+    field public static final String VOLUME_EXTERNAL_PRIMARY = "external_primary";
+    field public static final String VOLUME_INTERNAL = "internal";
+  }
+
+  public static final class MediaStore.Audio {
+    ctor public MediaStore.Audio();
+    method @Deprecated @Nullable public static String keyFor(@Nullable String);
+  }
+
+  public static interface MediaStore.Audio.AlbumColumns {
+    field public static final String ALBUM = "album";
+    field @Deprecated public static final String ALBUM_ART = "album_art";
+    field public static final String ALBUM_ID = "album_id";
+    field @Deprecated public static final String ALBUM_KEY = "album_key";
+    field public static final String ARTIST = "artist";
+    field public static final String ARTIST_ID = "artist_id";
+    field @Deprecated public static final String ARTIST_KEY = "artist_key";
+    field public static final String FIRST_YEAR = "minyear";
+    field public static final String LAST_YEAR = "maxyear";
+    field public static final String NUMBER_OF_SONGS = "numsongs";
+    field public static final String NUMBER_OF_SONGS_FOR_ARTIST = "numsongs_by_artist";
+  }
+
+  public static final class MediaStore.Audio.Albums implements android.provider.BaseColumns android.provider.MediaStore.Audio.AlbumColumns {
+    ctor public MediaStore.Audio.Albums();
+    method public static android.net.Uri getContentUri(String);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/albums";
+    field public static final String DEFAULT_SORT_ORDER = "album_key";
+    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/album";
+    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  public static interface MediaStore.Audio.ArtistColumns {
+    field public static final String ARTIST = "artist";
+    field @Deprecated public static final String ARTIST_KEY = "artist_key";
+    field public static final String NUMBER_OF_ALBUMS = "number_of_albums";
+    field public static final String NUMBER_OF_TRACKS = "number_of_tracks";
+  }
+
+  public static final class MediaStore.Audio.Artists implements android.provider.BaseColumns android.provider.MediaStore.Audio.ArtistColumns {
+    ctor public MediaStore.Audio.Artists();
+    method public static android.net.Uri getContentUri(String);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/artists";
+    field public static final String DEFAULT_SORT_ORDER = "artist_key";
+    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/artist";
+    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  public static final class MediaStore.Audio.Artists.Albums implements android.provider.BaseColumns android.provider.MediaStore.Audio.AlbumColumns {
+    ctor public MediaStore.Audio.Artists.Albums();
+    method public static android.net.Uri getContentUri(String, long);
+  }
+
+  public static interface MediaStore.Audio.AudioColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String ALBUM_ID = "album_id";
+    field @Deprecated public static final String ALBUM_KEY = "album_key";
+    field public static final String ARTIST_ID = "artist_id";
+    field @Deprecated public static final String ARTIST_KEY = "artist_key";
+    field public static final String BOOKMARK = "bookmark";
+    field public static final String GENRE = "genre";
+    field public static final String GENRE_ID = "genre_id";
+    field @Deprecated public static final String GENRE_KEY = "genre_key";
+    field public static final String IS_ALARM = "is_alarm";
+    field public static final String IS_AUDIOBOOK = "is_audiobook";
+    field public static final String IS_MUSIC = "is_music";
+    field public static final String IS_NOTIFICATION = "is_notification";
+    field public static final String IS_PODCAST = "is_podcast";
+    field public static final String IS_RECORDING = "is_recording";
+    field public static final String IS_RINGTONE = "is_ringtone";
+    field @Deprecated public static final String TITLE_KEY = "title_key";
+    field public static final String TITLE_RESOURCE_URI = "title_resource_uri";
+    field public static final String TRACK = "track";
+    field public static final String YEAR = "year";
+  }
+
+  public static final class MediaStore.Audio.Genres implements android.provider.BaseColumns android.provider.MediaStore.Audio.GenresColumns {
+    ctor public MediaStore.Audio.Genres();
+    method public static android.net.Uri getContentUri(String);
+    method public static android.net.Uri getContentUriForAudioId(String, int);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/genre";
+    field public static final String DEFAULT_SORT_ORDER = "name";
+    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/genre";
+    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  public static final class MediaStore.Audio.Genres.Members implements android.provider.MediaStore.Audio.AudioColumns {
+    ctor public MediaStore.Audio.Genres.Members();
+    method public static android.net.Uri getContentUri(String, long);
+    field public static final String AUDIO_ID = "audio_id";
+    field public static final String CONTENT_DIRECTORY = "members";
+    field public static final String DEFAULT_SORT_ORDER = "title_key";
+    field public static final String GENRE_ID = "genre_id";
+  }
+
+  public static interface MediaStore.Audio.GenresColumns {
+    field public static final String NAME = "name";
+  }
+
+  public static final class MediaStore.Audio.Media implements android.provider.MediaStore.Audio.AudioColumns {
+    ctor public MediaStore.Audio.Media();
+    method public static android.net.Uri getContentUri(String);
+    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
+    method @Deprecated @Nullable public static android.net.Uri getContentUriForPath(@NonNull String);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/audio";
+    field public static final String DEFAULT_SORT_ORDER = "title_key";
+    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/audio";
+    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field public static final String EXTRA_MAX_BYTES = "android.provider.MediaStore.extra.MAX_BYTES";
+    field public static final android.net.Uri INTERNAL_CONTENT_URI;
+    field public static final String RECORD_SOUND_ACTION = "android.provider.MediaStore.RECORD_SOUND";
+  }
+
+  @Deprecated public static final class MediaStore.Audio.Playlists implements android.provider.BaseColumns android.provider.MediaStore.Audio.PlaylistsColumns {
+    ctor @Deprecated public MediaStore.Audio.Playlists();
+    method @Deprecated public static android.net.Uri getContentUri(String);
+    field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/playlist";
+    field @Deprecated public static final String DEFAULT_SORT_ORDER = "name";
+    field @Deprecated public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/playlist";
+    field @Deprecated public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field @Deprecated public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  @Deprecated public static final class MediaStore.Audio.Playlists.Members implements android.provider.MediaStore.Audio.AudioColumns {
+    ctor @Deprecated public MediaStore.Audio.Playlists.Members();
+    method @Deprecated public static android.net.Uri getContentUri(String, long);
+    method @Deprecated public static boolean moveItem(android.content.ContentResolver, long, int, int);
+    field @Deprecated public static final String AUDIO_ID = "audio_id";
+    field @Deprecated public static final String CONTENT_DIRECTORY = "members";
+    field @Deprecated public static final String DEFAULT_SORT_ORDER = "play_order";
+    field @Deprecated public static final String PLAYLIST_ID = "playlist_id";
+    field @Deprecated public static final String PLAY_ORDER = "play_order";
+    field @Deprecated public static final String _ID = "_id";
+  }
+
+  @Deprecated public static interface MediaStore.Audio.PlaylistsColumns extends android.provider.MediaStore.MediaColumns {
+    field @Deprecated public static final String DATA = "_data";
+    field @Deprecated public static final String DATE_ADDED = "date_added";
+    field @Deprecated public static final String DATE_MODIFIED = "date_modified";
+    field @Deprecated public static final String NAME = "name";
+  }
+
+  public static final class MediaStore.Audio.Radio {
+    field public static final String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/radio";
+  }
+
+  public static interface MediaStore.DownloadColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String DOWNLOAD_URI = "download_uri";
+    field public static final String REFERER_URI = "referer_uri";
+  }
+
+  public static final class MediaStore.Downloads implements android.provider.MediaStore.DownloadColumns {
+    method @NonNull public static android.net.Uri getContentUri(@NonNull String);
+    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/download";
+    field @NonNull public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field @NonNull public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  public static final class MediaStore.Files {
+    ctor public MediaStore.Files();
+    method public static android.net.Uri getContentUri(String);
+    method public static android.net.Uri getContentUri(String, long);
+  }
+
+  public static interface MediaStore.Files.FileColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String MEDIA_TYPE = "media_type";
+    field public static final int MEDIA_TYPE_AUDIO = 2; // 0x2
+    field public static final int MEDIA_TYPE_DOCUMENT = 6; // 0x6
+    field public static final int MEDIA_TYPE_IMAGE = 1; // 0x1
+    field public static final int MEDIA_TYPE_NONE = 0; // 0x0
+    field @Deprecated public static final int MEDIA_TYPE_PLAYLIST = 4; // 0x4
+    field public static final int MEDIA_TYPE_SUBTITLE = 5; // 0x5
+    field public static final int MEDIA_TYPE_VIDEO = 3; // 0x3
+    field public static final String MIME_TYPE = "mime_type";
+    field public static final String PARENT = "parent";
+  }
+
+  public static final class MediaStore.Images {
+    ctor public MediaStore.Images();
+  }
+
+  public static interface MediaStore.Images.ImageColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String DESCRIPTION = "description";
+    field public static final String EXPOSURE_TIME = "exposure_time";
+    field public static final String F_NUMBER = "f_number";
+    field public static final String ISO = "iso";
+    field public static final String IS_PRIVATE = "isprivate";
+    field @Deprecated public static final String LATITUDE = "latitude";
+    field @Deprecated public static final String LONGITUDE = "longitude";
+    field @Deprecated public static final String MINI_THUMB_MAGIC = "mini_thumb_magic";
+    field @Deprecated public static final String PICASA_ID = "picasa_id";
+    field public static final String SCENE_CAPTURE_TYPE = "scene_capture_type";
+  }
+
+  public static final class MediaStore.Images.Media implements android.provider.MediaStore.Images.ImageColumns {
+    ctor public MediaStore.Images.Media();
+    method @Deprecated public static android.graphics.Bitmap getBitmap(android.content.ContentResolver, android.net.Uri) throws java.io.FileNotFoundException, java.io.IOException;
+    method public static android.net.Uri getContentUri(String);
+    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
+    method @Deprecated public static String insertImage(android.content.ContentResolver, String, String, String) throws java.io.FileNotFoundException;
+    method @Deprecated public static String insertImage(android.content.ContentResolver, android.graphics.Bitmap, String, String);
+    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
+    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String);
+    method @Deprecated public static android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[], String, String[], String);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/image";
+    field public static final String DEFAULT_SORT_ORDER = "bucket_display_name";
+    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  @Deprecated public static class MediaStore.Images.Thumbnails implements android.provider.BaseColumns {
+    ctor @Deprecated public MediaStore.Images.Thumbnails();
+    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long);
+    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);
+    method @Deprecated public static android.net.Uri getContentUri(String);
+    method @Deprecated @NonNull public static android.util.Size getKindSize(int);
+    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);
+    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);
+    method @Deprecated public static final android.database.Cursor query(android.content.ContentResolver, android.net.Uri, String[]);
+    method @Deprecated public static final android.database.Cursor queryMiniThumbnail(android.content.ContentResolver, long, int, String[]);
+    method @Deprecated public static final android.database.Cursor queryMiniThumbnails(android.content.ContentResolver, android.net.Uri, int, String[]);
+    field @Deprecated public static final String DATA = "_data";
+    field @Deprecated public static final String DEFAULT_SORT_ORDER = "image_id ASC";
+    field @Deprecated public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field @Deprecated public static final int FULL_SCREEN_KIND = 2; // 0x2
+    field @Deprecated public static final String HEIGHT = "height";
+    field @Deprecated public static final String IMAGE_ID = "image_id";
+    field @Deprecated public static final android.net.Uri INTERNAL_CONTENT_URI;
+    field @Deprecated public static final String KIND = "kind";
+    field @Deprecated public static final int MICRO_KIND = 3; // 0x3
+    field @Deprecated public static final int MINI_KIND = 1; // 0x1
+    field @Deprecated public static final String THUMB_DATA = "thumb_data";
+    field @Deprecated public static final String WIDTH = "width";
+  }
+
+  public static interface MediaStore.MediaColumns extends android.provider.BaseColumns {
+    field public static final String ALBUM = "album";
+    field public static final String ALBUM_ARTIST = "album_artist";
+    field public static final String ARTIST = "artist";
+    field public static final String AUTHOR = "author";
+    field public static final String BITRATE = "bitrate";
+    field public static final String BUCKET_DISPLAY_NAME = "bucket_display_name";
+    field public static final String BUCKET_ID = "bucket_id";
+    field public static final String CAPTURE_FRAMERATE = "capture_framerate";
+    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 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";
+    field public static final String DATE_TAKEN = "datetaken";
+    field public static final String DISC_NUMBER = "disc_number";
+    field public static final String DISPLAY_NAME = "_display_name";
+    field public static final String DOCUMENT_ID = "document_id";
+    field public static final String DURATION = "duration";
+    field public static final String GENERATION_ADDED = "generation_added";
+    field public static final String GENERATION_MODIFIED = "generation_modified";
+    field public static final String GENRE = "genre";
+    field public static final String HEIGHT = "height";
+    field public static final String INSTANCE_ID = "instance_id";
+    field public static final String IS_DOWNLOAD = "is_download";
+    field public static final String IS_DRM = "is_drm";
+    field public static final String IS_FAVORITE = "is_favorite";
+    field public static final String IS_PENDING = "is_pending";
+    field public static final String IS_TRASHED = "is_trashed";
+    field public static final String MIME_TYPE = "mime_type";
+    field public static final String NUM_TRACKS = "num_tracks";
+    field public static final String ORIENTATION = "orientation";
+    field public static final String ORIGINAL_DOCUMENT_ID = "original_document_id";
+    field public static final String OWNER_PACKAGE_NAME = "owner_package_name";
+    field public static final String RELATIVE_PATH = "relative_path";
+    field public static final String RESOLUTION = "resolution";
+    field public static final String SIZE = "_size";
+    field public static final String TITLE = "title";
+    field public static final String VOLUME_NAME = "volume_name";
+    field public static final String WIDTH = "width";
+    field public static final String WRITER = "writer";
+    field public static final String XMP = "xmp";
+    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[]);
+    field public static final String DEFAULT_SORT_ORDER = "_display_name";
+  }
+
+  public static final class MediaStore.Video.Media implements android.provider.MediaStore.Video.VideoColumns {
+    ctor public MediaStore.Video.Media();
+    method public static android.net.Uri getContentUri(String);
+    method @NonNull public static android.net.Uri getContentUri(@NonNull String, long);
+    field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/video";
+    field public static final String DEFAULT_SORT_ORDER = "title";
+    field public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field public static final android.net.Uri INTERNAL_CONTENT_URI;
+  }
+
+  @Deprecated public static class MediaStore.Video.Thumbnails implements android.provider.BaseColumns {
+    ctor @Deprecated public MediaStore.Video.Thumbnails();
+    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long);
+    method @Deprecated public static void cancelThumbnailRequest(android.content.ContentResolver, long, long);
+    method @Deprecated public static android.net.Uri getContentUri(String);
+    method @Deprecated @NonNull public static android.util.Size getKindSize(int);
+    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, int, android.graphics.BitmapFactory.Options);
+    method @Deprecated public static android.graphics.Bitmap getThumbnail(android.content.ContentResolver, long, long, int, android.graphics.BitmapFactory.Options);
+    field @Deprecated public static final String DATA = "_data";
+    field @Deprecated public static final String DEFAULT_SORT_ORDER = "video_id ASC";
+    field @Deprecated public static final android.net.Uri EXTERNAL_CONTENT_URI;
+    field @Deprecated public static final int FULL_SCREEN_KIND = 2; // 0x2
+    field @Deprecated public static final String HEIGHT = "height";
+    field @Deprecated public static final android.net.Uri INTERNAL_CONTENT_URI;
+    field @Deprecated public static final String KIND = "kind";
+    field @Deprecated public static final int MICRO_KIND = 3; // 0x3
+    field @Deprecated public static final int MINI_KIND = 1; // 0x1
+    field @Deprecated public static final String VIDEO_ID = "video_id";
+    field @Deprecated public static final String WIDTH = "width";
+  }
+
+  public static interface MediaStore.Video.VideoColumns extends android.provider.MediaStore.MediaColumns {
+    field public static final String BOOKMARK = "bookmark";
+    field public static final String CATEGORY = "category";
+    field public static final String COLOR_RANGE = "color_range";
+    field public static final String COLOR_STANDARD = "color_standard";
+    field public static final String COLOR_TRANSFER = "color_transfer";
+    field public static final String DESCRIPTION = "description";
+    field public static final String IS_PRIVATE = "isprivate";
+    field public static final String LANGUAGE = "language";
+    field @Deprecated public static final String LATITUDE = "latitude";
+    field @Deprecated public static final String LONGITUDE = "longitude";
+    field @Deprecated public static final String MINI_THUMB_MAGIC = "mini_thumb_magic";
+    field public static final String TAGS = "tags";
+  }
+
+}
+
diff --git a/extensions/2/public/api/framework-sdkextensions-removed.txt b/extensions/2/public/api/framework-sdkextensions-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/public/api/framework-sdkextensions-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/public/api/framework-sdkextensions.txt b/extensions/2/public/api/framework-sdkextensions.txt
new file mode 100644
index 000000000..180afea04
--- /dev/null
+++ b/extensions/2/public/api/framework-sdkextensions.txt
@@ -0,0 +1,10 @@
+// Signature format: 2.0
+package android.os.ext {
+
+  public class SdkExtensions {
+    method @NonNull public static java.util.Map<java.lang.Integer,java.lang.Integer> getAllExtensionVersions();
+    method public static int getExtensionVersion(int);
+  }
+
+}
+
diff --git a/extensions/2/system/api/framework-mediaprovider-removed.txt b/extensions/2/system/api/framework-mediaprovider-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/system/api/framework-mediaprovider-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/system/api/framework-mediaprovider.txt b/extensions/2/system/api/framework-mediaprovider.txt
new file mode 100644
index 000000000..d29a6ed0d
--- /dev/null
+++ b/extensions/2/system/api/framework-mediaprovider.txt
@@ -0,0 +1,15 @@
+// Signature format: 2.0
+package android.provider {
+
+  public final class MediaStore {
+    method @NonNull public static android.net.Uri rewriteToLegacy(@NonNull android.net.Uri);
+    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 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/extensions/2/system/api/framework-sdkextensions-removed.txt b/extensions/2/system/api/framework-sdkextensions-removed.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/system/api/framework-sdkextensions-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/2/system/api/framework-sdkextensions.txt b/extensions/2/system/api/framework-sdkextensions.txt
new file mode 100644
index 000000000..d802177e2
--- /dev/null
+++ b/extensions/2/system/api/framework-sdkextensions.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/extensions/README.md b/extensions/README.md
index 87b8a85c5..834aafbc5 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -7,4 +7,5 @@ latest finalized version for each API surface.
 
 **Version history**:
 
-- 1: Finalized together with Android S / 31
-\ No newline at end of file
+- 1: Finalized together with Android S / 31 (all modules)
+- 2: Finalized in March 2022 between S and T (mediaprovider, sdkextensions)
diff --git a/tools/Android.bp b/tools/Android.bp
index 85d47a968..57e61faec 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -22,7 +22,11 @@ cc_prebuilt_library_shared {
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     target: {
-        linux_glibc_x86_64: {
+        glibc_x86_64: {
+            srcs: ["linux/lib64/libLLVM_android.so"],
+        },
+        musl_x86_64: {
+            // TODO(ccross): add a musl specific version when a musl SDK build exists
             srcs: ["linux/lib64/libLLVM_android.so"],
         },
         darwin_x86_64: {
@@ -46,7 +50,11 @@ cc_prebuilt_library_shared {
     // TODO(b/153609531): remove when no longer needed.
     native_bridge_supported: true,
     target: {
-        linux_glibc_x86_64: {
+        glibc_x86_64: {
+            srcs: ["linux/lib64/libclang_android.so"],
+        },
+        musl_x86_64: {
+            // TODO(ccross): add a musl specific version when a musl SDK build exists
             srcs: ["linux/lib64/libclang_android.so"],
         },
         darwin_x86_64: {
@@ -133,4 +141,4 @@ genrule {
         "darwin/lib64/libc++abi.1.dylib",
     ],
     out: ["lld.zip"],
-}
-\ No newline at end of file
+}
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index a1ddbd996..9b183ebbe 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -10,6 +10,7 @@ import subprocess
 from shutil import copyfile, rmtree, which, move
 from distutils.version import LooseVersion
 from functools import reduce
+from pathlib import Path
 import six
 import urllib.request, urllib.parse, urllib.error
 
@@ -20,7 +21,10 @@ gmaven_dir = os.path.join(current_path, 'gmaven')
 extras_dir = os.path.join(current_path, 'extras')
 buildtools_dir = 'tools'
 jetifier_dir = os.path.join(buildtools_dir, 'jetifier', 'jetifier-standalone')
-
+repo_root_dir = Path(sys.argv[0]).resolve().parents[3]
+extension_sdk_finalization_cmd = '%s -b {bug} -f {extension_version} {build_id}' % (
+    "packages/modules/common/tools/finalize_sdk.py"
+)
 temp_dir = os.path.join(os.getcwd(), "support_tmp")
 os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
 git_dir = os.getcwd()
@@ -868,7 +872,11 @@ parser.add_argument(
     help='If specified, updates only the Android Platform')
 parser.add_argument(
     '-f', '--finalize_sdk', type=int,
-    help='If specified, imports the source build as the specified finalized SDK version')
+    help='Finalize the build as the specified SDK version. Must be used together with -e')
+parser.add_argument(
+    '-e', '--finalize_extension', type=int,
+    help='Finalize the build as the specified extension SDK version. Must be used together with -f')
+parser.add_argument('--bug', type=int, help='The bug number to add to the commit message.')
 parser.add_argument(
     '--sdk_target',
     default=framework_sdk_target,
@@ -890,6 +898,7 @@ parser.add_argument(
     help='If specified, then fetch artifacts with tooling that works on BeyondCorp devices')
 args = parser.parse_args()
 args.file = True
+
 if not args.source and (args.platform or args.buildtools \
                 or args.jetifier or args.androidx or args.material \
                 or args.finalize_sdk or args.constraint):
@@ -897,13 +906,19 @@ if not args.source and (args.platform or args.buildtools \
     sys.exit(1)
 if not (args.gmaven or args.platform or args.buildtools \
                 or args.jetifier or args.androidx or args.material \
-                or args.finalize_sdk or args.constraint):
+                or args.finalize_sdk or args.finalize_extension or args.constraint):
     parser.error("You must specify at least one target to update")
     sys.exit(1)
 if (args.constraint or args.material or args.androidx or args.gmaven) \
         and which('pom2bp') is None:
     parser.error("Cannot find pom2bp in path; please run lunch to set up build environment. You may also need to run 'm pom2bp' if it hasn't been built already.")
     sys.exit(1)
+if (args.finalize_sdk is None) != (args.finalize_extension is None):
+    parser.error("Either both or neither of -e and -f must be specified.")
+    sys.exit(1)
+if args.finalize_sdk and not args.bug:
+    parser.error("Specifying a bug ID with --bug is required when finalizing an SDK.")
+    sys.exit(1)
 
 if uncommittedChangesExist():
     if args.commit_first:
@@ -914,6 +929,10 @@ if uncommittedChangesExist():
     print_e('FAIL: There are uncommitted changes here. Please commit or stash before continuing, because %s will run "git reset --hard" if execution fails' % os.path.basename(__file__))
     sys.exit(1)
 
+commit_message_suffix = ""
+if args.bug:
+    commit_message_suffix = "\n\nBug: %d" % args.bug
+
 try:
     components = None
     if args.constraint:
@@ -950,15 +969,21 @@ try:
             sys.exit(1)
     if args.finalize_sdk:
         n = args.finalize_sdk
-        if finalize_sdk(args.sdk_target, getBuildId(args), n):
-            # We commit the finalized dir separately from the current sdk update.
-            msg = "Import final sdk version %d from build %s" % (n, getBuildId(args).url_id)
-            subprocess.check_call(['git', 'add', '%d' % n])
-            subprocess.check_call(['git', 'add', 'Android.bp'])
-            subprocess.check_call(['git', 'commit', '-m', msg])
-        else:
+        if not finalize_sdk(args.sdk_target, getBuildId(args), n):
             print_e('Failed to finalize SDK %d, aborting...' % n)
             sys.exit(1)
+        # We commit the finalized dir separately from the current sdk update.
+        msg = "Import final sdk version %d from build %s%s" % (n, getBuildId(args).url_id, commit_message_suffix)
+        subprocess.check_call(['git', 'add', '%d' % n])
+        subprocess.check_call(['git', 'add', 'Android.bp'])
+        subprocess.check_call(['git', 'commit', '-m', msg])
+
+        # Finalize extension sdk level
+        cmd = extension_sdk_finalization_cmd.format(
+            bug=args.bug,
+            extension_version=args.finalize_extension,
+            build_id=getBuildId(args).url_id)
+        subprocess.check_call(cmd.split(' '), cwd=repo_root_dir.resolve())
     if args.material:
         if update_material(getFile(args)):
             components = append(components, 'intermediate-AndroidX Design Library')
@@ -983,11 +1008,11 @@ try:
         src_msg = "local Maven ZIP"
     else:
         src_msg = "build %s" % (getBuildId(args).url_id)
-    msg = "Import %s from %s\n\n%s" % (components, src_msg, flatten(sys.argv))
+    msg = "Import %s from %s\n\n%s%s" % (components, src_msg, flatten(sys.argv), commit_message_suffix)
     subprocess.check_call(['git', 'commit', '-m', msg])
     if args.finalize_sdk:
-        print('NOTE: Created two commits:')
-        subprocess.check_call(['git', 'log', '-2', '--oneline'])
+        print('NOTE: Created three commits:')
+        subprocess.check_call(['git', 'log', '-3', '--oneline'])
     print('Remember to test this change before uploading it to Gerrit!')
 
 finally:
author	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2022-04-28 19:48:55 +0000
committer	Android Build Coastguard Worker <android-build-coastguard-worker@google.com>	2022-04-28 19:48:55 +0000
commit	6079ecd5046b41b791b9c4494a9d575893ffb43e (patch)
tree	fabd43a3cd84376983abfa9e0e619bc116e3fa8c
parent	9184ed1a8f0f9609aaa2e0ef6a7ae40cafa750ac (diff)
parent	90fb2d68e3c50066e12e44c96a2f893436f29854 (diff)
download	sdk-6079ecd5046b41b791b9c4494a9d575893ffb43e.tar.gz