Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ee1d3ee authored by Yuncheol Heo's avatar Yuncheol Heo Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in InteractionJankMonitor." into sc-dev am: 8cd0c593 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77504592a1eb1a6b411a3ed948d5b3b8190376cd
parents 665dd9a0 8cd0c593

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+3 −1
Original line number Diff line number Diff line
@@ -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) {