Migrate from media support library to the system version.

The support media library requires adding androidx.legacy_legacy-support-v4
to the dependency list, which adds unwanted classes to the jar file
(like AsyncLayoutInflater).

Bug: 111617215
Test: build, run radio app, browse its MediaBrowser tree
Change-Id: I9d879d41c236aeed6593a3d9f4f940b5103fb1d4

1 files changed, 16 insertions, 17 deletions

diff --git a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java
index a9b543e..898c9ed 100644
--- a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java
+++ b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/media/BrowseTree.java
@@ -25,15 +25,14 @@ import android.hardware.radio.ProgramSelector;
 import android.hardware.radio.RadioManager;
 import android.hardware.radio.RadioManager.BandDescriptor;
 import android.hardware.radio.RadioMetadata;
+import android.media.MediaDescription;
+import android.media.browse.MediaBrowser.MediaItem;
 import android.os.Bundle;
-import android.support.v4.media.MediaBrowserCompat.MediaItem;
-import android.support.v4.media.MediaDescriptionCompat;
+import android.service.media.MediaBrowserService;
+import android.service.media.MediaBrowserService.BrowserRoot;
+import android.service.media.MediaBrowserService.Result;
 import android.util.Log;
 
-import androidx.media.MediaBrowserServiceCompat;
-import androidx.media.MediaBrowserServiceCompat.BrowserRoot;
-import androidx.media.MediaBrowserServiceCompat.Result;
-
 import com.android.car.broadcastradio.support.Program;
 import com.android.car.broadcastradio.support.R;
 import com.android.car.broadcastradio.support.platform.ImageResolver;
@@ -130,7 +129,7 @@ public class BrowseTree {
     private final BrowserRoot mRoot = new BrowserRoot(NODE_ROOT, null);
 
     private final Object mLock = new Object();
-    private final @NonNull MediaBrowserServiceCompat mBrowserService;
+    private final @NonNull MediaBrowserService mBrowserService;
     private final @Nullable ImageResolver mImageResolver;
 
     private List<MediaItem> mRootChildren;
@@ -151,7 +150,7 @@ public class BrowseTree {
     @Nullable Set<Program> mFavorites;
     @Nullable private List<MediaItem> mFavoritesCache;
 
-    public BrowseTree(@NonNull MediaBrowserServiceCompat browserService,
+    public BrowseTree(@NonNull MediaBrowserService browserService,
             @Nullable ImageResolver imageResolver) {
         mBrowserService = Objects.requireNonNull(browserService);
         mImageResolver = imageResolver;
@@ -161,9 +160,9 @@ public class BrowseTree {
         return mRoot;
     }
 
-    private static MediaItem createChild(MediaDescriptionCompat.Builder descBuilder,
+    private static MediaItem createChild(MediaDescription.Builder descBuilder,
             String mediaId, String title, ProgramSelector sel, Bitmap icon) {
-        MediaDescriptionCompat desc = descBuilder
+        MediaDescription desc = descBuilder
                 .setMediaId(mediaId)
                 .setMediaUri(ProgramSelectorExt.toUri(sel))
                 .setTitle(title)
@@ -172,12 +171,12 @@ public class BrowseTree {
         return new MediaItem(desc, MediaItem.FLAG_PLAYABLE);
     }
 
-    private static MediaItem createFolder(MediaDescriptionCompat.Builder descBuilder,
+    private static MediaItem createFolder(MediaDescription.Builder descBuilder,
             String mediaId, String title, boolean isPlayable, long folderType, Bundle extras) {
         if (extras == null) extras = new Bundle();
         extras.putLong(EXTRA_BCRADIO_FOLDER_TYPE, folderType);
 
-        MediaDescriptionCompat desc = descBuilder
+        MediaDescription desc = descBuilder
                 .setMediaId(mediaId).setTitle(title).setExtras(extras).build();
 
         int flags = MediaItem.FLAG_BROWSABLE;
@@ -254,7 +253,7 @@ public class BrowseTree {
             if (mProgramListCache != null) return mProgramListCache;
             mProgramListCache = new ArrayList<>();
 
-            MediaDescriptionCompat.Builder dbld = new MediaDescriptionCompat.Builder();
+            MediaDescription.Builder dbld = new MediaDescription.Builder();
 
             for (RadioManager.ProgramInfo program : mProgramListSnapshot) {
                 ProgramSelector sel = program.getSelector();
@@ -311,7 +310,7 @@ public class BrowseTree {
             if (mFavoritesCache != null) return mFavoritesCache;
             mFavoritesCache = new ArrayList<>();
 
-            MediaDescriptionCompat.Builder dbld = new MediaDescriptionCompat.Builder();
+            MediaDescription.Builder dbld = new MediaDescription.Builder();
 
             for (Program fav : mFavorites) {
                 ProgramSelector sel = fav.getSelector();
@@ -329,7 +328,7 @@ public class BrowseTree {
             if (mRootChildren != null) return mRootChildren;
             mRootChildren = new ArrayList<>();
 
-            MediaDescriptionCompat.Builder dbld = new MediaDescriptionCompat.Builder();
+            MediaDescription.Builder dbld = new MediaDescription.Builder();
             if (mProgramList != null) {
                 mRootChildren.add(createFolder(dbld, NODE_PROGRAMS,
                         mBrowserService.getString(R.string.program_list_text),
@@ -384,7 +383,7 @@ public class BrowseTree {
             if (isEmpty()) return null;
             Bundle extras = new Bundle();
             extras.putString(EXTRA_BCRADIO_BAND_NAME_EN, mBandNameEn);
-            return createFolder(new MediaDescriptionCompat.Builder(), mMediaId,
+            return createFolder(new MediaDescription.Builder(), mMediaId,
                     mBrowserService.getString(mBandName), true, BCRADIO_FOLDER_TYPE_BAND, extras);
         }
 
@@ -394,7 +393,7 @@ public class BrowseTree {
                 if (isEmpty()) return null;
                 mChannels = new ArrayList<>();
 
-                MediaDescriptionCompat.Builder dbld = new MediaDescriptionCompat.Builder();
+                MediaDescription.Builder dbld = new MediaDescription.Builder();
 
                 for (BandDescriptor band : mBands) {
                     final int lowerLimit = band.getLowerLimit();