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

Commit f8b95e8b authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Add null check for input view." into udc-dev am: e5cc0bf4 am: 83dc57d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23713002



Change-Id: I8d45f603e11a5ca64b35831460b3e852b99caa44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89a8cf4b 83dc57d9

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

+2 −1
Original line number Diff line number Diff line
@@ -474,7 +474,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                    return false;

                }

                // Avoid dragging the pattern view

                if (mSecurityViewFlipper.getSecurityView().disallowInterceptTouch(event)) {

                if (mSecurityViewFlipper.getSecurityView() != null

                        && mSecurityViewFlipper.getSecurityView().disallowInterceptTouch(event)) {

                    return false;

                }

                int index = event.findPointerIndex(mActivePointerId);