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

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

Merge "Make ShadeTraceLogger methods static" into main

parents bb11f94a ed840f82

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowView.java

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public class NotificationShadeWindowView extends WindowRootView { 
    public void onMovedToDisplay(int displayId, Configuration config) {

        super.onMovedToDisplay(displayId, config);

        ShadeWindowGoesAround.isUnexpectedlyInLegacyMode();

        ShadeTraceLogger.INSTANCE.logOnMovedToDisplay(displayId, config);

        ShadeTraceLogger.logOnMovedToDisplay(displayId, config);

        if (mConfigurationForwarder != null) {

            mConfigurationForwarder.dispatchOnMovedToDisplay(displayId, config);

        }
@@ -181,7 +181,7 @@ public class NotificationShadeWindowView extends WindowRootView { 
    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        ShadeTraceLogger.INSTANCE.logOnConfigChanged(newConfig);

        ShadeTraceLogger.logOnConfigChanged(newConfig);

        if (mConfigurationForwarder != null) {

            ShadeWindowGoesAround.isUnexpectedlyInLegacyMode();

            mConfigurationForwarder.onConfigurationChanged(newConfig);

packages/SystemUI/src/com/android/systemui/shade/ShadeTraceLogger.kt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.app.tracing.TraceUtils.traceAsync 
object ShadeTraceLogger {

    private const val TAG = "ShadeTraceLogger"



    @JvmStatic

    fun logOnMovedToDisplay(displayId: Int, config: Configuration) {

        if (!Trace.isEnabled()) return

        Trace.instantForTrack(
@@ -39,6 +40,7 @@ object ShadeTraceLogger { 
        )

    }



    @JvmStatic

    fun logOnConfigChanged(config: Configuration) {

        if (!Trace.isEnabled()) return

        Trace.instantForTrack(