commit d40d9887f905cfe23c2cbeee161cf643fbab9e1b
author Kevin Chyn <kchyn@google.com> Wed Jul 03 16:14:47 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 03 16:14:47 2019 -0700
tree 261a4fcafbb095c1638e830bedee9e7db452e4c1
parent e13cd911619838c3910156587ce5ff2fcadbab3c
parent 47593cd29b9376698e2780ea09ff379e52329012

Merge "Send userId together with enroll / setFeature / getFeature method update" into qt-r1-dev
am: 47593cd29b

Change-Id: I093dcaa95180a22d05f91af645e82f588f09864b

src/com/android/settings/biometrics/face/FaceEnrollSidecar.java

diff --git a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
index c75f300..512d8fe 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
@@ -52,7 +52,7 @@
             mFaceManager.setActiveUser(mUserId);
         }
 
-        mFaceManager.enroll(mToken, mEnrollmentCancel,
+        mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
                 mEnrollmentCallback, mDisabledFeatures);
     }
 

src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java

diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
index ef90b1e..9ae6a87 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
@@ -99,7 +99,8 @@
         }
         // 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 @@
         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;
     }