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

Commit f8e04bc1 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Abort earlier when icons are hidden 

This will avoid pinging the DevicePolicyManager twice.

Fixes: 140060745
Test: logcat, not StrictMode logs
Change-Id: Ib7a411a2ffa21eca62281a922b51dffdf6619352
parent 4bec4b2f

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

+17 −8
Original line number Diff line number Diff line
@@ -117,6 +117,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    private static final int DOZE_ANIMATION_STAGGER_DELAY = 48;

    private static final int DOZE_ANIMATION_ELEMENT_DURATION = 250;



    private final boolean mShowLeftAffordance;

    private final boolean mShowCameraAffordance;



    private KeyguardAffordanceView mRightAffordanceView;

    private KeyguardAffordanceView mLeftAffordanceView;

    private ViewGroup mIndicationArea;
@@ -184,6 +187,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    public KeyguardBottomAreaView(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        mShowLeftAffordance = getResources().getBoolean(R.bool.config_keyguardShowLeftAffordance);

        mShowCameraAffordance = getResources()

                .getBoolean(R.bool.config_keyguardShowCameraAffordance);

    }



    private AccessibilityDelegate mAccessibilityDelegate = new AccessibilityDelegate() {
@@ -371,8 +377,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
            // Things are not set up yet; reply hazy, ask again later

            return;

        }

        mRightAffordanceView.setVisibility(!mDozing && mRightButton.getIcon().isVisible

                ? View.VISIBLE : View.GONE);

        mRightAffordanceView.setVisibility(!mDozing && mShowCameraAffordance

                && mRightButton.getIcon().isVisible ? View.VISIBLE : View.GONE);

    }



    /**
@@ -384,8 +390,12 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
    }



    private void updateLeftAffordanceIcon() {

        if (!mShowLeftAffordance || mDozing) {

            mLeftAffordanceView.setVisibility(GONE);

            return;

        }

        IconState state = mLeftButton.getIcon();

        mLeftAffordanceView.setVisibility(!mDozing && state.isVisible ? View.VISIBLE : View.GONE);

        mLeftAffordanceView.setVisibility(state.isVisible ? View.VISIBLE : View.GONE);

        if (state.drawable != mLeftAffordanceView.getDrawable()

                || state.tint != mLeftAffordanceView.shouldTint()) {

            mLeftAffordanceView.setImageDrawable(state.drawable, state.tint);
@@ -767,10 +777,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        @Override

        public IconState getIcon() {

            mLeftIsVoiceAssist = canLaunchVoiceAssist();

            final boolean showAffordance =

                    getResources().getBoolean(R.bool.config_keyguardShowLeftAffordance);

            if (mLeftIsVoiceAssist) {

                mIconState.isVisible = mUserSetupComplete && showAffordance;

                mIconState.isVisible = mUserSetupComplete && mShowLeftAffordance;

                if (mLeftAssistIcon == null) {

                    mIconState.drawable = mContext.getDrawable(R.drawable.ic_mic_26dp);

                } else {
@@ -779,7 +787,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
                mIconState.contentDescription = mContext.getString(

                        R.string.accessibility_voice_assist_button);

            } else {

                mIconState.isVisible = mUserSetupComplete && showAffordance && isPhoneVisible();

                mIconState.isVisible = mUserSetupComplete && mShowLeftAffordance

                        && isPhoneVisible();

                mIconState.drawable = mContext.getDrawable(

                        com.android.internal.R.drawable.ic_phone);

                mIconState.contentDescription = mContext.getString(
@@ -802,7 +811,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        public IconState getIcon() {

            boolean isCameraDisabled = (mStatusBar != null) && !mStatusBar.isCameraAllowedByAdmin();

            mIconState.isVisible = !isCameraDisabled

                    && getResources().getBoolean(R.bool.config_keyguardShowCameraAffordance)

                    && mShowCameraAffordance

                    && mUserSetupComplete

                    && resolveCameraIntent() != null;

            mIconState.drawable = mContext.getDrawable(R.drawable.ic_camera_alt_24dp);

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

+11 −15
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.app.StatusBarManager.WindowVisibleState; 
import static android.app.StatusBarManager.windowStateToString;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY;



import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.Dependency.ALLOW_NOTIFICATION_LONG_PRESS_NAME;

import static com.android.systemui.Dependency.BG_HANDLER;

import static com.android.systemui.Dependency.MAIN_HANDLER;
@@ -3877,8 +3876,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }



    boolean isCameraAllowedByAdmin() {

        // TODO(b/140060745)

        return whitelistIpcs(() -> {

        if (mDevicePolicyManager.getCameraDisabled(null,

                mLockscreenUserManager.getCurrentUserId())) {

            return false;
@@ -3890,7 +3887,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
                    & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) == 0;

        }

        return true;

        });

    }



    private boolean isGoingToSleep() {