From 95634cace1dae670243c9659d364dceaf0eb40cb Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 28 Jun 2019 13:42:20 -0700 Subject: [PATCH] Send userId together with enroll / setFeature / getFeature method update Test: Enroll E2E Bug: 136264301 Change-Id: Ie3f98ab80c831083d750d9459ed7a189df25dd66 --- .../settings/biometrics/face/FaceEnrollSidecar.java | 2 +- .../face/FaceSettingsAttentionPreferenceController.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java index c75f300aa8e..512d8fe4de6 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java @@ -52,7 +52,7 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar { mFaceManager.setActiveUser(mUserId); } - mFaceManager.enroll(mToken, mEnrollmentCancel, + mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel, mEnrollmentCallback, mDisabledFeatures); } diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java index ef90b1eda34..9ae6a874b0a 100644 --- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java @@ -99,7 +99,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe } // Set to disabled until we know the true value. mPreference.setEnabled(false); - mFaceManager.getFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, mGetFeatureCallback); + mFaceManager.getFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, + mGetFeatureCallback); // Ideally returns a cached value. return true; @@ -111,8 +112,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe mPreference.setEnabled(false); mPreference.setChecked(isChecked); - mFaceManager.setFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked, mToken, - mSetFeatureCallback); + mFaceManager.setFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked, + mToken, mSetFeatureCallback); return true; }