diff options
| author | wilsonshih <wilsonshih@google.com> | 2022-03-01 16:12:53 +0800 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-15 06:55:38 +0000 |
| commit | f4e1af0ae6056d28c98e24a5aded127586be1a28 (patch) | |
| tree | fb73a3ae604f25084366d88042829f947aeec9e8 | |
| parent | 274eecfba13a77ff22fbb43115ff95dded3749ee (diff) | |
| download | base-f4e1af0ae6056d28c98e24a5aded127586be1a28.tar.gz | |
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
| -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, 0 insertions, 15 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 4258e073429e..575ae691dbe8 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 @@ public class WindowManagerService extends IWindowManager.Stub 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); } 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 a91298f73d08..10011fd4e6e3 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 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; @@ -42,7 +41,6 @@ import static org.junit.Assert.assertFalse; 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 @@ public class WindowManagerServiceTests extends WindowTestsBase { } @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()); |