From d91760eefcee7b2c960513e9f32b368c92fa6d75 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Wed, 3 Jul 2024 12:44:31 -0400
Subject: [PATCH] Upgrade AndroidX Media3 to 1.3.1.

---
 dependencies.gradle.kts          |   2 +-
 gradle/verification-metadata.xml | 132 ++++++++++++++++++-------------
 2 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/dependencies.gradle.kts b/dependencies.gradle.kts
index cd6bad526a..88f7e44cc9 100644
--- a/dependencies.gradle.kts
+++ b/dependencies.gradle.kts
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
       version("androidx-camera", "1.3.4")
       version("androidx-fragment", "1.6.2")
       version("androidx-lifecycle", "2.7.0")
-      version("androidx-media3", "1.2.1")
+      version("androidx-media3", "1.3.1")
       version("androidx-navigation", "2.7.6")
       version("androidx-window", "1.2.0")
       version("exoplayer", "2.19.0")
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a97f7aa26f..833ab52774 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -2244,73 +2244,65 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.0.0">
+      <component name="media" group="androidx.media" version="1.0.0">
          <artifact name="media-1.0.0.aar">
             <sha256 value="b23b527b2bac870c4a7451e6982d7132e413e88d7f27dbeb1fc7640a720cd9ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.4.3">
