Fix NPE in EspressoIdleTest in recent Baklava.

brettchabot · copybara-androidxtest · commit e7098caebfe5 · 2025-01-07T14:50:05.000-08:00
TestLooperManagerCompat#getQueue didn't handle baklava case.

PiperOrigin-RevId: 713049532
diff --git 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();
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,10 @@ void recycle(Message m) {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`MessageQueue getQueue() {`
`167`		`- return queue;`
	`167`	`+ if (queue != null) {`
	`168`	`+ return queue;`
	`169`	`+ } else {`
	`170`	`+ return delegate.getMessageQueue();`
	`171`	`+ }`
`168`	`172`	`}`
`169`	`173`	`}`