Merge "Fixes cannot leave dozing when dismiss keyguard." (f1897983) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3069,6 +3069,9 @@ public class WindowManagerService extends IWindowManager.Stub
		if (!checkCallingPermission(permission.CONTROL_KEYGUARD, "dismissKeyguard")) {
		throw new SecurityException("Requires CONTROL_KEYGUARD permission");
		}
		if (mAtmInternal.isDreaming()) {
		mAtmService.mStackSupervisor.wakeUp("dismissKeyguard");
		}
		synchronized (mGlobalLock) {
		mPolicy.dismissKeyguardLw(callback, message);
		}

+12 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import static android.window.DisplayAreaOrganizer.FEATURE_VENDOR_FIRST;

		import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;

		import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing;
		import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
		import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;
		import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

		@@ -164,4 +166,14 @@ public class WindowManagerServiceTests extends WindowTestsBase {

		verify(mWm.mAtmService).setFocusedTask(tappedTask.mTaskId);
		}

		@Test
		public void testDismissKeyguardCanWakeUp() {
		doReturn(true).when(mWm).checkCallingPermission(anyString(), anyString());
		spyOn(mWm.mAtmInternal);
		doReturn(true).when(mWm.mAtmInternal).isDreaming();
		doNothing().when(mWm.mAtmService.mStackSupervisor).wakeUp(anyString());
		mWm.dismissKeyguard(null, "test-dismiss-keyguard");
		verify(mWm.mAtmService.mStackSupervisor).wakeUp(anyString());
		}
		}