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

Commit 36681bbf authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Respect per-user fingerprints on profiles with unified challenge."

parents ac6f2d29 f20e3416

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

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.util.Log;
@@ -70,7 +71,7 @@ public class ConfirmDeviceCredentialActivity extends Activity { 
                KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);

        boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());



        int userId = Utils.getCredentialOwnerUserId(this);

        int userId = UserHandle.myUserId();

        if (isInternalActivity()) {

            try {

                userId = Utils.getUserIdFromBundle(this, intent.getExtras());

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

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr 
        mCancelButton = (Button) view.findViewById(R.id.cancelButton);

        mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon);

        mFingerprintHelper = new FingerprintUiHelper(

                mFingerprintIcon,

                (TextView) view.findViewById(R.id.errorText), this, mEffectiveUserId);

                mFingerprintIcon, view.findViewById(R.id.errorText), this, mUserId);

        boolean showCancelButton = getActivity().getIntent().getBooleanExtra(

                SHOW_CANCEL_BUTTON, false);

        boolean hasAlternateButton = mFrp && !TextUtils.isEmpty(mFrpAlternateButtonText);