From 1f86a4e48d5b8ac3521beb5bf5d30e1e2662ff89 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 25 Sep 2023 01:59:39 -0700
Subject: [PATCH] Remove static initializer block from
 `MediaSessionKeyEventTest`

PiperOrigin-RevId: 568149422
---
 .../session/MediaSessionKeyEventTest.java     | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java
index 4caefe792e..48f250cb4d 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java
@@ -54,20 +54,6 @@ import org.junit.runner.RunWith;
 @LargeTest
 public class MediaSessionKeyEventTest {
 
-  private static String expectedControllerPackageName;
-
-  static {
-    if (Util.SDK_INT >= 28 || Util.SDK_INT < 21) {
-      expectedControllerPackageName = SUPPORT_APP_PACKAGE_NAME;
-    } else if (Util.SDK_INT >= 24) {
-      // KeyEvent from system service has the package name "android".
-      expectedControllerPackageName = "android";
-    } else {
-      // In API 21+, MediaSessionCompat#getCurrentControllerInfo always returns fake info.
-      expectedControllerPackageName = LEGACY_CONTROLLER;
-    }
-  }
-
   @ClassRule public static MainLooperTestRule mainLooperTestRule = new MainLooperTestRule();
 
   @Rule
@@ -258,13 +244,28 @@ public class MediaSessionKeyEventTest {
 
   private static class TestSessionCallback implements MediaSession.Callback {
 
+    private static final String EXPECTED_CONTROLLER_PACKAGE_NAME =
+        getExpectedControllerPackageName();
+
     @Override
     public MediaSession.ConnectionResult onConnect(
         MediaSession session, ControllerInfo controller) {
-      if (expectedControllerPackageName.equals(controller.getPackageName())) {
+      if (EXPECTED_CONTROLLER_PACKAGE_NAME.equals(controller.getPackageName())) {
         return MediaSession.Callback.super.onConnect(session, controller);
       }
       return MediaSession.ConnectionResult.reject();
     }
+
+    private static String getExpectedControllerPackageName() {
+      if (Util.SDK_INT >= 28 || Util.SDK_INT < 21) {
+        return SUPPORT_APP_PACKAGE_NAME;
+      } else if (Util.SDK_INT >= 24) {
+        // KeyEvent from system service has the package name "android".
+        return "android";
+      } else {
+        // In API 21+, MediaSessionCompat#getCurrentControllerInfo always returns fake info.
+        return LEGACY_CONTROLLER;
+      }
+    }
   }
 }