From 3f64c1df9888bf7893e9747a2c149e6c695fb962 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Sat, 22 Jan 2022 03:39:22 +0000 Subject: Fix a transient view crash. Fixes: 215154169 Test: manual testing making the silent view re-add Change-Id: I77c9fddb62cae8358e624b9e94ba8a906733df9b --- .../systemui/statusbar/notification/row/ExpandableView.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java index 624e7416d3ee..6eff7993c59c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableView.java @@ -552,14 +552,8 @@ public abstract class ExpandableView extends FrameLayout implements Dumpable { final ViewGroup transientContainer = getTransientContainer(); if (parent == null || parent == newParent) { // If this view's current parent is null or the same as the new parent, the add will - // succeed, so just make sure the tracked transient container is in sync with the - // current parent. - if (transientContainer != null && transientContainer != parent) { - Log.w(TAG, "Expandable view " + this - + " has transient container " + transientContainer - + " but different parent" + parent); - setTransientContainer(null); - } + // succeed as long as it's a true child, so just make sure the view isn't transient. + removeFromTransientContainer(); return; } if (transientContainer == null) { -- cgit v1.2.3-59-g8ed1b