Merge "Fix incorrect password attempts messaging on headless" into main

Android.bp

@@ -112,6 +112,7 @@ android_library {
         "androidx.test.rules",
         "telephony_flags_core_java_lib",
         "setupdesign-lottie-loading-layout",
+        "device_policy_aconfig_flags_lib",
     ],
 
     plugins: ["androidx.room_room-compiler-plugin"],

src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java

@@ -27,6 +27,7 @@ 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;
@@ -374,7 +375,14 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
     private int getUserTypeForWipe() {
         final UserInfo userToBeWiped = mUserManager.getUserInfo(
                 mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId));
-        if (userToBeWiped == null || userToBeWiped.isPrimary()) {
+        UserHandle primaryUser = UserHandle.SYSTEM;
+        if (Flags.headlessSingleUserFixes()) {
+            UserHandle mainUser = mUserManager.getMainUser();
+            if (mainUser != null ) {
+                primaryUser = mainUser;
+            }
+        }
+        if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) {
             return USER_TYPE_PRIMARY;
         } else if (userToBeWiped.isManagedProfile()) {
             return USER_TYPE_MANAGED_PROFILE;