From 72a3652665b059f24ca38625ef08187f0afb5601 Mon Sep 17 00:00:00 2001 From: Charles He Date: Tue, 26 Sep 2017 10:45:25 +0100 Subject: [PATCH] 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 --- services/core/java/com/android/server/am/ActivityStack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 8d21862142d7..3f11fcf32615 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -4611,7 +4611,7 @@ class ActivityStack 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; } -- 2.11.0