From 15bcdf3b71f02b4ce2f8328625fb43a5b0f25fe6 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 7 Aug 2017 01:54:51 -0700 Subject: [PATCH] Don't use TextureView's SurfaceTexture unless available ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=164434943 --- .../java/com/google/android/exoplayer2/SimpleExoPlayer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ebfe380b6b..08e178878b 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 @@ -276,7 +276,8 @@ public class SimpleExoPlayer implements ExoPlayer { Log.w(TAG, "Replacing existing SurfaceTextureListener."); } textureView.setSurfaceTextureListener(componentListener); - SurfaceTexture surfaceTexture = textureView.getSurfaceTexture(); + SurfaceTexture surfaceTexture = textureView.isAvailable() ? textureView.getSurfaceTexture() + : null; setVideoSurfaceInternal(surfaceTexture == null ? null : new Surface(surfaceTexture), true); } }