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

Commit 9b8f834e authored by Brad Stenning's avatar Brad Stenning Committed by android-build-merger
Browse files

Merge "Fix NPE for devices that don't use a lock icon in sysui." into qt-dev 

am: 6490c31b

Change-Id: I4aaa45ca3f45570b8f6f5b844e2023e4faff4122
parents 2c0915a6 6490c31b

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+4 −1
Original line number Diff line number Diff line
@@ -134,7 +134,10 @@ public class KeyguardIndicationController implements StateListener { 
                mTextView.getTextColors() : ColorStateList.valueOf(Color.WHITE);

        mDisclosure = indicationArea.findViewById(R.id.keyguard_indication_enterprise_disclosure);

        mLockIcon = lockIcon;

        // lock icon is not used on all form factors.

        if (mLockIcon != null) {

            mLockIcon.setOnLongClickListener(this::handleTrustCircleClick);

        }

        mWakeLock = new SettableWakeLock(wakeLock, TAG);

        mLockPatternUtils = lockPatternUtils;

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

+4 −0
Original line number Diff line number Diff line
@@ -250,6 +250,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
    }



    private void updateLockIcon() {

        // Not all form factors have a lock icon

        if (mLockIconContainer == null) {

            return;

        }

        boolean keyguardWithoutQs = mStatusBarStateController.getState() == StatusBarState.KEYGUARD

                && !mNotificationPanelView.isQsExpanded();

        int lockVisibility = (mBouncer.isShowing() || keyguardWithoutQs)