commit 5b3ae543dacec9f91c3ed0d33482112a5f6bb3e5
author Søren Gjesse <sgjesse@google.com> Mon Jun 07 15:47:15 2021 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Jun 07 13:48:08 2021 +0000
tree 5a239f0ae3417e24e01cf429e8520578f8a11a33
parent 8dc6564609f9ac1baa244d3a533dcfaf445e1296

Update test after updating android.jar for Android S

Bug: 190372368
Change-Id: I6eaa6545b26eecc847b7d278c71f8d92e64f0b01

src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
index 3eada1f..021ffa2 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/BackportedMethodRewriter.java
@@ -977,6 +977,17 @@
       DexProto proto;
       DexMethod method;
 
+      // List
+      type = factory.listType;
+
+      // List List.copyOf(Collection)
+      name = factory.createString("copyOf");
+      proto = factory.createProto(factory.listType, factory.collectionType);
+      method = factory.createMethod(type, proto, name);
+      addProvider(
+          new MethodGenerator(
+              method, BackportedMethods::CollectionsMethods_copyOfList, "copyOfList"));
+
       // Set
       type = factory.setType;
 
@@ -1133,16 +1144,7 @@
     }
 
     private void initializeJava10MethodProviders(DexItemFactory factory) {
-      // List
-      DexType type = factory.listType;
-
-      // List List.copyOf(Collection)
-      DexString name = factory.createString("copyOf");
-      DexProto proto = factory.createProto(factory.listType, factory.collectionType);
-      DexMethod method = factory.createMethod(type, proto, name);
-      addProvider(
-          new MethodGenerator(
-              method, BackportedMethods::CollectionsMethods_copyOfList, "copyOfList"));
+      // Nothing right now.
     }
 
     private void initializeJava11MethodProviders(DexItemFactory factory) {