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

2020-06-20 01:02:24 +00:00
parent 851b51308f af90bd5c11
commit 95e05d8d07
5 changed files with 0 additions and 13 deletions
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -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(