From 93c566ef5bbe1624b89624e915161e177b97229e Mon Sep 17 00:00:00 2001
From: Pavel Grafov <pgrafov@google.com>
Date: Tue, 27 Aug 2024 18:51:05 +0100
Subject: [PATCH] Clean up fully rolled out HeadlessSingleUserFixes

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I7de1f400d03662b690f4a77a379994985797a3fe
---
 .../password/ConfirmDeviceCredentialBaseFragment.java  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index cfee9805740..0d57b577298 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -27,7 +27,6 @@ import android.app.KeyguardManager;
 import android.app.RemoteLockscreenValidationSession;
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.ManagedSubscriptionsPolicy;
-import android.app.admin.flags.Flags;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -375,13 +374,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
     private int getUserTypeForWipe() {
         final UserInfo userToBeWiped = mUserManager.getUserInfo(
                 mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId));
-        UserHandle primaryUser = UserHandle.SYSTEM;
-        if (Flags.headlessSingleUserFixes()) {
-            UserHandle mainUser = mUserManager.getMainUser();
-            if (mainUser != null ) {
-                primaryUser = mainUser;
-            }
-        }
+        UserHandle mainUser = mUserManager.getMainUser();
+        UserHandle primaryUser = mainUser != null ? mainUser : UserHandle.SYSTEM;
         if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) {
             return USER_TYPE_PRIMARY;
         } else if (userToBeWiped.isManagedProfile()) {