Merge "Add null check for input view." into udc-dev am: e5cc0bf4d4

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

Change-Id: I402d5c0a7fabae569d3e1a925cc8ac1be4795d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2023-06-16 19:12:59 +00:00
committed by Automerger Merge Worker

View File

@@ -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);