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

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931364

Change-Id: Iffad41a6ad73200cbc3f16ead94d3afe5eb1a42a
This commit is contained in:
TreeHugger Robot
2020-06-19 20:46:53 +00:00
committed by Automerger Merge Worker
parent cb647e6139 6c8c9ea8cb
commit 978fea8f8a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/bubbles/BubbleDataRepository.kt
View File

@@ -162,7 +162,7 @@ internal class BubbleDataRepository @Inject constructor(
// into Bubble. // into Bubble.
val bubbles = entities.mapNotNull { entity -> val bubbles = entities.mapNotNull { entity ->
shortcutMap[ShortcutKey(entity.userId, entity.packageName)] shortcutMap[ShortcutKey(entity.userId, entity.packageName)]
?.first { shortcutInfo -> entity.shortcutId == shortcutInfo.id } ?.firstOrNull { shortcutInfo -> entity.shortcutId == shortcutInfo.id }
?.let { shortcutInfo -> Bubble( ?.let { shortcutInfo -> Bubble(
entity.key, entity.key,
shortcutInfo, shortcutInfo,