From 71e0f2e81cedbb927526a587b6dbcf6fb3f54b72 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 1 Jul 2019 13:03:07 +0100
Subject: [PATCH] Don't consume touch events if no controller is attached.

Issue:#6109
PiperOrigin-RevId: 255933121
---
 .../com/google/android/exoplayer2/ui/PlayerView.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
index c7ffda8ae5..e6bc1a6a71 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerView.java
@@ -1050,6 +1050,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
 
   @Override
   public boolean onTouchEvent(MotionEvent event) {
+    if (!useController || player == null) {
+      return false;
+    }
     switch (event.getAction()) {
       case MotionEvent.ACTION_DOWN:
         isTouching = true;
@@ -1150,9 +1153,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
   // Internal methods.
 
   private boolean toggleControllerVisibility() {
-    if (!useController || player == null) {
-      return false;
-    }
     if (!controller.isVisible()) {
       maybeShowController(true);
     } else if (controllerHideOnTouch) {
@@ -1472,6 +1472,9 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
 
     @Override
     public boolean onSingleTapUp(MotionEvent e) {
+      if (!useController || player == null) {
+        return false;
+      }
       return toggleControllerVisibility();
     }
   }