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

Merge "Fix NPE from freeing expanded view while expanding." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-25 23:45:37 +00:00
committed by Android (Google) Code Review
parent a57d8ae57f 76735ec30a
commit a2ed294a46
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java
View File

@@ -660,6 +660,14 @@ public class NotificationContentView extends FrameLayout {
private void updateContentTransformation() { private void updateContentTransformation() {
int visibleType = calculateVisibleType(); int visibleType = calculateVisibleType();
if (getTransformableViewForVisibleType(mVisibleType) == null) {
// Case where visible view was removed in middle of transformation. In this case, we
// just update immediately to the appropriate view.
mVisibleType = visibleType;
updateViewVisibilities(visibleType);
updateBackgroundColor(false);
return;
}
if (visibleType != mVisibleType) { if (visibleType != mVisibleType) {
// A new transformation starts // A new transformation starts
mTransformationStartVisibleType = mVisibleType; mTransformationStartVisibleType = mVisibleType;