summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ale Nijamkin <nijamkin@google.com> 2022-10-12 16:48:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-12 16:48:33 +0000
commitec073d1e832cb32a9f049d0a0a7941b3a3a68a43 (patch)
tree9901904373f3cb8a123ad99609b899c0be329689
parent209c7d1c2c3256d738a8c30cf6610cd319419ecf (diff)
parent336af653a10b4ad82194f66f9af573afa6de51d9 (diff)
Merge "Turns on refactored UserSwitcherController." into tm-qpr-dev am: 67e174c81d am: 336af653a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20168257 Change-Id: I285fd6591ef09fd648f88626d0c22f08eb3810af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/flags/Flags.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java
index 397d82141d74..8e2ac064b4f1 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java
@@ -116,7 +116,7 @@ public class Flags {
* the framework APIs.
*/
public static final UnreleasedFlag USER_INTERACTOR_AND_REPO_USE_CONTROLLER =
- new UnreleasedFlag(210, true);
+ new UnreleasedFlag(210);
/**
* Whether `UserSwitcherController` should use the user interactor.
@@ -127,8 +127,7 @@ public class Flags {
* <p>Note: do not set this to true if {@link #USER_INTERACTOR_AND_REPO_USE_CONTROLLER} is
* {@code true} as it would created a cycle between controller -> interactor -> controller.
*/
- public static final UnreleasedFlag USER_CONTROLLER_USES_INTERACTOR =
- new UnreleasedFlag(211, false);
+ public static final ReleasedFlag USER_CONTROLLER_USES_INTERACTOR = new ReleasedFlag(211);
/***************************************/
// 300 - power menu