Merge "Remove activity from unknown app if starting window is relayouted." into sc-dev

This commit is contained in:
Wei Sheng Shih
2021-07-01 06:28:55 +00:00
committed by Android (Google) Code Review

View File

@@ -133,7 +133,7 @@ class UnknownAppVisibilityController {
Slog.d(TAG, "App relayouted appWindow=" + activity);
}
int state = mUnknownApps.get(activity);
if (state == UNKNOWN_STATE_WAITING_RELAYOUT) {
if (state == UNKNOWN_STATE_WAITING_RELAYOUT || activity.mStartingWindow != null) {
mUnknownApps.put(activity, UNKNOWN_STATE_WAITING_VISIBILITY_UPDATE);
mService.notifyKeyguardFlagsChanged(this::notifyVisibilitiesUpdated,
activity.getDisplayContent().getDisplayId());