summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hawkwood Glazier <jglazier@google.com> 2023-08-15 17:13:51 +0000
committer Hawkwood Glazier <jglazier@google.com> 2023-08-18 15:38:15 +0000
commit097518c6c26c8a19b5b729696f6c07291f15600c (patch)
treee3dba4da183e1e083ea7a3c15286a192f2aa9739
parent89de5a4947c6a0a4bc7e52b36ce67a3fe2b54539 (diff)
Only register the primary KeyguardClockSwitchController w/ DumpManager
This prevents the KCSC associated with the secondary display from dumping, but also prevents it from leaking after the secondary display has been removed. Bug: 295143740 Test: Manually checked with secondary display Change-Id: Iebe14fad8e0a883c5f4fec7fb50bb6ce0107f8fc Merged-In: Iebe14fad8e0a883c5f4fec7fb50bb6ce0107f8fc
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index 21d8c0af5685..847f0a0d106c 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -211,8 +211,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
mSmallClockFrame = mView.findViewById(R.id.lockscreen_clock_view);
mLargeClockFrame = mView.findViewById(R.id.lockscreen_clock_view_large);
- mDumpManager.unregisterDumpable(getClass().toString()); // unregister previous clocks
- mDumpManager.registerDumpable(getClass().toString(), this);
+ if (!mOnlyClock) {
+ mDumpManager.unregisterDumpable(getClass().toString()); // unregister previous clocks
+ mDumpManager.registerDumpable(getClass().toString(), this);
+ }
if (mFeatureFlags.isEnabled(LOCKSCREEN_WALLPAPER_DREAM_ENABLED)) {
mStatusArea = mView.findViewById(R.id.keyguard_status_area);