Avoid resuming activity before launch.
The locktask logic would always bring a locked task to the front and
then resume it when locking. When a task is to be locked at launch that
would cause it to resume immediately before onLaunch was called. Which
would cause havoc because the token was not yet in
ActivityThread.mActivities. This lead to premature finish() calls and
looping restarts.
This change causes the resume to only be called when an app calls
startLockTask. Otherwise the resume call is skipped.
Plus additional locktask debug logging.
Fixes bug 21031298.
Change-Id: I756b0d607827d0ec7a123377db04d9377c41776d
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index f304828..5eee34f 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -1185,7 +1185,7 @@
final TaskRecord task = r.task;
if (task.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) {
- setLockTaskModeLocked(task, LOCK_TASK_MODE_LOCKED, "mLockTaskAuth==LAUNCHABLE");
+ setLockTaskModeLocked(task, LOCK_TASK_MODE_LOCKED, "mLockTaskAuth==LAUNCHABLE", false);
}
final ActivityStack stack = task.stack;
@@ -3675,7 +3675,11 @@
}
void removeLockedTaskLocked(final TaskRecord task) {
- if (mLockTaskModeTasks.remove(task) && mLockTaskModeTasks.isEmpty()) {
+ if (!mLockTaskModeTasks.remove(task)) {
+ return;
+ }
+ if (DEBUG_LOCKTASK) Slog.w(TAG_LOCKTASK, "removeLockedTaskLocked: removed " + task);
+ if (mLockTaskModeTasks.isEmpty()) {
// Last one.
if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "removeLockedTask: task=" + task +
" last task, reverting locktask mode. Callers=" + Debug.getCallers(3));
@@ -3696,7 +3700,8 @@
}
}
- void setLockTaskModeLocked(TaskRecord task, int lockTaskModeState, String reason) {
+ void setLockTaskModeLocked(TaskRecord task, int lockTaskModeState, String reason,
+ boolean andResume) {
if (task == null) {
// Take out of lock task mode if necessary
final TaskRecord lockedTask = getLockedTaskLocked();
@@ -3745,8 +3750,11 @@
if (task.mLockTaskUid == -1) {
task.mLockTaskUid = task.mCallingUid;
}
- findTaskToMoveToFrontLocked(task, 0, null, reason);
- resumeTopActivitiesLocked();
+
+ if (andResume) {
+ findTaskToMoveToFrontLocked(task, 0, null, reason);
+ resumeTopActivitiesLocked();
+ }
}
boolean isLockTaskModeViolation(TaskRecord task) {
@@ -3780,6 +3788,8 @@
lockedTask.setLockTaskAuth();
if (wasLaunchable && lockedTask.mLockTaskAuth != LOCK_TASK_AUTH_LAUNCHABLE) {
// Lost whitelisting authorization. End it now.
+ if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK, "onLockTaskPackagesUpdated: removing " +
+ lockedTask + " mLockTaskAuth=" + lockedTask.lockTaskAuthToString());
removeLockedTaskLocked(lockedTask);
lockedTask.performClearTaskLocked();
didSomething = true;
@@ -3797,7 +3807,11 @@
if (mLockTaskModeTasks.isEmpty() && task != null
&& task.mLockTaskAuth == LOCK_TASK_AUTH_LAUNCHABLE) {
// This task must have just been authorized.
- setLockTaskModeLocked(task, ActivityManager.LOCK_TASK_MODE_LOCKED, "package updated");
+ if (DEBUG_LOCKTASK) Slog.d(TAG_LOCKTASK,
+ "onLockTaskPackagesUpdated: starting new locktask task=" + task);
+ setLockTaskModeLocked(task, ActivityManager.LOCK_TASK_MODE_LOCKED, "package updated",
+ false);
+ didSomething = true;
}
if (didSomething) {
resumeTopActivitiesLocked();