From 013379fd3ee299ab6f24e8d42686af13249d54c2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 05:40:33 -0700
Subject: [PATCH] Workaround for SurfaceView not being hidden properly

This appears to be fixed in Oreo, but given how harmless
the workaround is we can probably just apply it on all
API levels to be sure.

Issue: #3160

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167709070
---
 .../android/exoplayer2/ui/SimpleExoPlayerView.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
index 488411550c..8fa264cad1 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java
@@ -428,6 +428,15 @@ public final class SimpleExoPlayerView extends FrameLayout {
     }
   }
 
+  @Override
+  public void setVisibility(int visibility) {
+    super.setVisibility(visibility);
+    if (surfaceView instanceof SurfaceView) {
+      // Work around https://github.com/google/ExoPlayer/issues/3160
+      surfaceView.setVisibility(visibility);
+    }
+  }
+
   /**
    * Sets the resize mode.
    *