From ce8259e20a9b6040da4d35968ec053d888e57dd0 Mon Sep 17 00:00:00 2001 From: kimvde Date: Thu, 29 Apr 2021 13:03:52 +0100 Subject: [PATCH] Avoid NPEs when checking the current thread in SimpleExoPlayer Before, Looper.myLooper().getThread() could throw an NPE if the current thread didn't have any looper. #minor-release PiperOrigin-RevId: 371097485 --- .../java/com/google/android/exoplayer2/SimpleExoPlayer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index 92afdf1074..5e1d041ffb 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -2023,8 +2023,7 @@ public class SimpleExoPlayer extends BasePlayer + "Current thread: '%s'\n" + "Expected thread: '%s'\n" + "See https://exoplayer.dev/issues/player-accessed-on-wrong-thread", - Looper.myLooper().getThread().getName(), - getApplicationLooper().getThread().getName()); + Thread.currentThread().getName(), getApplicationLooper().getThread().getName()); if (throwsWhenUsingWrongThread) { throw new IllegalStateException(message); }