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

Commit 2eaa47c1 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix visibility of camera widget on insecure lock screens with DPM" into cm-11.0

parents 95f05cf4 5db9cec4

packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -475,9 +475,10 @@ public class KeyguardHostView extends KeyguardViewBase { 
    }

    }





    private boolean cameraDisabledByDpm() {

    private boolean cameraDisabledByDpm() {

        return mCameraDisabled

        boolean disabledSecureKeyguard =

                || (mDisabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0

                (mDisabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0

                || !mLockPatternUtils.getCameraEnabled();

                && mLockPatternUtils.isSecure();

        return mCameraDisabled || disabledSecureKeyguard || !mLockPatternUtils.getCameraEnabled();

    }

    }





    private void updateSecurityViews() {

    private void updateSecurityViews() {