Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear fields that do not have metadata" into rvc-dev am: b7285f577c am: c9db298ee0 am: 0e49541693

Browse Source 
Change-Id: I31666db97187290270023e4726e349c6b6b3a55b
This commit is contained in:
Beth Thibodeau
2020-05-01 03:53:03 +00:00
committed by Automerger Merge Worker
parent f3446f02f9 0e49541693
commit ca769c1e9f
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -315,11 +315,8 @@ public class MediaControlPanel {
appName.setTextColor(mForegroundColor); appName.setTextColor(mForegroundColor);
} }
// Can be null!
MediaMetadata mediaMetadata = mController.getMetadata(); MediaMetadata mediaMetadata = mController.getMetadata();
if (mediaMetadata == null) {
Log.e(TAG, "Media metadata was null");
return;
}
ImageView albumView = mMediaNotifView.findViewById(R.id.album_art); ImageView albumView = mMediaNotifView.findViewById(R.id.album_art);
if (albumView != null) { if (albumView != null) {
@@ -329,14 +326,20 @@ public class MediaControlPanel {
// Song name // Song name
TextView titleText = mMediaNotifView.findViewById(R.id.header_title); TextView titleText = mMediaNotifView.findViewById(R.id.header_title);
String songName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE); String songName = "";
if (mediaMetadata != null) {
songName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_TITLE);
}
titleText.setText(songName); titleText.setText(songName);
titleText.setTextColor(mForegroundColor); titleText.setTextColor(mForegroundColor);
// Artist name (not in mini player) // Artist name (not in mini player)
TextView artistText = mMediaNotifView.findViewById(R.id.header_artist); TextView artistText = mMediaNotifView.findViewById(R.id.header_artist);
if (artistText != null) { if (artistText != null) {
String artistName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST); String artistName = "";
if (mediaMetadata != null) {
artistName = mediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST);
}
artistText.setText(artistName); artistText.setText(artistName);
artistText.setTextColor(mForegroundColor); artistText.setTextColor(mForegroundColor);
} }
@@ -439,21 +442,23 @@ public class MediaControlPanel {
private void processAlbumArt(MediaMetadata metadata, Icon largeIcon, ImageView albumView) { private void processAlbumArt(MediaMetadata metadata, Icon largeIcon, ImageView albumView) {
Bitmap albumArt = null; Bitmap albumArt = null;
// First look in URI fields if (metadata != null) {
for (String field : ART_URIS) { // First look in URI fields
String uriString = metadata.getString(field); for (String field : ART_URIS) {
if (!TextUtils.isEmpty(uriString)) { String uriString = metadata.getString(field);
albumArt = loadBitmapFromUri(Uri.parse(uriString)); if (!TextUtils.isEmpty(uriString)) {
if (albumArt != null) { albumArt = loadBitmapFromUri(Uri.parse(uriString));
Log.d(TAG, "loaded art from " + field); if (albumArt != null) {
break; Log.d(TAG, "loaded art from " + field);
break;
}
} }
} }
}
// Then check bitmap field // Then check bitmap field
if (albumArt == null) { if (albumArt == null) {
albumArt = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART); albumArt = metadata.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART);
}
} }
// Finally try the notification's largeIcon // Finally try the notification's largeIcon