From 36003d29f4b84641e64fbb986b2869b57edb64a2 Mon Sep 17 00:00:00 2001 From: Isak Lilja Date: Thu, 12 Nov 2020 11:56:01 +0100 Subject: [PATCH] [DO NOT MERGE] Use loadDrawableAsUser in MediaDataManager This fixes a SystemUI loopcrash when casting as a guest user. Bug: 173026465 Test: Manual - install media app that can cast on guest user only, then cast from guest user. SystemUI should not crash. Test: atest com.android.systemui.media Change-Id: I70f5de89a813c54a616eb701a02aa43272754580 --- .../src/com/android/systemui/media/MediaDataManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index 299ae5b50aa92..08b700bc308d1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -360,7 +360,8 @@ class MediaDataManager( val app = builder.loadHeaderAppName() // App Icon - val smallIconDrawable: Drawable = sbn.notification.smallIcon.loadDrawable(context) + val smallIconDrawable: Drawable = sbn.notification.smallIcon.loadDrawableAsUser(context, + sbn.user.identifier) // Song name var song: CharSequence? = metadata.getString(MediaMetadata.METADATA_KEY_DISPLAY_TITLE)