Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: I1a254384d28122e4fbe7ef27396f7aa8cba963cd
Change-Id: Ia52d0642ad0106998d7e8ff9bd19f4a31116a0f3

33 files changed, 52 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index ded387c..0fb3c33 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,7 +20,7 @@ license {
 android_library_import {
     name: "glide-prebuilt",
     aars: [
-        "com/github/bumptech/glide/glide/4.12.0/glide-4.12.0.aar",
+        "com/github/bumptech/glide/glide/4.16.0/glide-4.16.0.aar",
     ],
     jetifier: true,
     apex_available: [
@@ -34,7 +34,7 @@ android_library_import {
 android_library_import {
     name: "glide-disklrucache-prebuilt",
     aars: [
-        "com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.aar",
+        "com/github/bumptech/glide/disklrucache/4.16.0/disklrucache-4.16.0.aar",
     ],
     jetifier: true,
     apex_available: [
@@ -48,7 +48,7 @@ android_library_import {
 android_library_import {
     name: "glide-gifdecoder-prebuilt",
     aars: [
-        "com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0.aar",
+        "com/github/bumptech/glide/gifdecoder/4.16.0/gifdecoder-4.16.0.aar",
     ],
     jetifier: true,
     apex_available: [
@@ -60,10 +60,38 @@ android_library_import {
 }
 
 java_import {
+  name: "glide-integration-recyclerview-prebuilt",
+  jars: [
+    "com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT.jar",
+  ],
+  jetifier: true,
+  apex_available: [
+      "com.android.mediaprovider",
+      "//apex_available:platform",
+  ],
+  sdk_version: "current",
+  min_sdk_version: "14",
+}
+
+java_import {
+  name: "glide-integration-webpdecoder-prebuilt",
+  jars: [
+    "com/github/bumptech/glide/integration/webpdecoder/webpdecoder-2.6.4.16.0-sources.jar",
+  ],
+  jetifier: true,
+  apex_available: [
+      "com.android.mediaprovider",
+      "//apex_available:platform",
+  ],
+  sdk_version: "current",
+  min_sdk_version: "14",
+}
+
+java_import {
     name: "glide-annotation-and-compiler-prebuilt",
     jars: [
-        "com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar",
-        "com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar",
+        "com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0.jar",
+        "com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0.jar",
     ],
     jetifier: true,
     apex_available: [
@@ -77,8 +105,8 @@ java_import {
 java_import_host {
     name: "glide-annotation-and-compiler-prebuilt-host",
     jars: [
-        "com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar",
-        "com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar",
+        "com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0.jar",
+        "com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0.jar",
     ],
 }
 
@@ -89,23 +117,27 @@ java_plugin {
     use_tools_jar: true,
 }
 
+// Pin Glide version for //packages/apps/Dialer as it still relies on android.support
+// rather than androidx versions. (Rather than preventing upgrades to all of prebuilt.)
 java_import {
     name: "dialer-glide-target-deps",
     visibility: ["//packages/apps/Dialer"],
     jars: [
-        "com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT.jar",
-        "com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT.jar",
-        "com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar",
-        "com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar",
+        "com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0.jar",
+        "com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0.jar",
+        "com/github/bumptech/glide/glide/4.5.0/glide-4.5.0.jar",
+        "com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0.jar",
     ],
     sdk_version: "current",
 }
 
+// Pin Glide version for //packages/apps/Dialer as it still relies on android.support
+// rather than androidx versions. (Rather than preventing upgrades to all of prebuilt.)
 java_import_host {
     name: "dialer-glide-host-deps",
     visibility: ["//packages/apps/Dialer"],
     jars: [
-        "com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar",
-        "com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar",
+        "com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0.jar",
+        "com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0.jar",
     ],
 }
diff --git a/README.txt b/README.txt
index de80124..0f7e67d 100644
--- a/README.txt
+++ b/README.txt
@@ -1 +1 @@
-This maven repository was synced to google3 CL 183322383
+This maven repository was synced to google3 CL 576488323
diff --git a/com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0-sources.jar b/com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0-sources.jar
new file mode 100644
index 0000000..8e29a1a
--- /dev/null
+++ b/com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0-sources.jar
diff --git a/com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0.jar b/com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0.jar
new file mode 100644
index 0000000..004e433
--- /dev/null
+++ b/com/github/bumptech/glide/annotation/4.16.0/annotations-4.16.0.jar
diff --git a/com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0-sources.jar b/com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0-sources.jar
new file mode 100755
index 0000000..b759004
--- /dev/null
+++ b/com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0-sources.jar
diff --git a/com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0.jar b/com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0.jar
new file mode 100755
index 0000000..0941e08
--- /dev/null
+++ b/com/github/bumptech/glide/annotation/4.5.0/annotation-4.5.0.jar
diff --git a/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT-sources.jar b/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT-sources.jar
index b759004..81d702c 100755
--- a/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT-sources.jar
+++ b/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT-sources.jar
diff --git a/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar b/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar
index 0941e08..4b13083 100755
--- a/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar
+++ b/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar
diff --git a/com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0-sources.jar b/com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0-sources.jar
new file mode 100644
index 0000000..3d26868
--- /dev/null
+++ b/com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0-sources.jar
diff --git a/com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0.jar b/com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0.jar
new file mode 100644
index 0000000..65bf05c
--- /dev/null
+++ b/com/github/bumptech/glide/compiler/4.16.0/compiler-4.16.0.jar
diff --git a/com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0-sources.jar b/com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0-sources.jar
new file mode 100755
index 0000000..c8968e4
--- /dev/null
+++ b/com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0-sources.jar
diff --git a/com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0.jar b/com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0.jar
new file mode 100755
index 0000000..e9bd13b
--- /dev/null
+++ b/com/github/bumptech/glide/compiler/4.5.0/compiler-4.5.0.jar
diff --git a/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT-sources.jar b/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT-sources.jar
index c8968e4..fec3ab4 100755
--- a/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT-sources.jar
+++ b/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT-sources.jar
diff --git a/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar b/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar
index e9bd13b..ede0f1e 100755
--- a/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar
+++ b/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar
diff --git a/com/github/bumptech/glide/disklrucache/4.16.0/disklrucache-4.16.0.aar b/com/github/bumptech/glide/disklrucache/4.16.0/disklrucache-4.16.0.aar
new file mode 100644
index 0000000..0a085fc
--- /dev/null
+++ b/com/github/bumptech/glide/disklrucache/4.16.0/disklrucache-4.16.0.aar
diff --git a/com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0-sources.jar b/com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0-sources.jar
new file mode 100755
index 0000000..6480beb
--- /dev/null
+++ b/com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0-sources.jar
diff --git a/com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0.jar b/com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0.jar
new file mode 100755
index 0000000..35d8ecd
--- /dev/null
+++ b/com/github/bumptech/glide/disklrucache/4.5.0/disklrucache-4.5.0.jar
diff --git a/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT-sources.jar b/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT-sources.jar
index 6480beb..dc06bda 100755
--- a/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT-sources.jar
+++ b/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT-sources.jar
diff --git a/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT.jar b/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT.jar
index 35d8ecd..800f4cb 100755
--- a/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT.jar
+++ b/com/github/bumptech/glide/disklrucache/SNAPSHOT/disklrucache-SNAPSHOT.jar
diff --git a/com/github/bumptech/glide/gifdecoder/4.16.0/gifdecoder-4.16.0.aar b/com/github/bumptech/glide/gifdecoder/4.16.0/gifdecoder-4.16.0.aar
new file mode 100644
index 0000000..3b82d6e
--- /dev/null
+++ b/com/github/bumptech/glide/gifdecoder/4.16.0/gifdecoder-4.16.0.aar
diff --git a/com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0-sources.jar b/com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0-sources.jar
new file mode 100755
index 0000000..90454cb
--- /dev/null
+++ b/com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0-sources.jar
diff --git a/com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0.jar b/com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0.jar
new file mode 100755
index 0000000..2d6b064
--- /dev/null
+++ b/com/github/bumptech/glide/gifdecoder/4.5.0/gifdecoder-4.5.0.jar
diff --git a/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT-sources.jar b/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT-sources.jar
index 90454cb..bd89068 100755
--- a/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT-sources.jar
+++ b/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT-sources.jar
diff --git a/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT.jar b/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT.jar
index 2d6b064..0d463df 100755
--- a/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT.jar
+++ b/com/github/bumptech/glide/gifdecoder/SNAPSHOT/gifdecoder-SNAPSHOT.jar
diff --git a/com/github/bumptech/glide/glide/4.16.0/glide-4.16.0.aar b/com/github/bumptech/glide/glide/4.16.0/glide-4.16.0.aar
new file mode 100644
index 0000000..91444c3
--- /dev/null
+++ b/com/github/bumptech/glide/glide/4.16.0/glide-4.16.0.aar
diff --git a/com/github/bumptech/glide/glide/4.5.0/glide-4.5.0-sources.jar b/com/github/bumptech/glide/glide/4.5.0/glide-4.5.0-sources.jar
new file mode 100755
index 0000000..55bf6a6
--- /dev/null
+++ b/com/github/bumptech/glide/glide/4.5.0/glide-4.5.0-sources.jar
diff --git a/com/github/bumptech/glide/glide/4.5.0/glide-4.5.0.jar b/com/github/bumptech/glide/glide/4.5.0/glide-4.5.0.jar
new file mode 100755
index 0000000..e540862
--- /dev/null
+++ b/com/github/bumptech/glide/glide/4.5.0/glide-4.5.0.jar
diff --git a/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT-sources.jar b/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT-sources.jar
index 55bf6a6..a9ad559 100755
--- a/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT-sources.jar
+++ b/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT-sources.jar
diff --git a/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar b/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar
index e540862..d28a2ab 100755
--- a/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar
+++ b/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar
diff --git a/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT-sources.jar b/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT-sources.jar
new file mode 100755
index 0000000..60ff13f
--- /dev/null
+++ b/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT-sources.jar
diff --git a/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT.jar b/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT.jar
new file mode 100755
index 0000000..ac76826
--- /dev/null
+++ b/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT.jar
diff --git a/com/github/bumptech/glide/integration/webpdecoder/webpdecoder-2.6.4.16.0-sources.jar b/com/github/bumptech/glide/integration/webpdecoder/webpdecoder-2.6.4.16.0-sources.jar
new file mode 100644
index 0000000..bf13493
--- /dev/null
+++ b/com/github/bumptech/glide/integration/webpdecoder/webpdecoder-2.6.4.16.0-sources.jar
diff --git a/update_repo.sh b/update_repo.sh
index 352a9c1..dbc06b7 100755
--- a/update_repo.sh
+++ b/update_repo.sh
@@ -15,6 +15,8 @@ blaze build \
    third_party/java_src/android_libs/glide/annotation:libannotation-src.jar \
    third_party/java_src/android_libs/glide/annotation/compiler:libcompiler_lib.jar \
    third_party/java_src/android_libs/glide/annotation/compiler:libcompiler_lib-src.jar \
+   third_party/java_src/android_libs/glide/integration/recyclerview:librecyclerview.jar \
+   third_party/java_src/android_libs/glide/integration/recyclerview:librecyclerview-src.jar \
    third_party/java_src/android_libs/glide/library/src/main:libglide.jar \
    third_party/java_src/android_libs/glide/library/src/main:libglide-src.jar \
    third_party/java_src/android_libs/glide/third_party/disklrucache:libdisklrucache.jar \
@@ -30,6 +32,10 @@ cp -f blaze-bin/third_party/java_src/android_libs/glide/annotation/compiler/libc
    $TARGET_DIR/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar
 cp -f blaze-bin/third_party/java_src/android_libs/glide/annotation/compiler/libcompiler_lib-src.jar \
    $TARGET_DIR/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT-sources.jar
+cp -f blaze-bin/third_party/java_src/android_libs/glide/integration/recyclerview/librecyclerview.jar \
+   $TARGET_DIR/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT.jar
+cp -f blaze-bin/third_party/java_src/android_libs/glide/integration/recyclerview/librecyclerview-src.jar \
+   $TARGET_DIR/com/github/bumptech/glide/integration/recyclerview/SNAPSHOT/recyclerview-SNAPSHOT-sources.jar
 cp -f blaze-bin/third_party/java_src/android_libs/glide/library/src/main/libglide.jar \
    $TARGET_DIR/com/github/bumptech/glide/glide/SNAPSHOT/glide-SNAPSHOT.jar
 cp -f blaze-bin/third_party/java_src/android_libs/glide/library/src/main/libglide-src.jar \