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

Fix crash when opening bubble overflow

Browse Source 
BubbleExpandedView needs a BubbleStackView reference, without that
there could be an NPE in various locations.

Also uses the correct parent view to setup the overflow.

Test: manual - tap on the overflow, observe no crash
Fixes: 150394526
Change-Id: Ib1ae9353a0dfd60ac8b6eb4f94b5b0cc5bc47811
This commit is contained in:
Mady Mellor
2020-02-27 12:15:39 -08:00
parent 5b55f124d8
commit 0122cc904f
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/bubbles/BubbleOverflow.java
View File

@@ -62,11 +62,12 @@ public class BubbleOverflow implements BubbleViewProvider {
R.dimen.bubble_overflow_icon_bitmap_size);
}
public void setUpOverflow(ViewGroup parentViewGroup) {
void setUpOverflow(ViewGroup parentViewGroup, BubbleStackView stackView) {
mOverflowExpandedView = (BubbleExpandedView) mInflater.inflate(
R.layout.bubble_expanded_view, parentViewGroup /* root */,
false /* attachToRoot */);
mOverflowExpandedView.setOverflow(true);
mOverflowExpandedView.setStackView(stackView);
updateIcon(mContext, parentViewGroup);
}

4
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -522,8 +522,8 @@ public class BubbleStackView extends FrameLayout {
private void setUpOverflow() {
int overflowBtnIndex = 0;
if (mBubbleOverflow == null) {
mBubbleOverflow = new BubbleOverflow(mContext);
mBubbleOverflow.setUpOverflow(this);
mBubbleOverflow = new BubbleOverflow(getContext());
mBubbleOverflow.setUpOverflow(mBubbleContainer, this);
} else {
mBubbleContainer.removeView(mBubbleOverflow.getBtn());
mBubbleOverflow.updateIcon(mContext, this);