summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeth Thibodeau <ethibodeau@google.com>2023-10-28 00:46:24 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-28 17:34:26 +0000
commit7df3f68bc978fd08d175a94c2768508961f81b35 (patch)
tree509ebcb099b05959151028757d36b33e30239e72
parent476078b2948e5ffe8ade4927946ba51da39aeead (diff)
downloadbase-7df3f68bc978fd08d175a94c2768508961f81b35.tar.gz
Add null check for media metadata
This check was inadvertently removed in a previous cherry pick and is still necessary. Bug: 307983823 Test: build (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:abc33695709d44d3f23a310601070d496067950a) Merged-In: I35e89feaf89322babb89fe0a30430606ebdfcdfc Change-Id: I35e89feaf89322babb89fe0a30430606ebdfcdfc
-rw-r--r--packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
index 699a79cbfbad..096314d1c51a 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
@@ -579,7 +579,7 @@ class MediaDataManager(
// Song name
var song: CharSequence? = metadata?.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)
if (song.isNullOrBlank()) {
- song = metadata.getString(MediaMetadata.METADATA_KEY_TITLE)
+ song = metadata?.getString(MediaMetadata.METADATA_KEY_TITLE)
}
if (song.isNullOrBlank()) {
song = HybridGroupManager.resolveTitle(notif)