From 5d5af9b1bc8a02e8ab94f56f1cb81e28caaff65f Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Wed, 5 Jan 2022 15:56:53 +0000 Subject: [PATCH] Correct a transient view cleanup error removeView doesn't remove the view view from the transient children list, so the only way the old call would do anything is if the transient container was incorrect. The new code appears to be what the code was intended to do. Test: manual Change-Id: I407dc0bcdb779003a40c5beb9ff80ff5759aa418 --- .../notification/collection/render/MediaContainerController.kt | 2 +- .../notification/collection/render/SectionHeaderController.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt index 560e277a9dc27..f949af0688be1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt @@ -36,7 +36,7 @@ class MediaContainerController @Inject constructor( fun reinflateView(parent: ViewGroup) { var oldPos = -1 mediaContainerView?.let { _view -> - _view.transientContainer?.removeView(_view) + _view.removeFromTransientContainer() if (_view.parent === parent) { oldPos = parent.indexOfChild(_view) parent.removeView(_view) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt index 8c15647c50389..4e9017e05ecd5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt @@ -60,7 +60,7 @@ internal class SectionHeaderNodeControllerImpl @Inject constructor( override fun reinflateView(parent: ViewGroup) { var oldPos = -1 _view?.let { _view -> - _view.transientContainer?.removeView(_view) + _view.removeFromTransientContainer() if (_view.parent === parent) { oldPos = parent.indexOfChild(_view) parent.removeView(_view)