From 1faa1baaa626e8e415152ce16df1dab35b1cb243 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 19 Mar 2021 08:20:31 -0400 Subject: [PATCH] Ensure dumpable tag is unique By appending the current instance to its tag Test: manual Fixes: 183137150 Change-Id: I4734a18ea3d5f79c32653e70ebf9216c36594d9d --- .../biometrics/UdfpsAnimationViewController.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java index b7726f41e4a8e..2f025f63034e3 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsAnimationViewController.java @@ -72,7 +72,7 @@ abstract class UdfpsAnimationViewController mStateListener.onStateChanged(mStatusBarStateController.getState()); mStatusBar.addExpansionChangedListener(mStatusBarExpansionChangedListener); - mDumpManger.registerDumpable(getTag(), this); + mDumpManger.registerDumpable(getDumpTag(), this); } @Override @@ -80,7 +80,17 @@ abstract class UdfpsAnimationViewController mStatusBarStateController.removeCallback(mStateListener); mStatusBar.removeExpansionChangedListener(mStatusBarExpansionChangedListener); - mDumpManger.unregisterDumpable(getTag()); + mDumpManger.unregisterDumpable(getDumpTag()); + } + + /** + * in some cases, onViewAttached is called for the newly added view using an instance of + * this controller before onViewDetached is called on the previous view, so we must have a + * unique dump tag per instance of this class + * @return a unique tag for this instance of this class + */ + private String getDumpTag() { + return getTag() + " (" + this + ")"; } @Override