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

Commit 5e899fcc authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Add event log for keyguard occlude status chagne." into tm-qpr-dev am:... 

Merge "Add event log for keyguard occlude status chagne." into tm-qpr-dev am: 0486312f am: cfdf2b16 am: 4f381939

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



Change-Id: I30b994d7346e638a75bc9cab7d9be8583d763d33
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8039b78 4f381939

packages/SystemUI/src/com/android/systemui/EventLogTags.logtags

+5 −0
Original line number Diff line number Diff line
@@ -61,3 +61,8 @@ option java_package com.android.systemui; 
##       4: SYSTEM_REGISTER_USER     System sysui registers user's callbacks

##       5: SYSTEM_UNREGISTER_USER   System sysui unregisters user's callbacks (after death)

36060 sysui_recents_connection (type|1),(user|1)



# ---------------------------

# KeyguardViewMediator.java

# ---------------------------

36080 sysui_keyguard (isOccluded|1),(animate|1)

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ import com.android.keyguard.mediator.ScreenOnCoordinator; 
import com.android.systemui.CoreStartable;

import com.android.systemui.DejankUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.EventLogTags;

import com.android.systemui.R;

import com.android.systemui.animation.ActivityLaunchAnimator;

import com.android.systemui.animation.Interpolators;
@@ -1849,6 +1850,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
    private void handleSetOccluded(boolean isOccluded, boolean animate) {

        Trace.beginSection("KeyguardViewMediator#handleSetOccluded");

        Log.d(TAG, "handleSetOccluded(" + isOccluded + ")");

        EventLogTags.writeSysuiKeyguard(isOccluded ? 1 : 0, animate ? 1 : 0);



        mInteractionJankMonitor.cancel(CUJ_LOCKSCREEN_TRANSITION_FROM_AOD);



        synchronized (KeyguardViewMediator.this) {