commit 9f62ea551f70573a284a4f64ec5635616e28529a
author wilsonshih <wilsonshih@google.com> Tue Mar 01 16:12:53 2022 +0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 15 18:16:26 2022 +0000
tree e2dad4c18c80d8476bac59e304a31fd0733edfb2
parent 5df6c3f7099d3d2e237f54c41692bdef5f090d45

Revert "Fixes cannot leave dozing when dismiss keyguard"

Regression from I62be9283a1d22119eceae5585960b5775a019153.
When dismiss keyguard from shell command, the wakeup signal should only
be used when dream activity is on top.

Bug: 219376804
Bug: 222429976
Test: atest KeyguardTests KeyguardLockedTests
Test: atest WindowManagerServiceTests

Change-Id: I4edab8588421b3e341cf3bde07e989ff5e651cfe
Merged-In: I4edab8588421b3e341cf3bde07e989ff5e651cfe
(cherry picked from commit 0063c2488e0eacb103ed33f2b1397a7d83c225d0)
Merged-In: I4edab8588421b3e341cf3bde07e989ff5e651cfe

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 4258e07..575ae691 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3277,9 +3277,6 @@
         if (!checkCallingPermission(permission.CONTROL_KEYGUARD, "dismissKeyguard")) {
             throw new SecurityException("Requires CONTROL_KEYGUARD permission");
         }
-        if (mAtmInternal.isDreaming()) {
-            mAtmService.mTaskSupervisor.wakeUp("dismissKeyguard");
-        }
         synchronized (mGlobalLock) {
             mPolicy.dismissKeyguardLw(callback, message);
         }

services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java

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 a91298f..10011fd 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java
@@ -31,7 +31,6 @@
 
 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;
@@ -42,7 +41,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -158,16 +156,6 @@
     }
 
     @Test
-    public void testDismissKeyguardCanWakeUp() {
-        doReturn(true).when(mWm).checkCallingPermission(anyString(), anyString());
-        spyOn(mWm.mAtmInternal);
-        doReturn(true).when(mWm.mAtmInternal).isDreaming();
-        doNothing().when(mWm.mAtmService.mTaskSupervisor).wakeUp(anyString());
-        mWm.dismissKeyguard(null, "test-dismiss-keyguard");
-        verify(mWm.mAtmService.mTaskSupervisor).wakeUp(anyString());
-    }
-
-    @Test
     public void testMoveWindowTokenToDisplay_NullToken_DoNothing() {
         mWm.moveWindowTokenToDisplay(null, mDisplayContent.getDisplayId());