Merge "Remove hard-coded custom sources from MediaSource" into pi-car-dev
diff --git a/car-media-common/src/com/android/car/media/common/source/MediaSource.java b/car-media-common/src/com/android/car/media/common/source/MediaSource.java
index db2cc11..09dcbb5 100644
--- a/car-media-common/src/com/android/car/media/common/source/MediaSource.java
+++ b/car-media-common/src/com/android/car/media/common/source/MediaSource.java
@@ -38,10 +38,8 @@
import com.android.car.apps.common.BitmapUtils;
-import java.util.HashSet;
import java.util.List;
import java.util.Objects;
-import java.util.Set;
/**
* This represents a source of media content. It provides convenient methods to access media source
@@ -50,15 +48,6 @@
public class MediaSource {
private static final String TAG = "MediaSource";
- /**
- * Custom media sources which should not be templatized.
- */
- private static final Set<String> CUSTOM_MEDIA_SOURCES = new HashSet<>();
-
- static {
- CUSTOM_MEDIA_SOURCES.add("com.android.car.radio");
- }
-
@NonNull
private final ComponentName mBrowseService;
@NonNull
@@ -201,13 +190,6 @@
return getRoundCroppedBitmap(BitmapUtils.fromDrawable(mIcon, null));
}
- /**
- * Returns {@code true} iff this media source should not be templatized.
- */
- public boolean isCustom() {
- return CUSTOM_MEDIA_SOURCES.contains(getPackageName());
- }
-
private static Bitmap getRoundCroppedBitmap(Bitmap bitmap) {
Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(),
Bitmap.Config.ARGB_8888);