From 3ab9bc8e7fcc283d7ffc5eeba44421dfb45530f3 Mon Sep 17 00:00:00 2001
From: insun <insun@google.com>
Date: Wed, 2 Sep 2020 07:21:23 +0100
Subject: [PATCH] Fix internal demo app crash

Internal demo app crashed when device does not support required DRM scheme.
This CL fixes it.

PiperOrigin-RevId: 329653841
---
 .../com/google/android/exoplayer2/demo/PlayerActivity.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index 211e22deff..5c8d3cc934 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -271,13 +271,14 @@ public class PlayerActivity extends AppCompatActivity
     setContentView(R.layout.player_activity);
   }
 
-  protected void initializePlayer() {
+  /** @return Whether initialization was successful. */
+  protected boolean initializePlayer() {
     if (player == null) {
       Intent intent = getIntent();
 
       mediaItems = createMediaItems(intent);
       if (mediaItems.isEmpty()) {
-        return;
+        return false;
       }
 
       boolean preferExtensionDecoders =
@@ -312,6 +313,7 @@ public class PlayerActivity extends AppCompatActivity
     player.setMediaItems(mediaItems, /* resetPosition= */ !haveStartPosition);
     player.prepare();
     updateButtonVisibility();
+    return true;
   }
 
   private List<MediaItem> createMediaItems(Intent intent) {