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

Merge "Fix potential NPE when removing bubble" into udc-dev am: 8afb4df8dd

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

Change-Id: Id904d42c43daf20a7718ffd844a7aa4b3cec6547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2023-05-12 01:24:58 +00:00
committed by Automerger Merge Worker
parent ed5559ac95 8afb4df8dd
commit 19f12b00e5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View File

@@ -1784,10 +1784,13 @@ public class BubbleStackView extends FrameLayout
// We're expanded while the last bubble is being removed. Let the scrim animate away // We're expanded while the last bubble is being removed. Let the scrim animate away
// and then remove our views (removing the icon view triggers the removal of the // and then remove our views (removing the icon view triggers the removal of the
// bubble window so do that at the end of the animation so we see the scrim animate). // bubble window so do that at the end of the animation so we see the scrim animate).
BadgedImageView iconView = bubble.getIconView();
showScrim(false, () -> { showScrim(false, () -> {
mRemovingLastBubbleWhileExpanded = false; mRemovingLastBubbleWhileExpanded = false;
bubble.cleanupExpandedView(); bubble.cleanupExpandedView();
mBubbleContainer.removeView(bubble.getIconView()); if (iconView != null) {
mBubbleContainer.removeView(iconView);
}
bubble.cleanupViews(); // cleans up the icon view bubble.cleanupViews(); // cleans up the icon view
updateExpandedView(); // resets state for no expanded bubble updateExpandedView(); // resets state for no expanded bubble
}); });