From 02f1d2f97b244008bc76723f857621385491820e Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Fri, 4 Aug 2017 14:29:16 +0200 Subject: [PATCH] Fix activity start over Keyguard Starting an activity over Keyguard was stuck in initializing state because activtiy isn't visible yet. Instead, use visibleIgnoringKeyguard to determine which activities to start Test: KeyguardTests, KeyguardLockedTests, Test: go/wm-smoke Change-Id: I7dce1f2f1a2830012d2372db7e8655803251188d Fixes: 64351094 --- services/core/java/com/android/server/am/TaskRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 24e069292f8a1..c009ddeb8d5f5 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -1164,7 +1164,7 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta if (mStack != null) { for (int activityNdx = mActivities.size() - 1; activityNdx >= 0; --activityNdx) { ActivityRecord r = mActivities.get(activityNdx); - if (!r.finishing && r.okToShowLocked() && r.visible) { + if (!r.finishing && r.okToShowLocked() && r.visibleIgnoringKeyguard) { outActivities.add(r); } }