commit 82e815616e1fcab7bcdab737dfc1a28946b0f486
author Selim Cinek <cinek@google.com> Fri Aug 04 23:41:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 04 23:41:07 2017 +0000
tree e12729b743cbeb21c566c15a157e46e023817395
parent bd27fd7368c04350a37c6c117170d4a9cdc1516a
parent 02f1d2f97b244008bc76723f857621385491820e

Merge "Fix activity start over Keyguard" into oc-dr1-dev

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

diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 24e06929..c009dde 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 @@
         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);
                 }
             }