Check if controller is used when performing click directly.

Issue:#6260 PiperOrigin-RevId: 261647858
google · Aug 5, 2019 · 936a778 · 936a778
1 parent b0c2b1a
commit 936a778
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -24,6 +24,9 @@
   ([#6192](https://github.com/google/ExoPlayer/issues/6192)).
 * Fix Flac and ALAC playback on some LG devices
   ([#5938](https://github.com/google/ExoPlayer/issues/5938)).
+* Fix issue when calling `performClick` on `PlayerView` without
+  `PlayerControlView`
+  ([#6260](https://github.com/google/ExoPlayer/issues/6260)).
 
 ### 2.10.3 ###
 

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
@@ -1156,6 +1156,9 @@ public View[] getAdOverlayViews() {
   // Internal methods.
 
   private boolean toggleControllerVisibility() {
+    if (!useController || player == null) {
+      return false;
+    }
     if (!controller.isVisible()) {
       maybeShowController(true);
     } else if (controllerHideOnTouch) {
@@ -1492,9 +1495,6 @@ public void onLayoutChange(
 
     @Override
     public boolean onSingleTapUp(MotionEvent e) {
-      if (!useController || player == null) {
-        return false;
-      }
       return toggleControllerVisibility();
     }
   }