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

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

Merge "Fix some crashes when going between fold / unfold with bubble bar" into main

parents dbe3505d 4f031ef6

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+5 −1
Original line number Diff line number Diff line
@@ -1306,7 +1306,11 @@ public class BubbleController implements ConfigurationChangeListener, 
                // TODO b/392893178: Merge the unfold and the task view transition so that we don't

                //  have to post a delayed runnable to the looper to update the bounds

                if (mStackView.isExpanded()) {

                    mStackView.postDelayed(() -> mStackView.updateExpandedView(), 500);

                    mStackView.postDelayed(() -> {

                        if (mStackView != null) {

                            mStackView.updateExpandedView();

                        }

                    } , 500);

                }

            }

            if (newConfig.fontScale != mFontScale) {

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleExpandedView.java

+6 −3
Original line number Diff line number Diff line
@@ -468,9 +468,12 @@ public class BubbleExpandedView extends LinearLayout { 
                            public void onTaskCreated() {

                                // The taskId is saved to use for removeTask,

                                // preventing appearance in recent tasks.

                                mTaskId = ((BubbleTaskViewListener) mCurrentTaskViewListener)

                                    .getTaskId();



                                BubbleTaskViewListener listener = mCurrentTaskViewListener != null

                                        ? ((BubbleTaskViewListener) mCurrentTaskViewListener)

                                        : null;

                                mTaskId = listener != null

                                        ? listener.getTaskId()

                                        : bubbleTaskView.getTaskId();

                                setContentVisibility(true);

                            }