Merge "Update javadoc and log message to avoid confusion." into tm-dev (e29c639e) · Commits · e / os / android_frameworks_base

core/java/android/app/KeyguardManager.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -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() {