Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c8c9ea8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix the exception when shortcut info was removed before loading... 

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

packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -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,