From 8de289ada1a8d450eaa6debc2d5cb41834262796 Mon Sep 17 00:00:00 2001 From: Chandru Date: Thu, 14 Jul 2022 14:25:13 +0000 Subject: [PATCH] Remove onClockVisibilityChanged callback from KUMCallback This callback is never invoked except once while the callback is being registered. Bug: 238187419 Test: atest KeyguardUpdateMonitorTest passes Test: atest KeyguardViewMediatorTest passes Change-Id: Ib349ea061728860cc43782db21df03d8e698e363 --- .../src/com/android/keyguard/KeyguardUpdateMonitor.java | 1 - .../com/android/keyguard/KeyguardUpdateMonitorCallback.java | 6 ------ .../com/android/systemui/keyguard/KeyguardViewMediator.java | 6 +----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 584beaeea7675..f5456d2352a1e 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -3347,7 +3347,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab callback.onTimeChanged(); callback.onPhoneStateChanged(mPhoneState); callback.onRefreshCarrierInfo(); - callback.onClockVisibilityChanged(); callback.onKeyguardVisibilityChangedRaw(mKeyguardIsVisible); callback.onTelephonyCapable(mTelephonyCapable); diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java index d420abd688ae4..85c75110460c4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitorCallback.java @@ -110,12 +110,6 @@ public class KeyguardUpdateMonitorCallback { */ public void onKeyguardDismissAnimationFinished() { } - /** - * Called when visibility of lockscreen clock changes, such as when - * obscured by a widget. - */ - public void onClockVisibilityChanged() { } - /** * Called when the device becomes provisioned */ diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 5b90ed834253e..71c4fc6c6adf8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -555,11 +555,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, } } - @Override - public void onClockVisibilityChanged() { - adjustStatusBarLocked(); - } - @Override public void onDeviceProvisioned() { sendUserPresentBroadcast(); @@ -1193,6 +1188,7 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, mSystemReady = true; doKeyguardLocked(null); mUpdateMonitor.registerCallback(mUpdateCallback); + adjustStatusBarLocked(); mDreamOverlayStateController.addCallback(mDreamOverlayStateCallback); } // Most services aren't available until the system reaches the ready state, so we