Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev

2020-06-19 20:40:09 +00:00
parent a2e3ae1365 4ddd778d0e
commit 6c8c9ea8cb
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt
@@ -162,7 +162,7 @@ internal class BubbleDataRepository @Inject constructor(
        // into Bubble.
        val bubbles = entities.mapNotNull { entity ->
            shortcutMap[ShortcutKey(entity.userId, entity.packageName)]
-                    ?.first { shortcutInfo -> entity.shortcutId == shortcutInfo.id }
+                    ?.firstOrNull { shortcutInfo -> entity.shortcutId == shortcutInfo.id }
                    ?.let { shortcutInfo -> Bubble(
                            entity.key,
                            shortcutInfo,