Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Selim Cinek
2017-08-04 23:41:07 +00:00
committed by Android (Google) Code Review
parent bd27fd7368 02f1d2f97b
commit 82e815616e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -1164,7 +1164,7 @@ final class TaskRecord extends ConfigurationContainer implements TaskWindowConta
if (mStack != null) { if (mStack != null) {
for (int activityNdx = mActivities.size() - 1; activityNdx >= 0; --activityNdx) { for (int activityNdx = mActivities.size() - 1; activityNdx >= 0; --activityNdx) {
ActivityRecord r = mActivities.get(activityNdx); ActivityRecord r = mActivities.get(activityNdx);
if (!r.finishing && r.okToShowLocked() && r.visible) { if (!r.finishing && r.okToShowLocked() && r.visibleIgnoringKeyguard) {
outActivities.add(r); outActivities.add(r);
} }
} }