diff options
Diffstat (limited to 'compiler/src/main/java/android/databinding/tool/reflection')
| -rw-r--r-- | compiler/src/main/java/android/databinding/tool/reflection/ModelAnalyzer.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compiler/src/main/java/android/databinding/tool/reflection/ModelAnalyzer.java b/compiler/src/main/java/android/databinding/tool/reflection/ModelAnalyzer.java index 739c9e0b..b1de46e4 100644 --- a/compiler/src/main/java/android/databinding/tool/reflection/ModelAnalyzer.java +++ b/compiler/src/main/java/android/databinding/tool/reflection/ModelAnalyzer.java @@ -94,6 +94,12 @@ public abstract class ModelAnalyzer { curr = curr.getSuperclass(); } if (curr == null) { + if (modelClass1.isObject() && modelClass2.isInterface()) { + return modelClass1; + } else if (modelClass2.isObject() && modelClass1.isInterface()) { + return modelClass2; + } + ModelClass primitive1 = modelClass1.unbox(); ModelClass primitive2 = modelClass2.unbox(); if (!modelClass1.equals(primitive1) || !modelClass2.equals(primitive2)) { |