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

Commit 2b55d59d authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Automerger Merge Worker
Browse files

Merge "BiometricPrompt calls correct cam privacy API." into tm-dev am: 807d81e0 

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

Change-Id: I7fa950cb86ce4e443881e7a92efc1dcd15c9461f
parents b52980fd 807d81e0

packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java

+2 −2
Original line number Diff line number Diff line
@@ -726,8 +726,8 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba 


        boolean isCameraPrivacyEnabled = false;

        if (error == BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE

                && mSensorPrivacyManager.isSensorPrivacyEnabled(SensorPrivacyManager.Sensors.CAMERA,

                mCurrentDialogArgs.argi1 /* userId */)) {

                && mSensorPrivacyManager.isSensorPrivacyEnabled(

                SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE, SensorPrivacyManager.Sensors.CAMERA)) {

            isCameraPrivacyEnabled = true;

        }

        // TODO(b/141025588): Create separate methods for handling hard and soft errors.