Merge "Remove com.android.window.flags.fix_show_when_locked_sync_timeout flag" into main (37b30a90) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -188,17 +188,6 @@ flag {
		}
		}

		flag {
		name: "fix_show_when_locked_sync_timeout"
		namespace: "windowing_frontend"
		description: "Prevent sync timeout from setShowWhenLocked(false) by setting the DisplayContent ready"
		bug: "411544184"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "keyguard_remove_default_display_usage"
		namespace: "windowing_frontend"

+4 −12

Original line number	Diff line number	Diff line
		@@ -4800,23 +4800,15 @@ final class ActivityRecord extends WindowToken {
		}

		void setShowWhenLocked(boolean showWhenLocked) {
		final boolean changed = (mShowWhenLocked != showWhenLocked);
		if (mShowWhenLocked != showWhenLocked) {
		mShowWhenLocked = showWhenLocked;

		if (!Flags.fixShowWhenLockedSyncTimeout()) {
		mAtmService.mRootWindowContainer.ensureActivitiesVisible();
		} else if (changed) {
		mDisplayContent.notifyKeyguardFlagsChanged();
		}
		}

		void setInheritShowWhenLocked(boolean inheritShowWhenLocked) {
		final boolean changed = (mInheritShowWhenLocked != inheritShowWhenLocked);
		if (mInheritShowWhenLocked != inheritShowWhenLocked) {
		mInheritShowWhenLocked = inheritShowWhenLocked;

		if (!Flags.fixShowWhenLockedSyncTimeout()) {
		mAtmService.mRootWindowContainer.ensureActivitiesVisible();
		} else if (changed) {
		mDisplayContent.notifyKeyguardFlagsChanged();
		}
		}