diff options
| -rw-r--r-- | core/proto/android/server/windowmanagerservice.proto | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto index dbd219141e3e..e6ae22658f31 100644 --- a/core/proto/android/server/windowmanagerservice.proto +++ b/core/proto/android/server/windowmanagerservice.proto @@ -159,6 +159,9 @@ message DisplayContentProto { optional int32 surface_size = 14 [deprecated=true]; optional string focused_app = 15; optional AppTransitionProto app_transition = 16; + repeated IdentifierProto opening_apps = 17; + repeated IdentifierProto closing_apps = 18; + repeated IdentifierProto changing_apps = 19; } /* represents DisplayFrames */ diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index ee4e33e4cfaa..a9dbf3617de8 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -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.STACKS; 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_APP_TRANSITIONS; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_BOOT; @@ -2722,6 +2725,15 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo if (mFocusedApp != null) { 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); } |