Backport android.content.ContentProviderClient.close()
Method close was added in API level 24. Rewrite to release which has
been present since API level 5.
Fixes: b/264391149
Change-Id: I9ba1e53775cafe62e3f41aa01db55cbb738d41df
diff --git a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
index c798daf..443da73 100644
--- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
+++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -88,6 +88,8 @@
public static final String androidUtilSparseArrayDescriptorString = "Landroid/util/SparseArray;";
public static final String androidContentResTypedArrayDescriptorString =
"Landroid/content/res/TypedArray;";
+ public static final String androidContentContentProviderClientDescriptorString =
+ "Landroid/content/ContentProviderClient;";
/** Set of types that may be synthesized during compilation. */
private final Set<DexType> possibleCompilerSynthesizedTypes = Sets.newIdentityHashSet();
@@ -614,6 +616,8 @@
createStaticallyKnownType(androidUtilSparseArrayDescriptorString);
public final DexType androidContentResTypedArrayType =
createStaticallyKnownType(androidContentResTypedArrayDescriptorString);
+ public final DexType androidContentContentProviderClientType =
+ createStaticallyKnownType(androidContentContentProviderClientDescriptorString);
public final StringBuildingMethods stringBuilderMethods =
new StringBuildingMethods(stringBuilderType);
@@ -669,6 +673,8 @@
new AndroidUtilSparseArrayMembers();
public final AndroidContentResTypedArrayMembers androidContentResTypedArrayMembers =
new AndroidContentResTypedArrayMembers();
+ public final AndroidContentContentProviderClientMembers
+ androidContentContentProviderClientMembers = new AndroidContentContentProviderClientMembers();
// java.**
public final JavaIoFileMembers javaIoFileMembers = new JavaIoFileMembers();
@@ -1159,6 +1165,14 @@
createMethod(androidContentResTypedArrayType, createProto(voidType), "close");
}
+ // android.content.ContentProviderClient
+ public class AndroidContentContentProviderClientMembers extends LibraryMembers {
+ public final DexMethod release =
+ createMethod(androidContentContentProviderClientType, createProto(voidType), "release");
+ public final DexMethod close =
+ createMethod(androidContentContentProviderClientType, createProto(voidType), "close");
+ }
+
public class BooleanMembers extends BoxedPrimitiveMembers {
public final DexField FALSE = createField(boxedBooleanType, boxedBooleanType, "FALSE");
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 28377d6..6d36d49 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
@@ -45,6 +45,7 @@
import com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites;
import com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators;
import com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites;
+import com.android.tools.r8.ir.desugar.backports.ContentProviderClientMethodRewrites;
import com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites;
import com.android.tools.r8.ir.desugar.backports.LongMethodRewrites;
import com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites;
@@ -814,6 +815,14 @@
}
initializeMathExactApis(factory, factory.mathType);
+
+ // android.content.res.ContentProviderClient
+
+ // void android.content.ContentProviderClient.close()
+ addProvider(
+ new InvokeRewriter(
+ factory.androidContentContentProviderClientMembers.close,
+ ContentProviderClientMethodRewrites.rewriteClose()));
}
/**
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/backports/ContentProviderClientMethodRewrites.java b/src/main/java/com/android/tools/r8/ir/desugar/backports/ContentProviderClientMethodRewrites.java
new file mode 100644
index 0000000..8881483
--- /dev/null
+++ b/src/main/java/com/android/tools/r8/ir/desugar/backports/ContentProviderClientMethodRewrites.java
@@ -0,0 +1,24 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.ir.desugar.backports;
+
+import com.android.tools.r8.cf.code.CfInvoke;
+import com.android.tools.r8.ir.desugar.BackportedMethodRewriter.MethodInvokeRewriter;
+import org.objectweb.asm.Opcodes;
+
+public final class ContentProviderClientMethodRewrites {
+
+ private ContentProviderClientMethodRewrites() {}
+
+ public static MethodInvokeRewriter rewriteClose() {
+ // Rewrite android/content/ContentProviderClient#close to
+ // android/content/ContentProviderClient#recycle
+ return (invoke, factory) ->
+ new CfInvoke(
+ Opcodes.INVOKEVIRTUAL,
+ factory.androidContentContentProviderClientMembers.release,
+ false);
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/ContentProviderClientBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/ContentProviderClientBackportTest.java
new file mode 100644
index 0000000..e15b419
--- /dev/null
+++ b/src/test/java/com/android/tools/r8/desugar/backports/ContentProviderClientBackportTest.java
@@ -0,0 +1,104 @@
+// Copyright (c) 2023, the R8 project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+package com.android.tools.r8.desugar.backports;
+
+import static org.junit.Assert.assertTrue;
+
+import com.android.tools.r8.TestParameters;
+import com.android.tools.r8.TestParametersCollection;
+import com.android.tools.r8.ToolHelper.DexVm;
+import com.android.tools.r8.graph.DexItemFactory;
+import com.android.tools.r8.utils.AndroidApiLevel;
+import com.google.common.collect.ImmutableList;
+import java.io.IOException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class ContentProviderClientBackportTest extends AbstractBackportTest {
+
+ @Parameters(name = "{0}")
+ public static TestParametersCollection data() {
+ return getTestParameters().withDexRuntimesAndAllApiLevels().build();
+ }
+
+ public ContentProviderClientBackportTest(TestParameters parameters) throws IOException {
+ super(
+ parameters,
+ ContentProviderClientBackportTest.getContentProviderClient(parameters),
+ ImmutableList.of(
+ ContentProviderClientBackportTest.getTestRunner(),
+ ContentProviderClientBackportTest.getContentProviderClient(parameters)));
+
+ // The constructor is used by the test and release has been available since API 5 and is the
+ // method close is rewritten to.
+ ignoreInvokes("<init>");
+ ignoreInvokes("release");
+
+ // android.content.ContentProviderClient.close added in API 24.
+ registerTarget(AndroidApiLevel.N, 1);
+ }
+
+ private static byte[] getContentProviderClient(TestParameters parameters) throws IOException {
+ if (parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.N)) {
+ assertTrue(parameters.getRuntime().asDex().getVm().isNewerThanOrEqual(DexVm.ART_7_0_0_HOST));
+ return transformer(ContentProviderClientApiLevel24.class)
+ .setClassDescriptor(DexItemFactory.androidContentContentProviderClientDescriptorString)
+ .transform();
+ } else {
+ return transformer(ContentProviderClient.class)
+ .setClassDescriptor(DexItemFactory.androidContentContentProviderClientDescriptorString)
+ .transform();
+ }
+ }
+
+ private static byte[] getTestRunner() throws IOException {
+ return transformer(TestRunner.class)
+ .replaceClassDescriptorInMethodInstructions(
+ descriptor(ContentProviderClient.class),
+ DexItemFactory.androidContentContentProviderClientDescriptorString)
+ .transform();
+ }
+
+ public static class ContentProviderClient {
+ public boolean wasClosed = false;
+
+ public void close() {
+ TestRunner.doFail("close should not be called");
+ }
+
+ public void release() {
+ wasClosed = true;
+ }
+ }
+
+ public static class ContentProviderClientApiLevel24 {
+ public boolean wasClosed = false;
+
+ public void close() {
+ wasClosed = true;
+ }
+
+ public void release() {
+ TestRunner.doFail("release should not be called");
+ }
+ }
+
+ public static class TestRunner extends MiniAssert {
+
+ public static void main(String[] args) {
+ ContentProviderClient contentProviderClient = new ContentProviderClient();
+ MiniAssert.assertFalse(contentProviderClient.wasClosed);
+ contentProviderClient.close();
+ MiniAssert.assertTrue(contentProviderClient.wasClosed);
+ }
+
+ // Forwards to MiniAssert to avoid having to make it public.
+ public static void doFail(String message) {
+ MiniAssert.fail(message);
+ }
+ }
+}
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/TypedArrayBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/TypedArrayBackportTest.java
index 40eef59..06e759d 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/TypedArrayBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/TypedArrayBackportTest.java
@@ -45,7 +45,7 @@
private static byte[] getTypedArray(TestParameters parameters) throws IOException {
if (parameters.getApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.S)) {
assertTrue(parameters.getRuntime().asDex().getVm().isNewerThanOrEqual(DexVm.ART_12_0_0_HOST));
- return transformer(TypedArrayAndroid12.class)
+ return transformer(TypedArrayAndroidApiLevel31.class)
.setClassDescriptor(DexItemFactory.androidContentResTypedArrayDescriptorString)
.transform();
} else {
@@ -75,7 +75,7 @@
}
}
- public static class TypedArrayAndroid12 {
+ public static class TypedArrayAndroidApiLevel31 {
public boolean wasClosed = false;
public void close() {
