Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d40d9887 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

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

am: 47593cd2

Change-Id: I093dcaa95180a22d05f91af645e82f588f09864b
parents e13cd911 47593cd2

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class FaceEnrollSidecar extends BiometricEnrollSidecar { 
            mFaceManager.setActiveUser(mUserId);

        }



        mFaceManager.enroll(mToken, mEnrollmentCancel,

        mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,

                mEnrollmentCallback, mDisabledFeatures);

    }

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

+4 −3
Original line number Diff line number Diff line
@@ -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;

    }