loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove static initializer block from MediaSessionKeyEventTest

Browse Source 
PiperOrigin-RevId: 568149422
This commit is contained in:
ibaker 2023-09-25 01:59:39 -07:00 committed by Copybara-Service
parent 444cb3fb3a
commit 1f86a4e48d
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java
View File

@ -54,20 +54,6 @@ import org.junit.runner.RunWith;
@LargeTest @LargeTest
public class MediaSessionKeyEventTest { 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(); @ClassRule public static MainLooperTestRule mainLooperTestRule = new MainLooperTestRule();
@Rule @Rule
@ -258,13 +244,28 @@ public class MediaSessionKeyEventTest {
private static class TestSessionCallback implements MediaSession.Callback { private static class TestSessionCallback implements MediaSession.Callback {
private static final String EXPECTED_CONTROLLER_PACKAGE_NAME =
getExpectedControllerPackageName();
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
MediaSession session, ControllerInfo controller) { 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.Callback.super.onConnect(session, controller);
} }
return MediaSession.ConnectionResult.reject(); 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;
}
}
} }
} }