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

Commit 93c566ef authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Clean up fully rolled out HeadlessSingleUserFixes 

Flag was rolled out in Android V.

Bug: 335663055
Test: TH
Flag: EXEMPT flag cleanup
Change-Id: I7de1f400d03662b690f4a77a379994985797a3fe
parent d72678d3

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

+2 −8
Original line number Diff line number Diff line
@@ -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 primaryUser = mainUser != null ? mainUser : UserHandle.SYSTEM;

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

            return USER_TYPE_PRIMARY;

        } else if (userToBeWiped.isManagedProfile()) {