Commit 72a36526 authored Sep 26, 2017 by Charles He

AM: fix bug in moveTaskToBackLocked due to LockTask

In the previous refactor of LockTask-related methods, there was a typo
which resulted in an incorrect lock task state being reported during
moveTaskToBackLocked.

Bug: 66224859
Test: cts/tests/framework/base/activitymanager/util/run-test CtsActivityManagerDeviceTestCases android.server.am.ActivityManagerPinnedStackTests
Test: bit FrameworksServicesTests:com.android.server.am.LockTaskControllerTest
Change-Id: Ic235069ed3c2bafb14efcd83b98af12e37fcb5a7

parent 8c238c5a

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4611,7 +4611,7 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		Slog.i(TAG, "moveTaskToBack: " + tr);

		// If the task is locked, then show the lock task toast
		if (!mService.mLockTaskController.checkLockedTask(tr)) {
		if (mService.mLockTaskController.checkLockedTask(tr)) {
		return false;
		}