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

Merge "Fix preventable NPE & probable others" into rvc-dev am: f622ff9add

Browse Source 
Change-Id: I23dffbdd0cc3b9b7221afd00b1fb6591641b1890
This commit is contained in:
TreeHugger Robot
2020-04-10 23:20:22 +00:00
committed by Automerger Merge Worker
parent 7200f667be f622ff9add
commit aef6be41d0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1349,7 +1349,8 @@ public class BubbleStackView extends FrameLayout {
if (show
&& mShouldShowManageEducation
&& mManageEducationView.getVisibility() != VISIBLE
&& mIsExpanded) {
&& mIsExpanded
&& mExpandedBubble.getExpandedView() != null) {
mManageEducationView.setAlpha(0);
mManageEducationView.setVisibility(VISIBLE);
mManageEducationView.post(() -> {
@@ -1909,7 +1910,8 @@ public class BubbleStackView extends FrameLayout {
Log.d(TAG, "updateExpandedBubble()");
}
mExpandedViewContainer.removeAllViews();
if (mIsExpanded && mExpandedBubble != null) {
if (mIsExpanded && mExpandedBubble != null
&& mExpandedBubble.getExpandedView() != null) {
BubbleExpandedView bev = mExpandedBubble.getExpandedView();
mExpandedViewContainer.addView(bev);
bev.populateExpandedView();
@@ -1929,7 +1931,7 @@ public class BubbleStackView extends FrameLayout {
if (!mExpandedViewYAnim.isRunning()) {
// We're not animating so set the value
mExpandedViewContainer.setTranslationY(y);
if (mExpandedBubble != null) {
if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
mExpandedBubble.getExpandedView().updateView();
}
} else {
@@ -1967,7 +1969,7 @@ public class BubbleStackView extends FrameLayout {
}
private void updatePointerPosition() {
if (mExpandedBubble == null) {
if (mExpandedBubble == null || mExpandedBubble.getExpandedView() == null) {
return;
}
int index = getBubbleIndex(mExpandedBubble);
@@ -2049,7 +2051,7 @@ public class BubbleStackView extends FrameLayout {
* a back key down/up event pair is forwarded to the bubble Activity.
*/
boolean performBackPressIfNeeded() {
if (!isExpanded() || mExpandedBubble == null) {
if (!isExpanded() || mExpandedBubble == null || mExpandedBubble.getExpandedView() == null) {
return false;
}
return mExpandedBubble.getExpandedView().performBackPressIfNeeded();