From de989c4050b31b2f71afba63abbd48a0b51ab242 Mon Sep 17 00:00:00 2001 From: Raluca Sauciuc Date: Thu, 13 Sep 2018 20:14:41 -0700 Subject: [PATCH] Expand the fix from commit 6c274cecff3 to cover AndroidX Android Studio users who migrated to AndroidX are running into the databinding deadlock again: https://issuetracker.google.com/111788726 --- .../kotlin/load/java/sam/SingleAbstractMethodUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java index 26d5bb8ef55..99f4a71bd24 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java @@ -148,7 +148,7 @@ public class SingleAbstractMethodUtils { // Otherwise android data binding can cause resolve re-entrance // For details see KT-18687, KT-16149 // TODO: prevent resolve re-entrance on architecture level, or (alternatively) ask data binding owners not to do it - if (DescriptorUtilsKt.getFqNameSafe(klass).asString().equals("android.databinding.DataBindingComponent")) { + if (DescriptorUtilsKt.getFqNameSafe(klass).asString().endsWith(".databinding.DataBindingComponent")) { return null; }