From 49f3a117afc987ccf0bfd9aca6d040de4b46eab4 Mon Sep 17 00:00:00 2001
From: Brett Chabot <brettchabot@google.com>
Date: Tue, 7 Jan 2025 14:17:42 -0800
Subject: [PATCH] Fix NPE in EspressoIdleTest in recent Baklava.

TestLooperManagerCompat#getQueue didn't handle baklava case.

PiperOrigin-RevId: 713039379
---
 .../test/espresso/base/TestLooperManagerCompat.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java b/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java
index 46db34574..b74fbce90 100644
--- a/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java
+++ b/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java
@@ -164,6 +164,10 @@ void recycle(Message m) {
   }
 
   MessageQueue getQueue() {
-    return queue;
+    if (queue != null) {
+      return queue;
+    } else {
+      return delegate.getMessageQueue();
+    }
   }
 }