Merge "Add lock task checking to moving tasks to back" into lmp-dev (327f7ebc) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+16 −4

Original line number	Diff line number	Diff line
		@@ -8408,6 +8408,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		synchronized(this) {
		TaskRecord tr = recentTaskForIdLocked(taskId);
		if (tr != null) {
		if (tr == mStackSupervisor.mLockTaskModeTask) {
		mStackSupervisor.showLockTaskToast();
		return;
		}
		if (DEBUG_STACK) Slog.d(TAG, "moveTaskToBack: moving task=" + tr);
		ActivityStack stack = tr.stack;
		if (stack.mResumedActivity != null && stack.mResumedActivity.task == tr) {
		@@ -8440,12 +8444,20 @@ public final class ActivityManagerService extends ActivityManagerNative
		enforceNotIsolatedCaller("moveActivityTaskToBack");
		synchronized(this) {
		final long origId = Binder.clearCallingIdentity();
		try {
		int taskId = ActivityRecord.getTaskForActivityLocked(token, !nonRoot);
		if (taskId >= 0) {
		if ((mStackSupervisor.mLockTaskModeTask != null)
		&& (mStackSupervisor.mLockTaskModeTask.taskId == taskId)) {
		mStackSupervisor.showLockTaskToast();
		return false;
		}
		return ActivityRecord.getStackLocked(token).moveTaskToBackLocked(taskId, null);
		}
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		}
		return false;
		}