From 1bdc8afc0ce35bee73ae65b8f7473f25b6187a38 Mon Sep 17 00:00:00 2001
From: Bryce Lee <brycelee@google.com>
Date: Sat, 5 Mar 2022 01:49:50 +0000
Subject: [PATCH] Revert "Remove temp user creation activity"

Revert submission 17073604-presubmit-am-787ed0a55f5040968a8a9c14764ddd01

Reason for revert: cause of b/222711091
Reverted Changes:
I3aae23a57:Remove temp user creation activity
I6b2ce8e01:Scrim was flickering on FPS unlock

Change-Id: I7dcea569feaae4f03b634a13b3a33c3b45abeb53
---
 .../systemui/statusbar/policy/UserSwitcherController.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
index dd9982ba20d69..d1c9b3f1c2c50 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java
@@ -584,6 +584,13 @@ public class UserSwitcherController implements Dumpable {
                 .setPackage(mCreateSupervisedUserPackage)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
+        // TODO(b/209659998): [to-be-removed] fallback activity for supervised user creation.
+        if (mContext.getPackageManager().resolveActivity(intent, 0) == null) {
+            intent.setPackage(null)
+                    .setClassName("com.android.settings",
+                        "com.android.settings.users.AddSupervisedUserActivity");
+        }
+
         mContext.startActivity(intent);
     }