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();