Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9260350b authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Clean up fully rolled out HeadlessSingleUserFixes"" into main

parents df4ecbdc eff79d33

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

+8 −2
Original line number Diff line number Diff line
@@ -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,8 +375,13 @@ 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();

        UserHandle primaryUser = mainUser != null ? mainUser : UserHandle.SYSTEM;

            if (mainUser != null ) {

                primaryUser = mainUser;

            }

        }

        if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) {

            return USER_TYPE_PRIMARY;

        } else if (userToBeWiped.isManagedProfile()) {