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

Commit 60e3b680 authored by Aaron Liu's avatar Aaron Liu
Browse files

Do not invoke click listener when popup is null. 

Fixes NPE where popup is null when clicked. This is likely an issue with
double clicking quickly.

Fixes: 298194846
Test: click on user switcher in bouncer.
Change-Id: Ib2a74ebe7b3e18af473471a7050e05be89761805
parent d346a1f1

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+2 −1
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode; 
import com.android.settingslib.Utils;

import com.android.settingslib.drawable.CircleFramedDrawable;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.res.R;

import com.android.systemui.classifier.FalsingA11yDelegate;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;

import com.android.systemui.shade.TouchLogger;

import com.android.systemui.shared.system.SysUiStatsLog;

import com.android.systemui.statusbar.policy.BaseUserSwitcherAdapter;
@@ -1191,6 +1191,7 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                mPopup.setOnItemClickListener((parent, view, pos, id) -> {

                    if (mFalsingManager.isFalseTap(LOW_PENALTY)) return;

                    if (!view.isEnabled()) return;

                    if (mPopup == null) return;

                    // Subtract one for the header

                    UserRecord user = adapter.getItem(pos - 1);

                    if (user.isManageUsers || user.isAddSupervisedUser) {