Merge "Fix activity start over Keyguard" into oc-dr1-dev am: 82e815616e am: 2b991665da (a67f1c98) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}