diff options
| -rw-r--r-- | media/java/android/media/MediaPlayer2Impl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java index 4ac0188581e8..9b97b1060c8a 100644 --- a/media/java/android/media/MediaPlayer2Impl.java +++ b/media/java/android/media/MediaPlayer2Impl.java @@ -700,7 +700,8 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { // return true if there is a next data source, false otherwise. // This function should be always called on |mHandlerThread|. private boolean prepareNextDataSource() { - if (Looper.myLooper() != mHandlerThread.getLooper()) { + HandlerThread handlerThread = mHandlerThread; + if (handlerThread != null && Looper.myLooper() != handlerThread.getLooper()) { Log.e(TAG, "prepareNextDataSource: called on wrong looper"); } @@ -736,7 +737,8 @@ public final class MediaPlayer2Impl extends MediaPlayer2 { // This function should be always called on |mHandlerThread|. private void playNextDataSource() { - if (Looper.myLooper() != mHandlerThread.getLooper()) { + HandlerThread handlerThread = mHandlerThread; + if (handlerThread != null && Looper.myLooper() != handlerThread.getLooper()) { Log.e(TAG, "playNextDataSource: called on wrong looper"); } |