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

Commit 91ad5333 authored by Ivan Tkachenko's avatar Ivan Tkachenko
Browse files

Fix freeform task launch handling when keyguard locked 

- Do not handle freeform task launches when keyguard is locked. The task
  windowing mode changes to fullscreen (More details: b/160925539).

Bug: 348276049
Test: atest WMShellUnitTests:DesktopTasksControllerTest
Test: atest CtsWindowManagerDeviceActivity:ActivityVisibilityTests
Flag: EXEMPT bugfix
Change-Id: Ie219fbb2faef332739a5d2ca40a26634387f6680
parent 8e6236d7

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.dagger;



import android.annotation.Nullable;

import android.app.KeyguardManager;

import android.content.Context;

import android.content.pm.LauncherApps;

import android.os.Handler;
@@ -512,6 +513,7 @@ public abstract class WMShellModule { 
            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            DragAndDropController dragAndDropController,

            Transitions transitions,

            KeyguardManager keyguardManager,

            EnterDesktopTaskTransitionHandler enterDesktopTransitionHandler,

            ExitDesktopTaskTransitionHandler exitDesktopTransitionHandler,

            ToggleResizeDesktopTaskTransitionHandler toggleResizeDesktopTaskTransitionHandler,
@@ -526,7 +528,7 @@ public abstract class WMShellModule { 
            Optional<RecentTasksController> recentTasksController) {

        return new DesktopTasksController(context, shellInit, shellCommandHandler, shellController,

                displayController, shellTaskOrganizer, syncQueue, rootTaskDisplayAreaOrganizer,

                dragAndDropController, transitions, enterDesktopTransitionHandler,

                dragAndDropController, transitions, keyguardManager, enterDesktopTransitionHandler,

                exitDesktopTransitionHandler, toggleResizeDesktopTaskTransitionHandler,

                dragToDesktopTransitionHandler, desktopModeTaskRepository,

                desktopModeLoggerTransitionObserver, launchAdjacentController,

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+8 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode 


import android.app.ActivityManager.RunningTaskInfo

import android.app.ActivityOptions

import android.app.KeyguardManager

import android.app.PendingIntent

import android.app.TaskInfo

import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME
@@ -108,6 +109,7 @@ class DesktopTasksController( 
    private val rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer,

    private val dragAndDropController: DragAndDropController,

    private val transitions: Transitions,

    private val keyguardManager: KeyguardManager,

    private val enterDesktopTaskTransitionHandler: EnterDesktopTaskTransitionHandler,

    private val exitDesktopTaskTransitionHandler: ExitDesktopTaskTransitionHandler,

    private val toggleResizeDesktopTaskTransitionHandler: ToggleResizeDesktopTaskTransitionHandler,
@@ -972,6 +974,12 @@ class DesktopTasksController( 
        transition: IBinder

    ): WindowContainerTransaction? {

        KtProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: handleFreeformTaskLaunch")

        if (keyguardManager.isKeyguardLocked) {

            // Do NOT handle freeform task launch when locked.

            // It will be launched in fullscreen windowing mode (Details: b/160925539)

            KtProtoLog.v(WM_SHELL_DESKTOP_MODE, "DesktopTasksController: skip keyguard is locked")

            return null

        }

        if (!desktopModeTaskRepository.isDesktopModeShowing(task.displayId)) {

            KtProtoLog.d(

                WM_SHELL_DESKTOP_MODE,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.desktopmode 


import android.app.ActivityManager.RecentTaskInfo

import android.app.ActivityManager.RunningTaskInfo

import android.app.KeyguardManager

import android.app.WindowConfiguration.ACTIVITY_TYPE_HOME

import android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD

import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM
@@ -149,6 +150,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Mock lateinit var syncQueue: SyncTransactionQueue

  @Mock lateinit var rootTaskDisplayAreaOrganizer: RootTaskDisplayAreaOrganizer

  @Mock lateinit var transitions: Transitions

  @Mock lateinit var keyguardManager: KeyguardManager

  @Mock lateinit var exitDesktopTransitionHandler: ExitDesktopTaskTransitionHandler

  @Mock lateinit var enterDesktopTransitionHandler: EnterDesktopTaskTransitionHandler

  @Mock
@@ -233,6 +235,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
        rootTaskDisplayAreaOrganizer,

        dragAndDropController,

        transitions,

        keyguardManager,

        enterDesktopTransitionHandler,

        exitDesktopTransitionHandler,

        toggleResizeDesktopTaskTransitionHandler,
@@ -1174,6 +1177,17 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    assertTrue(result.anyDensityConfigChange(freeformTask2.token))

  }



  @Test

  fun handleRequest_freeformTask_keyguardLocked_returnNull() {

    assumeTrue(ENABLE_SHELL_TRANSITIONS)

    whenever(keyguardManager.isKeyguardLocked).thenReturn(true)

    val freeformTask = createFreeformTask(displayId = DEFAULT_DISPLAY)



    val result = controller.handleRequest(Binder(), createTransition(freeformTask))



    assertNull(result, "Should NOT handle request")

  }



  @Test

  fun handleRequest_notOpenOrToFrontTransition_returnNull() {

    assumeTrue(ENABLE_SHELL_TRANSITIONS)