Removed unneeded activity from media2 extension tests

These tests appear not to need an activity, and removing it means we don't need
to switch away from the deprecated `ActivityTestRule`.

#exofixit

PiperOrigin-RevId: 344037927

extensions/media2/src/androidTest/AndroidManifest.xml

@@ -22,15 +22,6 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-sdk/>
 
-  <application
-      android:allowBackup="false"
-      tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
-    <activity android:name="com.google.android.exoplayer2.ext.media2.MediaStubActivity"
-        android:configChanges="keyboardHidden|orientation|screenSize"
-        android:exported="false"
-        android:label="MediaStubActivity"/>
-  </application>
-
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.media2.test"
       android:name="androidx.test.runner.AndroidJUnitRunner"/>

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaSessionUtilTest.java

@@ -21,7 +21,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import android.content.Context;
 import android.support.v4.media.session.MediaControllerCompat;
 import android.support.v4.media.session.MediaSessionCompat;
-import androidx.annotation.NonNull;
 import androidx.media2.common.SessionPlayer;
 import androidx.media2.common.SessionPlayer.PlayerResult;
 import androidx.media2.session.MediaSession;
@@ -57,7 +56,7 @@ public class MediaSessionUtilTest {
         playerTestRule.getExecutor(),
         new SessionPlayer.PlayerCallback() {
           @Override
-          public void onPlayerStateChanged(@NonNull SessionPlayer player, int playerState) {
+          public void onPlayerStateChanged(SessionPlayer player, int playerState) {
             if (playerState == SessionPlayer.PLAYER_STATE_PLAYING) {
               latch.countDown();
             }

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/MediaStubActivity.java

-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.ext.media2;
-
-import android.app.Activity;
-import android.app.KeyguardManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.WindowManager;
-import com.google.android.exoplayer2.ext.media2.test.R;
-import com.google.android.exoplayer2.util.Util;
-
-/** Stub activity to play media contents on. */
-public final class MediaStubActivity extends Activity {
-
-  private static final String TAG = "MediaStubActivity";
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    setContentView(R.layout.mediaplayer);
-
-    // disable enter animation.
-    overridePendingTransition(0, 0);
-
-    if (Util.SDK_INT >= 27) {
-      getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-      setTurnScreenOn(true);
-      setShowWhenLocked(true);
-      KeyguardManager keyguardManager =
-          (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
-      keyguardManager.requestDismissKeyguard(this, null);
-    } else {
-      getWindow()
-          .addFlags(
-              WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-                  | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                  | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                  | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
-    }
-  }
-
-  @Override
-  public void finish() {
-    super.finish();
-
-    // disable exit animation.
-    overridePendingTransition(0, 0);
-  }
-
-  @Override
-  protected void onResume() {
-    Log.i(TAG, "onResume");
-    super.onResume();
-  }
-
-  @Override
-  protected void onPause() {
-    Log.i(TAG, "onPause");
-    super.onPause();
-  }
-
-  public SurfaceHolder getSurfaceHolder() {
-    SurfaceView surface = findViewById(R.id.surface);
-    return surface.getHolder();
-  }
-}

extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java

@@ -24,7 +24,6 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.media2.common.MediaItem;
@@ -41,9 +40,6 @@ import androidx.media2.session.SessionResult;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.media2.test.R;
 import com.google.android.exoplayer2.upstream.RawResourceDataSource;
 import java.util.ArrayList;
@@ -60,9 +56,6 @@ import org.junit.runner.RunWith;
 /** Tests {@link SessionCallbackBuilder}. */
 @RunWith(AndroidJUnit4.class)
 public class SessionCallbackBuilderTest {
-  @Rule
-  public final ActivityTestRule<MediaStubActivity> activityRule =
-      new ActivityTestRule<>(MediaStubActivity.class);
 
   @Rule public final PlayerTestRule playerTestRule = new PlayerTestRule();
 
@@ -80,16 +73,6 @@ public class SessionCallbackBuilderTest {
     context = ApplicationProvider.getApplicationContext();
     executor = playerTestRule.getExecutor();
     sessionPlayerConnector = playerTestRule.getSessionPlayerConnector();
-
-    // Sets the surface to the player for manual check.
-    InstrumentationRegistry.getInstrumentation()
-        .runOnMainSync(
-            () -> {
-              SimpleExoPlayer exoPlayer = playerTestRule.getSimpleExoPlayer();
-              exoPlayer
-                  .getVideoComponent()
-                  .setVideoSurfaceHolder(activityRule.getActivity().getSurfaceHolder());
-            });
   }
 
   @Test
@@ -469,8 +452,7 @@ public class SessionCallbackBuilderTest {
         executor,
         new SessionPlayer.PlayerCallback() {
           @Override
-          public void onCurrentMediaItemChanged(
-              @NonNull SessionPlayer player, @NonNull MediaItem item) {
+          public void onCurrentMediaItemChanged(SessionPlayer player, MediaItem item) {
             MediaMetadata metadata = item.getMetadata();
             assertThat(metadata.getString(MediaMetadata.METADATA_KEY_MEDIA_ID))
                 .isEqualTo(testMediaUri.toString());
@@ -613,15 +595,14 @@ public class SessionCallbackBuilderTest {
         new MediaController.ControllerCallback() {
           @Override
           public void onAllowedCommandsChanged(
-              @NonNull MediaController controller, @NonNull SessionCommandGroup commands) {
+              MediaController controller, SessionCommandGroup commands) {
             if (onAllowedCommandsChangedListener != null) {
               onAllowedCommandsChangedListener.onAllowedCommandsChanged(controller, commands);
             }
           }
 
           @Override
-          public void onConnected(
-              @NonNull MediaController controller, @NonNull SessionCommandGroup allowedCommands) {
+          public void onConnected(MediaController controller, SessionCommandGroup allowedCommands) {
             if (onConnectedListener != null) {
               onConnectedListener.onConnected(controller, allowedCommands);
             }