PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pavel Grafov
2018-08-10 10:50:38 +00:00
committed by Android (Google) Code Review
parent ac6f2d29cb f20e34167e
commit 36681bbfea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
@@ -70,7 +71,7 @@ public class ConfirmDeviceCredentialActivity extends Activity {
KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL); KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction()); boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
int userId = Utils.getCredentialOwnerUserId(this); int userId = UserHandle.myUserId();
if (isInternalActivity()) { if (isInternalActivity()) {
try { try {
userId = Utils.getUserIdFromBundle(this, intent.getExtras()); userId = Utils.getUserIdFromBundle(this, intent.getExtras());

3
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -125,8 +125,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
mCancelButton = (Button) view.findViewById(R.id.cancelButton); mCancelButton = (Button) view.findViewById(R.id.cancelButton);
mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon); mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon);
mFingerprintHelper = new FingerprintUiHelper( mFingerprintHelper = new FingerprintUiHelper(
mFingerprintIcon, mFingerprintIcon, view.findViewById(R.id.errorText), this, mUserId);
(TextView) view.findViewById(R.id.errorText), this, mEffectiveUserId);
boolean showCancelButton = getActivity().getIntent().getBooleanExtra( boolean showCancelButton = getActivity().getIntent().getBooleanExtra(
SHOW_CANCEL_BUTTON, false); SHOW_CANCEL_BUTTON, false);
boolean hasAlternateButton = mFrp && !TextUtils.isEmpty(mFrpAlternateButtonText); boolean hasAlternateButton = mFrp && !TextUtils.isEmpty(mFrpAlternateButtonText);