From af90bd5c11a6ef118581873fc703c526cf32b304 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 16 Jun 2020 13:24:58 -0700
Subject: [PATCH] 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
---
 .../android/settings/biometrics/face/FaceEnrollSidecar.java   | 4 ----
 src/com/android/settings/biometrics/face/FaceSettings.java    | 1 -
 .../biometrics/fingerprint/FingerprintEnrollSidecar.java      | 3 ---
 .../biometrics/fingerprint/FingerprintRemoveSidecar.java      | 3 ---
 .../settings/password/ConfirmDeviceCredentialActivity.java    | 2 --
 5 files changed, 13 deletions(-)

diff --git a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
index 512d8fe4de6..6d2c301a71f 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
@@ -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);
     }
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index c1ee545fea3..87d1fa554bc 100644
--- 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(
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index b72a8027793..deb5a29556c 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -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);
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
index 19d0518b9db..b356103f83f 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
@@ -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);;
     }
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 7b5ed2b7831..c25a259e4ec 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -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;