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:
@@ -474,7 +474,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Avoid dragging the pattern view
|
// Avoid dragging the pattern view
|
||||||
if (mSecurityViewFlipper.getSecurityView().disallowInterceptTouch(event)) {
|
if (mSecurityViewFlipper.getSecurityView() != null
|
||||||
|
&& mSecurityViewFlipper.getSecurityView().disallowInterceptTouch(event)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
int index = event.findPointerIndex(mActivePointerId);
|
int index = event.findPointerIndex(mActivePointerId);
|
||||||
|
|||||||
Reference in New Issue
Block a user