Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fixes cannot leave dozing when dismiss keyguard"

Browse Source 
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
This commit is contained in:
wilsonshih
2022-03-01 16:12:53 +08:00
committed by Wei Sheng Shih
parent 02e0f62b17
commit 0063c2488e
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

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

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

@@ -31,7 +31,6 @@ import static android.window.DisplayAreaOrganizer.FEATURE_VENDOR_FIRST;
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation; 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.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; 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.any;
import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -157,16 +155,6 @@ public class WindowManagerServiceTests extends WindowTestsBase {
verify(mWm.mAtmService).setFocusedTask(tappedTask.mTaskId, null); verify(mWm.mAtmService).setFocusedTask(tappedTask.mTaskId, null);
} }
@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 @Test
public void testMoveWindowTokenToDisplay_NullToken_DoNothing() { public void testMoveWindowTokenToDisplay_NullToken_DoNothing() {
mWm.moveWindowTokenToDisplay(null, mDisplayContent.getDisplayId()); mWm.moveWindowTokenToDisplay(null, mDisplayContent.getDisplayId());