Remove shipped (!) flag keyguard_wm_reorder_atms_calls.
Flag: EXEMPT removing flag
Test: no
Fixes: 416555381
Change-Id: Ie36d38eab86c2cb90c8617c92c8f0773774c9045
diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig
index 916c7f3..b5635a8 100644
--- a/packages/SystemUI/aconfig/systemui.aconfig
+++ b/packages/SystemUI/aconfig/systemui.aconfig
@@ -1816,16 +1816,6 @@
}
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
- }
-}
-
-flag {
name: "extended_apps_shortcut_category"
namespace: "systemui"
description: "Allow users to add shortcuts to open apps that are not present in the apps category in shortcut helper by default"
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index c434922..a68a1a6 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -4146,22 +4146,12 @@
mShowing = showing;
mAodShowing = aodShowing;
- if (KeyguardWmReorderAtmsCalls.isEnabled()) {
- if (updateActivityLockScreenState) {
- updateActivityLockScreenState(showing, aodShowing, reason);
- }
- if (notifyDefaultDisplayCallbacks) {
- notifyDefaultDisplayCallbacks(showing);
- }
- } else {
- if (notifyDefaultDisplayCallbacks) {
- notifyDefaultDisplayCallbacks(showing);
- }
- if (updateActivityLockScreenState) {
- updateActivityLockScreenState(showing, aodShowing, reason);
- }
+ if (updateActivityLockScreenState) {
+ updateActivityLockScreenState(showing, aodShowing, reason);
}
-
+ if (notifyDefaultDisplayCallbacks) {
+ notifyDefaultDisplayCallbacks(showing);
+ }
}
private void notifyDefaultDisplayCallbacks(boolean showing) {
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardWmReorderAtmsCalls.kt b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardWmReorderAtmsCalls.kt
deleted file mode 100644
index 7ac5281..0000000
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardWmReorderAtmsCalls.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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)
-}