-         <artifact name="media-1.4.3.aar">
-            <sha256 value="89a83d648dafeb5160a76dcdf996735d746f410c115166cf15693b5208d73d95" origin="Generated by Gradle"/>
+      <component group="androidx.media" name="media" version="1.7.0">
+         <artifact name="media-1.7.0.aar">
+            <sha256 value="81a199ee87c6d3d59fb35f7dbec71b3f1d507128611099b6ac3a4b1c5a0bf1f9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media-1.4.3.module">
-            <sha256 value="21e0d4c4c0565106558eab24e6c1344866a300dfacad4732d942c9e920ac8ff9" origin="Generated by Gradle"/>
+         <artifact name="media-1.7.0.module">
+            <sha256 value="996f646284a2d981899cdac3282249e0e1f20ab82838a0875dc66bd264d24961" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media" name="media" version="1.6.0">
-         <artifact name="media-1.6.0.aar">
-            <sha256 value="fe628847d8f909ca8f23d685061f9a7684aa0c9bc9c1b201c4ff6eb7b3372828" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-common" version="1.3.1">
+         <artifact name="media3-common-1.3.1.aar">
+            <sha256 value="40cf8c6c07f75afd0b213d694fd7ac478c726a94e64fa7ac1833c17752f3e6f4" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media-1.6.0.module">
-            <sha256 value="44d12bf8f7ce879f03af00ba01b556751d0073440fed1150128e903974c4def0" origin="Generated by Gradle"/>
+         <artifact name="media3-common-1.3.1.module">
+            <sha256 value="e03c4fa9d04188ffd7ca74ab2f8a2a0560afd24e151914c0af112c26d0e231af" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-common" version="1.2.1">
-         <artifact name="media3-common-1.2.1.aar">
-            <sha256 value="3ddd33e8c114b61276adc4eab0e2c87854093fc678e8bb8c30be3ba96fd3b717" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-container" version="1.3.1">
+         <artifact name="media3-container-1.3.1.aar">
+            <sha256 value="c6103c11666e03ceabeb6454b5bf0b9b51fdc93647f84dd02ee869a9c086269e" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-common-1.2.1.module">
-            <sha256 value="24f572989e6cb86468a0c7ef74b8b5df11d6d9fcb8f7a0d1c24d8bf017d77eb2" origin="Generated by Gradle"/>
+         <artifact name="media3-container-1.3.1.module">
+            <sha256 value="1d3b35b97c19501ba3e0c0001511bef9526fc18d52f241471578922c99ee7f95" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-container" version="1.2.1">
-         <artifact name="media3-container-1.2.1.aar">
-            <sha256 value="e67d8b50fdb174aa23238f79b3583a485caca9658524b506b5ead6e9c47d1b64" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-database" version="1.3.1">
+         <artifact name="media3-database-1.3.1.aar">
+            <sha256 value="8386d2c445d194268d4af2d63abb31b028da5f742fc38c6365bc2c40ab641383" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-container-1.2.1.module">
-            <sha256 value="9005eb3c4693e829d3393c849f90a27138bc0ef3ccfbb7ca5f1c6d74ddcd3771" origin="Generated by Gradle"/>
+         <artifact name="media3-database-1.3.1.module">
+            <sha256 value="51df60a97ed7dcd7d35ecb174659bc0a9ee13ed9c15f239c888be28183f1e874" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-database" version="1.2.1">
-         <artifact name="media3-database-1.2.1.aar">
-            <sha256 value="254d600819ea03ec4c21e83c3abfefd22c1d1864074e5caaa753188f6c451195" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-datasource" version="1.3.1">
+         <artifact name="media3-datasource-1.3.1.aar">
+            <sha256 value="ad94437e3c3dc5b9fb4a5c2dc64aa912a91125519742ec2fc3ae9ebfacc62381" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-database-1.2.1.module">
-            <sha256 value="d932fb4d0f211264a98f128240fa1e5eb55a4db233b333b89c0b65f6a1d61e18" origin="Generated by Gradle"/>
+         <artifact name="media3-datasource-1.3.1.module">
+            <sha256 value="5c33611613f1f65d0e05ca01fb989f3af7be992cd8daef61ef528b5e6243d75f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-datasource" version="1.2.1">
-         <artifact name="media3-datasource-1.2.1.aar">
-            <sha256 value="6da0f6885c853a1ff9e2874f8ecf684d7b8d18d45d8c18bc1b7c495f05a5b4d5" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-decoder" version="1.3.1">
+         <artifact name="media3-decoder-1.3.1.aar">
+            <sha256 value="c4799cd411061a654ad9c73fbc3d1a95945fce40f1bbceaf219e17b8a56fa1c1" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-datasource-1.2.1.module">
-            <sha256 value="1f4c6af52a332bc85f729f10e7a49e1fbdb884293bdfa9c0149d9b88e1640f78" origin="Generated by Gradle"/>
+         <artifact name="media3-decoder-1.3.1.module">
+            <sha256 value="a9e432a7cd0722dfbf1f9d3dcf180103bf518826de12300825a391dc3c086442" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-decoder" version="1.2.1">
-         <artifact name="media3-decoder-1.2.1.aar">
-            <sha256 value="8e448a83aff47c7eadb4dbdbfce48086adcdf850bec833450ae69206f83e276d" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-exoplayer" version="1.3.1">
+         <artifact name="media3-exoplayer-1.3.1.aar">
+            <sha256 value="00c4be0107fcb95ce62d5f255e0e07b169f25bfcda820054888e26a89bf0647f" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-decoder-1.2.1.module">
-            <sha256 value="bf37a49e17e4589ceb3148c0c9314cf4b5d87903c78b316de3809cd21daf70bc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="androidx.media3" name="media3-exoplayer" version="1.2.1">
-         <artifact name="media3-exoplayer-1.2.1.aar">
-            <sha256 value="85204c2fbcb4ea68fd11b9c45da16b691898147a21e3e9d95796ad5b45c41f30" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="media3-exoplayer-1.2.1.module">
-            <sha256 value="197a1c69d1aeb7a71b8c60a79579a7e8db19c53c780d32b129747d5a54a7ad34" origin="Generated by Gradle"/>
+         <artifact name="media3-exoplayer-1.3.1.module">
+            <sha256 value="048ba3612f9a1c88de968b27e345faaf831c71d77c7dcc1abc840cc9ac6fda76" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.media3" name="media3-extractor" version="1.2.1">
@@ -2321,20 +2313,28 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="626d3549cb3d820e7788499d2d435bb93a74b9b92357acb494cf0912db1c9df5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-session" version="1.2.1">
-         <artifact name="media3-session-1.2.1.aar">
-            <sha256 value="acf6af7714fb6a055966845be67e3c6e43284ba2ef77e34249cba7080be30717" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-extractor" version="1.3.1">
+         <artifact name="media3-extractor-1.3.1.aar">
+            <sha256 value="54400e411960da947d85567bbce3e752fade6bcb7d075c122a4e2cd05379dc62" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-session-1.2.1.module">
-            <sha256 value="6b7b282a2694ee908dc30268e31141f9119314f86c61dde8fbc0621d9a328e2d" origin="Generated by Gradle"/>
+         <artifact name="media3-extractor-1.3.1.module">
+            <sha256 value="1bc5f81099da08e99871eca3f2f2266806ef84a32499aeceb1dd6f8c80232329" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.media3" name="media3-ui" version="1.2.1">
-         <artifact name="media3-ui-1.2.1.aar">
-            <sha256 value="d20c0cfb29b9e412e1941fc26d856318d1af912848e3deb972856950f661cadf" origin="Generated by Gradle"/>
+      <component group="androidx.media3" name="media3-session" version="1.3.1">
+         <artifact name="media3-session-1.3.1.aar">
+            <sha256 value="83448db23fe252e6f0fc3158420bba87d5ca7ddf7f3a36153d0d387130f8cd29" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="media3-ui-1.2.1.module">
-            <sha256 value="e2531707a9e6c2f64b2a2b182ba110de08e9c96201abffcf6432d4261c7ac016" origin="Generated by Gradle"/>
+         <artifact name="media3-session-1.3.1.module">
+            <sha256 value="2fcfe064bf6c4a713926663836f47a360742aedbc2baa9677315cc7a10d77ed9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.media3" name="media3-ui" version="1.3.1">
+         <artifact name="media3-ui-1.3.1.aar">
+            <sha256 value="a8d206f395838a06b82b0789e7200868dabb26b9c7207e98cc3b3196041c1c9d" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-ui-1.3.1.module">
+            <sha256 value="043282ebb04a9d29ce8777bebb4e3ff3b59b257f343348ee9a54b6456688eb0f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.multidex" name="multidex" version="2.0.1">
@@ -4701,6 +4701,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="6ebd22ca1b9d8ec06d41de8d64e0596981d9607b42035f9ed374f9de271a481a" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.errorprone" name="error_prone_annotations" version="2.21.1">
+         <artifact name="error_prone_annotations-2.21.1.jar">
+            <sha256 value="d1f3c66aa91ac52549e00ae3b208ba4b9af7d72d68f230643553beb38e6118ac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.errorprone" name="error_prone_annotations" version="2.3.4">
          <artifact name="error_prone_annotations-2.3.4.jar">
             <sha256 value="baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c" origin="Generated by Gradle"/>
