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

Commit d8163295 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Updates internal lock task mode state early 

When removing a lock task, LockTaskController callbacks status bar on
the lock task mode state change. On the receiver side, SysUI queries
ActivityTaskManager#getLockTaskModeState to updates its SysUiState.

This raises a race condition that SysUI gets a staled lock task state
and uses that info to disable Recents.

PinnedStackTests#testPinnedStackWithDockedStack is flaky since it's
running after PinnedStackTests#testDisallowEnterPipActivityLocked and
relies on Recents being functional.

Bug: 156003518
Test: atest --iteration 5 PinnedStackTests
Change-Id: I1ff3c75c4ad37ee8f3951b8f2d7f2a3b0f8334ce
parent 06cfd499

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

+13 −8
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class LockTaskController { 
     * {@link ActivityManager#LOCK_TASK_MODE_NONE}, {@link ActivityManager#LOCK_TASK_MODE_LOCKED},

     * {@link ActivityManager#LOCK_TASK_MODE_PINNED}

     */

    private int mLockTaskModeState = LOCK_TASK_MODE_NONE;

    private volatile int mLockTaskModeState = LOCK_TASK_MODE_NONE;



    /**

     * This is ActivityStackSupervisor's Handler.
@@ -500,24 +500,29 @@ public class LockTaskController { 


    // This method should only be called on the handler thread

    private void performStopLockTask(int userId) {

        // Update the internal mLockTaskModeState early to avoid the scenario that SysUI queries

        // mLockTaskModeState (from setStatusBarState) and gets staled state.

        // TODO: revisit this approach.

        // The race condition raised above can be addressed by moving this function out of handler

        // thread, which makes it guarded by ATMS#mGlobalLock as ATMS#getLockTaskModeState.

        final int oldLockTaskModeState = mLockTaskModeState;

        mLockTaskModeState = LOCK_TASK_MODE_NONE;

        // When lock task ends, we enable the status bars.

        try {

            setStatusBarState(LOCK_TASK_MODE_NONE, userId);

            setKeyguardState(LOCK_TASK_MODE_NONE, userId);

            if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) {

            setStatusBarState(mLockTaskModeState, userId);

            setKeyguardState(mLockTaskModeState, userId);

            if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {

                lockKeyguardIfNeeded();

            }

            if (getDevicePolicyManager() != null) {

                getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId);

            }

            if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) {

            if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {

                getStatusBarService().showPinningEnterExitToast(false /* entering */);

            }

            mWindowManager.onLockTaskStateChanged(LOCK_TASK_MODE_NONE);

            mWindowManager.onLockTaskStateChanged(mLockTaskModeState);

        } catch (RemoteException ex) {

            throw new RuntimeException(ex);

        } finally {

            mLockTaskModeState = LOCK_TASK_MODE_NONE;

        }

    }