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

Commit b2b42128 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Trace opening/closing apps" into qt-dev

parents 3fd1b494 1112fed0

core/proto/android/server/windowmanagerservice.proto

+3 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,9 @@ message DisplayContentProto { 
    optional int32 surface_size = 14 [deprecated=true];

    optional int32 surface_size = 14 [deprecated=true];

    optional string focused_app = 15;

    optional string focused_app = 15;

    optional AppTransitionProto app_transition = 16;

    optional AppTransitionProto app_transition = 16;

    repeated IdentifierProto opening_apps = 17;

    repeated IdentifierProto closing_apps = 18;

    repeated IdentifierProto changing_apps = 19;

}

}





/* represents DisplayFrames */

/* represents DisplayFrames */

services/core/java/com/android/server/wm/DisplayContent.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,9 @@ import static com.android.server.wm.DisplayContentProto.ROTATION; 
import static com.android.server.wm.DisplayContentProto.SCREEN_ROTATION_ANIMATION;

import static com.android.server.wm.DisplayContentProto.SCREEN_ROTATION_ANIMATION;

import static com.android.server.wm.DisplayContentProto.STACKS;

import static com.android.server.wm.DisplayContentProto.STACKS;

import static com.android.server.wm.DisplayContentProto.WINDOW_CONTAINER;

import static com.android.server.wm.DisplayContentProto.WINDOW_CONTAINER;

import static com.android.server.wm.DisplayContentProto.OPENING_APPS;

import static com.android.server.wm.DisplayContentProto.CHANGING_APPS;

import static com.android.server.wm.DisplayContentProto.CLOSING_APPS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_BOOT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_BOOT;
@@ -2736,6 +2739,15 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        if (mFocusedApp != null) {

        if (mFocusedApp != null) {

            mFocusedApp.writeNameToProto(proto, FOCUSED_APP);

            mFocusedApp.writeNameToProto(proto, FOCUSED_APP);

        }

        }

        for (int i = mOpeningApps.size() - 1; i >= 0; i--) {

            mOpeningApps.valueAt(i).mActivityRecord.writeIdentifierToProto(proto, OPENING_APPS);

        }

        for (int i = mClosingApps.size() - 1; i >= 0; i--) {

            mClosingApps.valueAt(i).mActivityRecord.writeIdentifierToProto(proto, CLOSING_APPS);

        }

        for (int i = mChangingApps.size() - 1; i >= 0; i--) {

            mChangingApps.valueAt(i).mActivityRecord.writeIdentifierToProto(proto, CHANGING_APPS);

        }

        proto.end(token);

        proto.end(token);

    }

    }