@@ -4851,6 +4856,17 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="32.1.3-android">
+         <artifact name="guava-32.1.3-android.jar">
+            <sha256 value="20e6ac8902ddf49e7806cc70f3054c8d91accb5eefdc10f3207e80e0a336b263" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-32.1.3-android.module">
+            <sha256 value="f8a87cef72c0e8027a6fae3cbdf0072a241ce6d8e760f96e7087b742a6605a61" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="guava-32.1.3-jre.jar">
+            <sha256 value="6d4e2b5a118aab62e6e5e29d185a0224eed82c85c40ac3d33cf04a270c3b3744" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="listenablefuture" version="1.0">
          <artifact name="listenablefuture-1.0.jar">
             <sha256 value="e4ad7607e5c0477c6f890ef26a49cb8d1bb4dffb650bab4502afee64644e3069" origin="Generated by Gradle"/>
@@ -6783,6 +6799,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e8521d75625d41272c767d262a153ac163cc505b66644a2ef705fa8949ffb4e5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.checkerframework" name="checker-qual" version="3.37.0">
+         <artifact name="checker-qual-3.37.0.jar">
+            <sha256 value="e4ce1376cc2735e1dde220b62ad0913f51297704daad155a33f386bc5db0d9f7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="checker-qual-3.37.0.module">
+            <sha256 value="7258a769dcaa26b98154d229d85cc72e5b3666b0bcb637d2daf16ec498956638" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.checkerframework" name="checker-qual" version="3.5.0">
          <artifact name="checker-qual-3.5.0.jar">
             <sha256 value="729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4" origin="Generated by Gradle"/>