From b373cd01032533cf6e4f91c7fae888af8330d63d Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Thu, 28 Jan 2021 09:42:33 -0800
Subject: [PATCH] Fix NPE in InteractionJankMonitor.

- KeyguardSecurityViewFlipper.getSecurityView() can return null.

Bug: 178711695
Test: atest CarDevicePolicyManagerTest
Change-Id: I7b1759437f00a901195c6c2a9028b7ca5f1c0b07
---
 .../src/com/android/keyguard/KeyguardSecurityContainer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index cc59c39888a81..30db341a061c8 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -395,7 +395,9 @@ public class KeyguardSecurityContainer extends FrameLayout {
     }
 
     private void beginJankInstrument(int cuj) {
-        InteractionJankMonitor.getInstance().begin(mSecurityViewFlipper.getSecurityView(), cuj);
+        KeyguardInputView securityView = mSecurityViewFlipper.getSecurityView();
+        if (securityView == null) return;
+        InteractionJankMonitor.getInstance().begin(securityView, cuj);
     }
 
     private void endJankInstrument(int cuj) {