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

Commit 2cb9eab7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Faceauth when camera privacy is enabled." into tm-dev am: 11e68c87 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17189185

Change-Id: I46bfd7ded75b33d9c9654f4f3b8079a495985108
parents f87c98a7 11e68c87

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −4
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    private final Executor mBackgroundExecutor;

    private SensorPrivacyManager mSensorPrivacyManager;

    private int mFaceAuthUserId;



    /**

     * Short delay before restarting fingerprint authentication after a successful try. This should
@@ -1030,8 +1029,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        boolean cameraPrivacyEnabled = false;

        if (mSensorPrivacyManager != null) {

            cameraPrivacyEnabled = mSensorPrivacyManager

                    .isSensorPrivacyEnabled(SensorPrivacyManager.Sensors.CAMERA,

                    mFaceAuthUserId);

                    .isSensorPrivacyEnabled(SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE,

                    SensorPrivacyManager.Sensors.CAMERA);

        }



        if (msgId == FaceManager.FACE_ERROR_CANCELED
@@ -2599,7 +2598,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
            // This would need to be updated for multi-sensor devices

            final boolean supportsFaceDetection = !mFaceSensorProperties.isEmpty()

                    && mFaceSensorProperties.get(0).supportsFaceDetection;

            mFaceAuthUserId = userId;

            if (isEncryptedOrLockdown(userId) && supportsFaceDetection) {

                mFaceManager.detectFace(mFaceCancelSignal, mFaceDetectionCallback, userId);

            } else {

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceAuthenticationClient.java

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ class FaceAuthenticationClient extends AuthenticationClient<AidlSession> 
        try {

            if (mSensorPrivacyManager != null

                    && mSensorPrivacyManager

                    .isSensorPrivacyEnabled(SensorPrivacyManager.Sensors.CAMERA,

                    getTargetUserId())) {

                    .isSensorPrivacyEnabled(SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE,

                    SensorPrivacyManager.Sensors.CAMERA)) {

                onError(BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE,

                        0 /* vendorCode */);

                mCallback.onClientFinished(this, false /* success */);

services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ public class FaceDetectClient extends AcquisitionClient<AidlSession> implements 
    protected void startHalOperation() {

        if (mSensorPrivacyManager != null

                && mSensorPrivacyManager

                .isSensorPrivacyEnabled(SensorPrivacyManager.Sensors.CAMERA, getTargetUserId())) {

                .isSensorPrivacyEnabled(SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE,

                    SensorPrivacyManager.Sensors.CAMERA)) {

            onError(BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);

            mCallback.onClientFinished(this, false /* success */);

            return;

services/core/java/com/android/server/biometrics/sensors/face/hidl/FaceAuthenticationClient.java

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ class FaceAuthenticationClient extends AuthenticationClient<IBiometricsFace> { 


        if (mSensorPrivacyManager != null

                && mSensorPrivacyManager

                .isSensorPrivacyEnabled(SensorPrivacyManager.Sensors.CAMERA, getTargetUserId())) {

                .isSensorPrivacyEnabled(SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE,

                SensorPrivacyManager.Sensors.CAMERA)) {

            onError(BiometricFaceConstants.FACE_ERROR_HW_UNAVAILABLE, 0 /* vendorCode */);

            mCallback.onClientFinished(this, false /* success */);

            return;