From ae51e2e1d17b62cd028e5e2ff6788bf37dd6dba5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Jan 2021 09:55:09 +0000
Subject: [PATCH] Also fix thread blocking nullness assertion when called from
 non-Looper

PiperOrigin-RevId: 354268013
---
 .../com/google/android/exoplayer2/testutil/FakeClock.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
index 6266749838..629729bd23 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
@@ -140,6 +140,11 @@ public class FakeClock implements Clock {
 
   @Override
   public synchronized void onThreadBlocked() {
+    @Nullable Looper currentLooper = Looper.myLooper();
+    if (currentLooper == null || !waitingForMessage) {
+      // This isn't a looper message created by this class, so no need to handle the blocking.
+      return;
+    }
     busyLoopers.add(checkNotNull(Looper.myLooper()));
     waitingForMessage = false;
     maybeTriggerMessage();