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

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

Browse Source 
am: 47593cd29b

Change-Id: I093dcaa95180a22d05f91af645e82f588f09864b
This commit is contained in:
Kevin Chyn
2019-07-03 16:14:47 -07:00
committed by android-build-merger
parent e13cd91161 47593cd29b
commit d40d9887f9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar {
mFaceManager.setActiveUser(mUserId); mFaceManager.setActiveUser(mUserId);
} }
mFaceManager.enroll(mToken, mEnrollmentCancel, mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
mEnrollmentCallback, mDisabledFeatures); mEnrollmentCallback, mDisabledFeatures);
} }

7
src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
View File

@@ -99,7 +99,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
} }
// Set to disabled until we know the true value. // Set to disabled until we know the true value.
mPreference.setEnabled(false); mPreference.setEnabled(false);
mFaceManager.getFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, mGetFeatureCallback); mFaceManager.getFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION,
mGetFeatureCallback);
// Ideally returns a cached value. // Ideally returns a cached value.
return true; return true;
@@ -111,8 +112,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
mPreference.setEnabled(false); mPreference.setEnabled(false);
mPreference.setChecked(isChecked); mPreference.setChecked(isChecked);
mFaceManager.setFeature(FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked, mToken, mFaceManager.setFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked,
mSetFeatureCallback); mToken, mSetFeatureCallback);
return true; return true;
} }