Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0063c248 authored by wilsonshih's avatar wilsonshih Committed by Wei Sheng Shih
Browse files

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
parent 02e0f62b

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

+0 −3
Original line number Diff line number Diff line
@@ -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);

        }

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

+0 −12
Original line number Diff line number Diff line
@@ -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;
@@ -157,16 +155,6 @@ public class WindowManagerServiceTests extends WindowTestsBase { 
        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

    public void testMoveWindowTokenToDisplay_NullToken_DoNothing() {

        mWm.moveWindowTokenToDisplay(null, mDisplayContent.getDisplayId());