Remove setActiveUser together with frameworks/base (see 12/n)
setActiveUser is removed from the @hide API surface and is no longer necessary. The framework ensures that the correct user is set without an explicit call, since userId is sent as a parameter to each of the methods already. Bug: 157790417 Test: See testing from frameworks/base change (12/n) from the same gerrit topic Change-Id: Id88b818ed0bb1f75f18ac8e9ba7aff2a9b80b319
This commit is contained in:
@@ -48,10 +48,6 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar {
|
||||
@Override
|
||||
public void startEnrollment() {
|
||||
super.startEnrollment();
|
||||
if (mUserId != UserHandle.USER_NULL) {
|
||||
mFaceManager.setActiveUser(mUserId);
|
||||
}
|
||||
|
||||
mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
|
||||
mEnrollmentCallback, mDisabledFeatures);
|
||||
}
|
||||
|
@@ -224,7 +224,6 @@ public class FaceSettings extends DashboardFragment {
|
||||
if (requestCode == CONFIRM_REQUEST) {
|
||||
mConfirmingPassword = false;
|
||||
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
|
||||
mFaceManager.setActiveUser(mUserId);
|
||||
// The pin/pattern/password was set.
|
||||
if (data != null) {
|
||||
mToken = data.getByteArrayExtra(
|
||||
|
@@ -40,9 +40,6 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
|
||||
@Override
|
||||
protected void startEnrollment() {
|
||||
super.startEnrollment();
|
||||
if (mUserId != UserHandle.USER_NULL) {
|
||||
mFingerprintManager.setActiveUser(mUserId);
|
||||
}
|
||||
mFingerprintManager.enroll(mToken, mEnrollmentCancel,
|
||||
0 /* flags */, mUserId, mEnrollmentCallback);
|
||||
}
|
||||
|
@@ -79,9 +79,6 @@ public class FingerprintRemoveSidecar extends InstrumentedFragment {
|
||||
Log.e(TAG, "Remove already in progress");
|
||||
return;
|
||||
}
|
||||
if (userId != UserHandle.USER_NULL) {
|
||||
mFingerprintManager.setActiveUser(userId);
|
||||
}
|
||||
mFingerprintRemoving = fingerprint;
|
||||
mFingerprintManager.remove(fingerprint, userId, mRemoveCallback);;
|
||||
}
|
||||
|
@@ -351,8 +351,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
|
||||
}
|
||||
|
||||
private void showBiometricPrompt(PromptInfo promptInfo) {
|
||||
mBiometricManager.setActiveUser(mUserId);
|
||||
|
||||
mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
|
||||
.findFragmentByTag(TAG_BIOMETRIC_FRAGMENT);
|
||||
boolean newFragment = false;
|
||||
|
Reference in New Issue
Block a user