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

Commit bd4c570b authored by Nicolas Prevot's avatar Nicolas Prevot
Browse files

Only ask for credentials in add account if user is locked.

Also: if work mode is off, ask to turn work on before adding
a work account.

BUG:28220470
Change-Id: Ib23f87f056ad41c1f9713bb8d3c5263f015e6475
parent e0e7fa45
Loading
Loading
Loading
Loading
+15 −11
Original line number Diff line number Diff line
@@ -35,14 +35,10 @@ import android.widget.Toast;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;

import java.io.IOException;

import static android.content.Intent.EXTRA_USER;

import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

/**
 * Entry point Activity for account setup. Works as follows
 *
@@ -156,8 +152,15 @@ public class AddAccountSettings extends Activity {
            finish();
            return;
        }

        // If the profile is locked, we must ask the user to unlock it first.
        if (Utils.startQuietModeDialogIfNecessary(this, um, mUserHandle.getIdentifier())) {
            finish();
            return;
        }
        if (um.isUserUnlocked(mUserHandle)) {
            requestChooseAccount();
        } else {
            // If the user is locked by fbe: we couldn't start the authenticator. So we must ask the
            // user to unlock it first.
            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
            if (!helper.launchConfirmationActivity(UNLOCK_WORK_PROFILE_REQUEST,
                    getString(R.string.unlock_set_unlock_launch_picker_title),
@@ -166,6 +169,7 @@ public class AddAccountSettings extends Activity {
                requestChooseAccount();
            }
        }
    }

    @Override
    public void onActivityResult(int requestCode, int resultCode, Intent data) {