From 337ec14b4a2f8abc0037c6f13a17b9d2f47dc353 Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Tue, 15 Mar 2022 23:24:51 +0000 Subject: [PATCH] Update javadoc and log message to avoid confusion. "visibility" is sometimes used to refer to (showing && !occluded). Therefore removing the term from the doc and logging. Bug: 216630470 Test: N/A Change-Id: I03b36c99f201fbb8be382a81f2046c3fed5fce13 --- core/java/android/app/KeyguardManager.java | 14 +++++++++++--- .../android/server/wm/WindowManagerService.java | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/java/android/app/KeyguardManager.java b/core/java/android/app/KeyguardManager.java index cedf483eb0767..e9c29b8aa0a53 100644 --- a/core/java/android/app/KeyguardManager.java +++ b/core/java/android/app/KeyguardManager.java @@ -1103,9 +1103,12 @@ public class KeyguardManager { } /** - * Registers a listener to execute when the keyguard visibility changes. + * Registers a listener to execute when the keyguard locked state changes. * - * @param listener The listener to add to receive keyguard visibility changes. + * @param listener The listener to add to receive keyguard locked state changes. + * + * @see #isKeyguardLocked() + * @see #removeKeyguardLockedStateListener(KeyguardLockedStateListener) */ @RequiresPermission(Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE) public void addKeyguardLockedStateListener(@NonNull @CallbackExecutor Executor executor, @@ -1124,7 +1127,12 @@ public class KeyguardManager { } /** - * Unregisters a listener that executes when the keyguard visibility changes. + * Unregisters a listener that executes when the keyguard locked state changes. + * + * @param listener The listener to remove. + * + * @see #isKeyguardLocked() + * @see #addKeyguardLockedStateListener(Executor, KeyguardLockedStateListener) */ @RequiresPermission(Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE) public void removeKeyguardLockedStateListener(@NonNull KeyguardLockedStateListener listener) { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c50888b5a1724..eb88b8b0ea977 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -3278,7 +3278,7 @@ public class WindowManagerService extends IWindowManager.Stub mContext.enforceCallingOrSelfPermission( Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE, Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE - + " permission required to read keyguard visibility"); + + " permission required to subscribe to keyguard locked state changes"); } private void dispatchKeyguardLockedState() {