Merge "Enqueue ATMS calls before display callbacks." into main (af44b248) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -2145,3 +2145,12 @@ flag {
		}
		}

		flag {
		name: "keyguard_wm_reorder_atms_calls"
		namespace: "systemui"
		description: "Calls ATMS#setLockScreenShown before default display callbacks in case they're slow"
		bug: "399693427"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+16 −5

Original line number	Diff line number	Diff line
		@@ -4099,6 +4099,15 @@ public class KeyguardViewMediator implements CoreStartable,
		\|\| aodShowing != mAodShowing \|\| forceCallbacks;
		mShowing = showing;
		mAodShowing = aodShowing;

		if (KeyguardWmReorderAtmsCalls.isEnabled()) {
		if (updateActivityLockScreenState) {
		updateActivityLockScreenState(showing, aodShowing, reason);
		}
		if (notifyDefaultDisplayCallbacks) {
		notifyDefaultDisplayCallbacks(showing);
		}
		} else {
		if (notifyDefaultDisplayCallbacks) {
		notifyDefaultDisplayCallbacks(showing);
		}
		@@ -4107,6 +4116,8 @@ public class KeyguardViewMediator implements CoreStartable,
		}
		}

		}

		private void notifyDefaultDisplayCallbacks(boolean showing) {
		if (SceneContainerFlag.isEnabled() \|\| KeyguardWmStateRefactor.isEnabled()) {
		return;

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardWmReorderAtmsCalls.kt

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.keyguard

		import com.android.systemui.Flags
		import com.android.systemui.flags.FlagToken
		import com.android.systemui.flags.RefactorFlagUtils

		/** Helper for reading or using the keyguard wm state refactor flag state. */
		@Suppress("NOTHING_TO_INLINE")
		object KeyguardWmReorderAtmsCalls {
		/** The aconfig flag name */
		const val FLAG_NAME = Flags.FLAG_KEYGUARD_WM_REORDER_ATMS_CALLS

		/** A token used for dependency declaration */
		val token: FlagToken
		get() = FlagToken(FLAG_NAME, isEnabled)

		/** Is the refactor enabled */
		@JvmStatic
		inline val isEnabled
		get() = Flags.keyguardWmReorderAtmsCalls()

		/**
		* Called to ensure code is only run when the flag is enabled. This protects users from the
		* unintended behaviors caused by accidentally running new logic, while also crashing on an eng
		* build to ensure that the refactor author catches issues in testing.
		*/
		@JvmStatic
		inline fun isUnexpectedlyInLegacyMode() =
		RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME)

		/**
		* Called to ensure code is only run when the flag is disabled. This will throw an exception if
		* the flag is enabled to ensure that the refactor author catches issues in testing.
		*/
		@JvmStatic
		inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME)
		}