ETPAND-9977: RNV-21004 Errors Blocking Some AVOD Users from Watching …

…Videos (#69) Prevent unnecessary surface view creation/switching.
crunchyroll · May 31, 2023 · 5846a5e · 5846a5e
1 parent b816051
commit 5846a5e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java
@@ -150,12 +150,20 @@ private void setVideoView() {
     private void updateSurfaceView() {
         View view;
         if (!useTextureView || useSecureView) {
-            view = new SurfaceView(context);
+            if (surfaceView != null && surfaceView instanceof SurfaceView) {
+                view = surfaceView;
+            } else {
+                view = new SurfaceView(context);
+            }
             if (useSecureView) {
                 ((SurfaceView)view).setSecure(true);
             }
         } else {
-            view = new TextureView(context);
+            if (surfaceView != null && surfaceView instanceof TextureView) {
+                view = surfaceView;
+            } else {
+                view = new TextureView(context);
+            }
         }
         view.setLayoutParams(layoutParams);