diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 8eb6432e0d52..8a78426470f8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -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); } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index 2510385f4580..5b7cf5a72f0a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -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()); + } } |