From 790deb71db4a344fe65e06e8f17e9c31744c13a7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 5 Aug 2019 10:43:50 +0100
Subject: [PATCH] Check if controller is used when performing click directly.

Issue:#6260
PiperOrigin-RevId: 261647858
---
 RELEASENOTES.md                                             | 3 +++
 .../java/com/google/android/exoplayer2/ui/PlayerView.java   | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index bfdf9e733e..03b45fc945 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -27,6 +27,9 @@
   over other selection parameters.
 * Remove `AnalyticsCollector.Factory`. Instances can be created directly and
   the `Player` set later using `AnalyticsCollector.setPlayer`.
+* Fix issue when calling `performClick` on `PlayerView` without
+  `PlayerControlView`
+  ([#6260](https://github.com/google/ExoPlayer/issues/6260)).
 
 ### 2.10.4 ###
 
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 d97a53bc4d..ec6e94e042 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
@@ -1156,6 +1156,9 @@ 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) {
@@ -1491,9 +1494,6 @@ public class PlayerView extends FrameLayout implements AdsLoader.AdViewProvider
 
     @Override
     public boolean onSingleTapUp(MotionEvent e) {
-      if (!useController || player == null) {
-        return false;
-      }
       return toggleControllerVisibility();
     }
   }