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

am: 82e815616e Change-Id: Ic7750a2f8d0183b350e3a9ec5541f38df613fe63
2017-08-04 23:53:32 +00:00
parent cdc7175b16 82e815616e
commit 2b991665da
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -1163,7 +1163,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);
                }
            }