From a6b540545d5625880e31368705820577df6852b2 Mon Sep 17 00:00:00 2001
From: Marc Baechinger <bachinger@google.com>
Date: Mon, 15 Apr 2024 11:09:13 +0200
Subject: [PATCH] Minor cleanup

---
 RELEASENOTES.md                                        |  2 +-
 .../java/androidx/media3/demo/main/IntentUtil.java     |  3 ++-
 .../java/androidx/media3/demo/main/PlayerActivity.java | 10 ++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e374ce3898..6a306c28cd 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -44,7 +44,7 @@
 *   Test Utilities:
 *   Remove deprecated symbols:
 *   Demo app:
-    *   Allow setting repeat mode with Intent arguments from command line
+    *   Allow setting repeat mode with `Intent` arguments from command line
         ([#1266](https://github.com/androidx/media/pull/1266)).
 
 ## 1.4
diff --git a/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java b/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
index ab61e86f39..7d88a62163 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/IntentUtil.java
@@ -45,6 +45,7 @@ public class IntentUtil {
   public static final String ACTION_VIEW_LIST = "androidx.media3.demo.main.action.VIEW_LIST";
 
   // Activity extras.
+  public static final String AV_ANALYSIS_MODE_EXTRA = "av_analysis_mode"; // copybara:strip
   public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders";
 
   // Media item configuration extras.
@@ -67,7 +68,7 @@ public class IntentUtil {
   public static final String SUBTITLE_URI_EXTRA = "subtitle_uri";
   public static final String SUBTITLE_MIME_TYPE_EXTRA = "subtitle_mime_type";
   public static final String SUBTITLE_LANGUAGE_EXTRA = "subtitle_language";
-  public static final String PLAYER_REPEAT_MODE_EXTRA = "repeat_mode";
+  public static final String REPEAT_MODE_EXTRA = "repeat_mode";
 
   public static @Player.RepeatMode int parseRepeatModeExtra(String repeatMode) {
     switch (repeatMode) {
diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
index c0c9db93b7..9e066bd94a 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
@@ -262,8 +262,8 @@ public class PlayerActivity extends AppCompatActivity
    * @return Whether initialization was successful.
    */
   protected boolean initializePlayer() {
+    Intent intent = getIntent();
     if (player == null) {
-      Intent intent = getIntent();
 
       mediaItems = createMediaItems(intent);
       if (mediaItems.isEmpty()) {
@@ -293,11 +293,9 @@ public class PlayerActivity extends AppCompatActivity
     }
     player.setMediaItems(mediaItems, /* resetPosition= */ !haveStartPosition);
     player.prepare();
-    String requestedRepeatModeExtra;
-    if ((requestedRepeatModeExtra =
-            this.getIntent().getStringExtra(IntentUtil.PLAYER_REPEAT_MODE_EXTRA))
-        != null) {
-      player.setRepeatMode(IntentUtil.parseRepeatModeExtra(requestedRepeatModeExtra));
+    String repeatModeExtra = intent.getStringExtra(IntentUtil.REPEAT_MODE_EXTRA);
+    if (repeatModeExtra != null) {
+      player.setRepeatMode(IntentUtil.parseRepeatModeExtra(repeatModeExtra));
     }
     updateButtonVisibility();
     return true;