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

Merge "Don't end lock task mode when not in lock task mode"

Browse Source
This commit is contained in:
Christopher Tate
2014-06-18 23:50:54 +00:00
committed by Android (Google) Code Review
parent c4de2caaaf 3bd90617ec
commit 42892f8aa5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -3005,13 +3005,15 @@ public final class ActivityStackSupervisor implements DisplayListener {
}
void setLockTaskModeLocked(TaskRecord task) {
final Message lockTaskMsg = Message.obtain();
if (task == null) {
// Take out of lock task mode.
lockTaskMsg.arg1 = mLockTaskModeTask.userId;
lockTaskMsg.what = LOCK_TASK_END_MSG;
mLockTaskModeTask = null;
mHandler.sendMessage(lockTaskMsg);
// Take out of lock task mode if necessary
if (mLockTaskModeTask != null) {
final Message lockTaskMsg = Message.obtain();
lockTaskMsg.arg1 = mLockTaskModeTask.userId;
lockTaskMsg.what = LOCK_TASK_END_MSG;
mLockTaskModeTask = null;
mHandler.sendMessage(lockTaskMsg);
}
return;
}
if (isLockTaskModeViolation(task)) {
@@ -3021,6 +3023,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
mLockTaskModeTask = task;
findTaskToMoveToFrontLocked(task, 0, null);
resumeTopActivitiesLocked();
final Message lockTaskMsg = Message.obtain();
lockTaskMsg.obj = mLockTaskModeTask.intent.getComponent().getPackageName();
lockTaskMsg.arg1 = mLockTaskModeTask.userId;
lockTaskMsg.what = LOCK_TASK_START_MSG;