Fix return type for android.content.ContentProviderClient.release
This is wrongly backported to a void method, but it is returning a boolean
https://developer.android.com/reference/android/content/ContentProviderClient#release()
Bug: b/276874854
Change-Id: I85cb163363d36c4073b3a34eed3e841860686a33
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 13c5ab8..1a288fc 100644
--- a/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
+++ b/src/main/java/com/android/tools/r8/graph/DexItemFactory.java
@@ -1182,7 +1182,7 @@
// android.content.ContentProviderClient
public class AndroidContentContentProviderClientMembers extends LibraryMembers {
public final DexMethod release =
- createMethod(androidContentContentProviderClientType, createProto(voidType), "release");
+ createMethod(androidContentContentProviderClientType, createProto(booleanType), "release");
public final DexMethod close =
createMethod(androidContentContentProviderClientType, createProto(voidType), "close");
}
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
index e15b419..fed9755 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/ContentProviderClientBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/ContentProviderClientBackportTest.java
@@ -70,8 +70,9 @@
TestRunner.doFail("close should not be called");
}
- public void release() {
+ public boolean release() {
wasClosed = true;
+ return wasClosed;
}
}
@@ -82,8 +83,9 @@
wasClosed = true;
}
- public void release() {
+ public boolean release() {
TestRunner.doFail("release should not be called");
+ return true;
}
}
