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

Commit 8851afb8 authored by Ayush Sharma's avatar Ayush Sharma Committed by Android (Google) Code Review
Browse files

Merge "Remove refs of isSeparateProfileChallengeAllowed"

parents 10cde2f0 41873bd7

src/com/android/settings/biometrics/combination/BiometricFaceProfileStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class BiometricFaceProfileStatusPreferenceController extends 
    @Override

    protected boolean isUserSupported() {

        return mProfileChallengeUserId != UserHandle.USER_NULL

                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);

                && mUm.isManagedProfile(mProfileChallengeUserId);

    }



    @Override

src/com/android/settings/biometrics/combination/BiometricFingerprintProfileStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class BiometricFingerprintProfileStatusPreferenceController extends 
    @Override

    protected boolean isUserSupported() {

        return mProfileChallengeUserId != UserHandle.USER_NULL

                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);

                && mUm.isManagedProfile(mProfileChallengeUserId);

    }



    @Override

src/com/android/settings/biometrics/combination/CombinedBiometricProfileStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class CombinedBiometricProfileStatusPreferenceController extends 
    @Override

    protected boolean isUserSupported() {

        return mProfileChallengeUserId != UserHandle.USER_NULL

                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);

                && mUm.isManagedProfile(mProfileChallengeUserId);

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class FaceProfileStatusPreferenceController extends FaceStatusPreferenceC 
    @Override

    protected boolean isUserSupported() {

        return mProfileChallengeUserId != UserHandle.USER_NULL

                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);

                && mUm.isManagedProfile(mProfileChallengeUserId);

    }



    @Override

src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class FingerprintProfileStatusPreferenceController 
    @Override

    protected boolean isUserSupported() {

        return mProfileChallengeUserId != UserHandle.USER_NULL

                && mLockPatternUtils.isSeparateProfileChallengeAllowed(mProfileChallengeUserId);

                && mUm.isManagedProfile(mProfileChallengeUserId);

    }



    @Override