Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ib2aaefe0d5e4a726e858b0e81c7b8bd96b237744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2023-06-20 16:47:06 +00:00
committed by Automerger Merge Worker
parent e2354aa9e7 25086039c3
commit 46ca64d59b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
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);