Merge commit 'd4f01484' into dev-release
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/apimodel/ApiInvokeOutlinerDesugaring.java b/src/main/java/com/android/tools/r8/ir/desugar/apimodel/ApiInvokeOutlinerDesugaring.java
index a41ea13..fc60cb9 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/apimodel/ApiInvokeOutlinerDesugaring.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/apimodel/ApiInvokeOutlinerDesugaring.java
@@ -119,8 +119,7 @@
MethodResolutionResult methodResolutionResult =
appView.appInfo().resolveMethod(cfInvoke.getMethod(), false);
SingleResolutionResult singleResolutionResult = methodResolutionResult.asSingleResolution();
- return singleResolutionResult != null
- && !singleResolutionResult.getResolvedMethod().isPublic()
+ return singleResolutionResult != null && singleResolutionResult.getResolvedMethod().isPublic()
? methodApiLevel
: appView.computedMinApiLevel();
}