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

Remove setActiveUser together with frameworks/base (see 12/n)

Browse Source 
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:
Kevin Chyn
2020-06-16 13:24:58 -07:00
parent 090988f05c
commit af90bd5c11
5 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
View File

@@ -48,10 +48,6 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar {
@Override @Override
public void startEnrollment() { public void startEnrollment() {
super.startEnrollment(); super.startEnrollment();
if (mUserId != UserHandle.USER_NULL) {
mFaceManager.setActiveUser(mUserId);
}
mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel, mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
mEnrollmentCallback, mDisabledFeatures); mEnrollmentCallback, mDisabledFeatures);
} }

1
src/com/android/settings/biometrics/face/FaceSettings.java
View File

@@ -224,7 +224,6 @@ public class FaceSettings extends DashboardFragment {
if (requestCode == CONFIRM_REQUEST) { if (requestCode == CONFIRM_REQUEST) {
mConfirmingPassword = false; mConfirmingPassword = false;
if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) { if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
mFaceManager.setActiveUser(mUserId);
// The pin/pattern/password was set. // The pin/pattern/password was set.
if (data != null) { if (data != null) {
mToken = data.getByteArrayExtra( mToken = data.getByteArrayExtra(

3
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -40,9 +40,6 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
@Override @Override
protected void startEnrollment() { protected void startEnrollment() {
super.startEnrollment(); super.startEnrollment();
if (mUserId != UserHandle.USER_NULL) {
mFingerprintManager.setActiveUser(mUserId);
}
mFingerprintManager.enroll(mToken, mEnrollmentCancel, mFingerprintManager.enroll(mToken, mEnrollmentCancel,
0 /* flags */, mUserId, mEnrollmentCallback); 0 /* flags */, mUserId, mEnrollmentCallback);
} }

3
src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
View File

@@ -79,9 +79,6 @@ public class FingerprintRemoveSidecar extends InstrumentedFragment {
Log.e(TAG, "Remove already in progress"); Log.e(TAG, "Remove already in progress");
return; return;
} }
if (userId != UserHandle.USER_NULL) {
mFingerprintManager.setActiveUser(userId);
}
mFingerprintRemoving = fingerprint; mFingerprintRemoving = fingerprint;
mFingerprintManager.remove(fingerprint, userId, mRemoveCallback);; mFingerprintManager.remove(fingerprint, userId, mRemoveCallback);;
} }

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

@@ -351,8 +351,6 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
} }
private void showBiometricPrompt(PromptInfo promptInfo) { private void showBiometricPrompt(PromptInfo promptInfo) {
mBiometricManager.setActiveUser(mUserId);
mBiometricFragment = (BiometricFragment) getSupportFragmentManager() mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
.findFragmentByTag(TAG_BIOMETRIC_FRAGMENT); .findFragmentByTag(TAG_BIOMETRIC_FRAGMENT);
boolean newFragment = false; boolean newFragment = false;