Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 14 insertions, 0 deletions

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferFromConditionalExpressionCondition.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferFromConditionalExpressionCondition.java
new file mode 100644
index 000000000000..8fad96c118ed
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/InferFromConditionalExpressionCondition.java
@@ -0,0 +1,14 @@
+class Test {
+  static class TKey<T> {
+  }
+
+  public interface Getter {
+    <T> T getValue(TKey<T> key);
+  }
+
+  static final TKey<Boolean> KEY_B = new TKey<>();
+
+  public static void f(Getter getter) {
+    String name = getter.getValue(KEY_B) ? "foo" : "bar";
+  }
+}