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

Merge "Updates internal lock task mode state early" into rvc-dev

Browse Source
This commit is contained in:
Hongwei Wang
2020-06-23 16:01:39 +00:00
committed by Android (Google) Code Review
parent 38a6333ff6 d816329580
commit 836d2b0fac
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/wm/LockTaskController.java
View File

@@ -175,7 +175,7 @@ public class LockTaskController {
* {@link ActivityManager#LOCK_TASK_MODE_NONE}, {@link ActivityManager#LOCK_TASK_MODE_LOCKED}, * {@link ActivityManager#LOCK_TASK_MODE_NONE}, {@link ActivityManager#LOCK_TASK_MODE_LOCKED},
* {@link ActivityManager#LOCK_TASK_MODE_PINNED} * {@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. * This is ActivityStackSupervisor's Handler.
@@ -500,24 +500,29 @@ public class LockTaskController {
// This method should only be called on the handler thread // This method should only be called on the handler thread
private void performStopLockTask(int userId) { 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. // When lock task ends, we enable the status bars.
try { try {
setStatusBarState(LOCK_TASK_MODE_NONE, userId); setStatusBarState(mLockTaskModeState, userId);
setKeyguardState(LOCK_TASK_MODE_NONE, userId); setKeyguardState(mLockTaskModeState, userId);
if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) { if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {
lockKeyguardIfNeeded(); lockKeyguardIfNeeded();
} }
if (getDevicePolicyManager() != null) { if (getDevicePolicyManager() != null) {
getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId); getDevicePolicyManager().notifyLockTaskModeChanged(false, null, userId);
} }
if (mLockTaskModeState == LOCK_TASK_MODE_PINNED) { if (oldLockTaskModeState == LOCK_TASK_MODE_PINNED) {
getStatusBarService().showPinningEnterExitToast(false /* entering */); getStatusBarService().showPinningEnterExitToast(false /* entering */);
} }
mWindowManager.onLockTaskStateChanged(LOCK_TASK_MODE_NONE); mWindowManager.onLockTaskStateChanged(mLockTaskModeState);
} catch (RemoteException ex) { } catch (RemoteException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} finally {
mLockTaskModeState = LOCK_TASK_MODE_NONE;
} }
} }