Apply androidx.media2.* library/package separation to pump app

Bug: 132639390
Test: Build successful
Change-Id: Id6dbfedb0ca3b39e992c53ad5a0903c8c082a8bf

2 files changed, 10 insertions, 8 deletions

diff --git a/java/com/android/pump/activity/AudioPlayerActivity.java b/java/com/android/pump/activity/AudioPlayerActivity.java
index dc36bc2..d55d286 100644
--- a/java/com/android/pump/activity/AudioPlayerActivity.java
+++ b/java/com/android/pump/activity/AudioPlayerActivity.java
@@ -27,7 +27,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.media2.UriMediaItem;
+import androidx.media2.common.UriMediaItem;
 import androidx.media2.widget.VideoView;
 
 import com.android.pump.R;
diff --git a/java/com/android/pump/activity/VideoPlayerActivity.java b/java/com/android/pump/activity/VideoPlayerActivity.java
index b2c1d08..1e75c40 100644
--- a/java/com/android/pump/activity/VideoPlayerActivity.java
+++ b/java/com/android/pump/activity/VideoPlayerActivity.java
@@ -27,11 +27,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.media2.MediaController;
-import androidx.media2.MediaItem;
-import androidx.media2.SessionPlayer;
-import androidx.media2.SessionToken;
-import androidx.media2.UriMediaItem;
+import androidx.media2.common.MediaItem;
+import androidx.media2.common.SessionPlayer;
+import androidx.media2.common.UriMediaItem;
+import androidx.media2.session.MediaController;
+import androidx.media2.session.SessionToken;
 import androidx.media2.widget.VideoView;
 
 import com.android.pump.R;
@@ -86,8 +86,10 @@ public class VideoPlayerActivity extends AppCompatActivity {
     public void onAttachedToWindow() {
         if (mMediaController == null) {
             SessionToken token = mVideoView.getSessionToken();
-            mMediaController = new MediaController(this, token, Executors.uiThreadExecutor(),
-                    new ControllerCallback());
+            mMediaController = new MediaController.Builder(this)
+                    .setSessionToken(token)
+                    .setControllerCallback(Executors.uiThreadExecutor(), new ControllerCallback())
+                    .build();
         }
     }