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

Commit 34433251 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Group keyguard related instant event under a track group" into main

parents e68d6556 f517ce20

packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java

+2 −2
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAK 
import android.annotation.MainThread;

import android.content.res.Configuration;

import android.hardware.display.AmbientDisplayConfiguration;

import android.os.Trace;

import android.util.Log;

import android.view.Display;



import com.android.app.tracing.coroutines.TrackTracer;

import com.android.internal.util.Preconditions;

import com.android.systemui.dock.DockManager;

import com.android.systemui.doze.dagger.DozeScope;
@@ -314,7 +314,7 @@ public class DozeMachine { 
        mState = newState;



        mDozeLog.traceState(newState);

        Trace.traceCounter(Trace.TRACE_TAG_APP, "doze_machine_state", newState.ordinal());

        TrackTracer.instantForGroup("keyguard", "doze_machine_state", newState.ordinal());



        updatePulseReason(newState, oldState, pulseReason);

        performTransitionOnComponents(oldState, newState);

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

+2 −1
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ import androidx.annotation.Nullable; 
import androidx.annotation.VisibleForTesting;



import com.android.app.animation.Interpolators;

import com.android.app.tracing.coroutines.TrackTracer;

import com.android.internal.foldables.FoldGracePeriodProvider;

import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.jank.InteractionJankMonitor.Configuration;
@@ -3983,7 +3984,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 


    public void setPendingLock(boolean hasPendingLock) {

        mPendingLock = hasPendingLock;

        Trace.traceCounter(Trace.TRACE_TAG_APP, "pendingLock", mPendingLock ? 1 : 0);

        TrackTracer.instantForGroup("keyguard", "pendingLock", mPendingLock ? 1 : 0);

    }



    private boolean isViewRootReady() {

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

+2 −3
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 


package com.android.systemui.keyguard;



import android.os.Trace;



import com.android.app.tracing.coroutines.TrackTracer;

import com.android.systemui.Dumpable;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.power.domain.interactor.PowerInteractor;
@@ -80,7 +79,7 @@ public class ScreenLifecycle extends Lifecycle<ScreenLifecycle.Observer> impleme 


    private void setScreenState(int screenState) {

        mScreenState = screenState;

        Trace.traceCounter(Trace.TRACE_TAG_APP, "screenState", screenState);

        TrackTracer.instantForGroup("screen", "screenState", screenState);

    }



    public interface Observer {

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

+2 −2
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ import android.graphics.Point; 
import android.os.Bundle;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.Trace;

import android.util.DisplayMetrics;



import androidx.annotation.Nullable;



import com.android.app.tracing.coroutines.TrackTracer;

import com.android.systemui.Dumpable;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dump.DumpManager;
@@ -197,7 +197,7 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe 


    private void setWakefulness(@Wakefulness int wakefulness) {

        mWakefulness = wakefulness;

        Trace.traceCounter(Trace.TRACE_TAG_APP, "wakefulness", wakefulness);

        TrackTracer.instantForGroup("screen", "wakefulness", wakefulness);

    }



    private void updateLastWakeOriginLocation() {

packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.os.Trace; 


import androidx.annotation.VisibleForTesting;



import com.android.app.tracing.coroutines.TrackTracer;

import com.android.internal.widget.LockPatternUtils;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitorCallback;
@@ -241,7 +242,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController { 


    private void setKeyguardFadingAway(boolean keyguardFadingAway) {

        if (mKeyguardFadingAway != keyguardFadingAway) {

            Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardFadingAway",

            TrackTracer.instantForGroup("keyguard", "FadingAway",

                    keyguardFadingAway ? 1 : 0);

            mKeyguardFadingAway = keyguardFadingAway;

            invokeForEachCallback(Callback::onKeyguardFadingAwayChanged);
@@ -356,7 +357,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController { 
    @Override

    public void notifyKeyguardGoingAway(boolean keyguardGoingAway) {

        if (mKeyguardGoingAway != keyguardGoingAway) {

            Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardGoingAway",

            Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguard##GoingAway",

                    keyguardGoingAway ? 1 : 0);

            mKeyguardGoingAway = keyguardGoingAway;

            mKeyguardInteractorLazy.get().setIsKeyguardGoingAway(keyguardGoingAway);