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

Commit 7fee1586 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid isKeyguardShowing() before startKeyguard()"

parents fbf2c4bf ad1b27e7

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −1
Original line number Diff line number Diff line
@@ -5266,7 +5266,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
    boolean isCameraAllowedByAdmin() {

        if (mDevicePolicyManager.getCameraDisabled(null, mCurrentUserId)) {

            return false;

        } else if (isKeyguardShowing() && isKeyguardSecure()) {

        } else if (mStatusBarKeyguardViewManager == null ||

                (isKeyguardShowing() && isKeyguardSecure())) {

            // Check if the admin has disabled the camera specifically for the keyguard

            return (mDevicePolicyManager.getKeyguardDisabledFeatures(null, mCurrentUserId)

                    & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) == 0;