Import AndroidX from build 5687543 -- DO NOT MERGEandroid10-dev

./update_prebuilts.py --stx 5687543

Only update heifwriter related libs to fix cts tests.

bug: 134552543
test: manually verified that the bitrate used for encoding
is now clamped to range (with modified test case that uses
very large pic size).

Change-Id: I5a73f5f9473bdbae1d6d7ca82dcb5864e0af261f

11 files changed, 11 insertions, 10 deletions

diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index db89e8e8a..6ac73edc7 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -689,7 +689,6 @@ android_library_import {
     sdk_version: "current",
     min_sdk_version: "28",
     static_libs: [
-        "androidx.annotation_annotation",
     ],
 }
 
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar
index ba23153a7..45f1e2c6a 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.md5 b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.md5
index 7974fb79c..6fd087eab 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.md5
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.md5
@@ -1 +1 @@
-b22ebfa81aaf0635a1158161daab3d32
\ No newline at end of file
+94b0f315e6dc547a643b2b0edc80a1c5
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.sha1 b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.sha1
index c14e6bd61..520cec426 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.sha1
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01-sources.jar.sha1
@@ -1 +1 @@
-29f53ab2d0443a199f0c077d5a50225230547d45
\ No newline at end of file
+564982f9adeba0f69323057352f89980979fa372
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar
index 77a2f0bff..fe37a9909 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.md5 b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.md5
index 7cd202fb1..9ed4d4767 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.md5
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.md5
@@ -1 +1 @@
-0c3b5d9f55ed225b5fcb37fd9e35c482
\ No newline at end of file
+3872b26495b3789ba0048f9ffaa079e4
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.sha1 b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.sha1
index 8af599924..a204e03f1 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.sha1
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.aar.sha1
@@ -1 +1 @@
-dd7b6a8217731139371044de6ccda9d2e16b549a
\ No newline at end of file
+421c6f655797d5b284323be6f96b946504c0d965
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom
index d40c50e4a..3f2eceb65 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom
@@ -8,7 +8,7 @@
   <packaging>aar</packaging>
   <name>Android Support HeifWriter</name>
   <description>Android Support HeifWriter for writing HEIF still images</description>
-  <url>http://developer.android.com/tools/extras/support-library.html</url>
+  <url>https://developer.android.com/jetpack/androidx</url>
   <inceptionYear>2018</inceptionYear>
   <licenses>
     <license>
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>androidx.annotation</groupId>
       <artifactId>annotation</artifactId>
-      <version>1.1.0-rc01</version>
+      <version>1.1.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.md5 b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.md5
index 92c07d939..3899f2868 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.md5
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.md5
@@ -1 +1 @@
-065f1c7a005103eba0e08aaba786983f
\ No newline at end of file
+226b7a9c01733e5dcf0391035c4ea1ea
\ No newline at end of file
diff --git a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.sha1 b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.sha1
index aa073e3b7..19b5cd152 100644
--- a/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.sha1
+++ b/current/androidx/m2repository/androidx/heifwriter/heifwriter/1.1.0-alpha01/heifwriter-1.1.0-alpha01.pom.sha1
@@ -1 +1 @@
-4438d89cd1f26bee8fa983d9fcd2731f55838571
\ No newline at end of file
+2990f8a1924c044eddef232a6d543972a754859a
\ No newline at end of file
diff --git a/current/androidx/manifests/androidx.heifwriter_heifwriter/AndroidManifest.xml b/current/androidx/manifests/androidx.heifwriter_heifwriter/AndroidManifest.xml
index 186bbb1aa..2eef8e182 100644
--- a/current/androidx/manifests/androidx.heifwriter_heifwriter/AndroidManifest.xml
+++ b/current/androidx/manifests/androidx.heifwriter_heifwriter/AndroidManifest.xml
@@ -17,6 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.heifwriter" >
 
-    <uses-sdk android:minSdkVersion="28" />
+    <uses-sdk
+        android:minSdkVersion="28"
+        android:targetSdkVersion="28" />
 
 </manifest>
\ No newline at end of file