Merge "Fix NPE in InteractionJankMonitor." into sc-dev

2021-02-02 20:43:06 +00:00
parent 542ef93d7b b373cd0103
commit 8cd0c59330
1 changed files with 3 additions and 1 deletions
--- 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) {