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

Commit e682d5fd authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Add removal time of starting window in transition trace proto" into... 

Merge "Add removal time of starting window in transition trace proto" into udc-qpr-dev am: 2b30017c am: a1487979

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



Change-Id: Ic81c41311d16f8609857beb4469c3f6c3a60cd61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 358e3221 a1487979

core/proto/android/server/windowmanagertransitiontrace.proto

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ message Transition { 
  repeated Target targets = 8;

  optional int32 flags = 9;

  optional int64 abort_time_ns = 10;

  optional int64 starting_window_remove_time_ns = 11;

}



message Target {

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

+3 −0
Original line number Diff line number Diff line
@@ -2790,6 +2790,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            } else if (isEmbedded()) {

                associateStartingWindowWithTaskIfNeeded();

            }

            if (mTransitionController.isCollecting()) {

                mStartingData.mTransitionId = mTransitionController.getCollectingTransitionId();

            }

        }

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ public abstract class StartingData { 
    /** Whether to prepare the removal animation. */

    boolean mPrepareRemoveAnimation;



    /** Non-zero if this starting window is added in a collecting transition. */

    int mTransitionId;



    protected StartingData(WindowManagerService service, int typeParams) {

        mService = service;

        mTypeParams = typeParams;

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

+21 −0
Original line number Diff line number Diff line
@@ -145,6 +145,27 @@ public class TransitionTracer { 
        }

    }



    void logRemovingStartingWindow(@NonNull StartingData startingData) {

        if (startingData.mTransitionId == 0) {

            return;

        }

        try {

            final ProtoOutputStream outputStream = new ProtoOutputStream(CHUNK_SIZE);

            final long protoToken = outputStream

                    .start(com.android.server.wm.shell.TransitionTraceProto.TRANSITIONS);

            outputStream.write(com.android.server.wm.shell.Transition.ID,

                    startingData.mTransitionId);

            outputStream.write(

                    com.android.server.wm.shell.Transition.STARTING_WINDOW_REMOVE_TIME_NS,

                    SystemClock.elapsedRealtimeNanos());

            outputStream.end(protoToken);



            mTraceBuffer.add(outputStream);

        } catch (Exception e) {

            Log.e(LOG_TAG, "Unexpected exception thrown while logging transitions", e);

        }

    }



    private void dumpTransitionTargetsToProto(ProtoOutputStream outputStream,

            Transition transition, ArrayList<ChangeInfo> targets) {

        Trace.beginSection("TransitionTracer#dumpTransitionTargetsToProto");

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

+2 −1
Original line number Diff line number Diff line
@@ -2412,7 +2412,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        ProtoLog.v(WM_DEBUG_ADD_REMOVE,

                "removeIfPossible: %s callers=%s", this, Debug.getCallers(5));



        final boolean startingWindow = mAttrs.type == TYPE_APPLICATION_STARTING;

        final boolean startingWindow = mStartingData != null;

        if (startingWindow) {

            ProtoLog.d(WM_DEBUG_STARTING_WINDOW, "Starting window removed %s", this);

            // Cancel the remove starting window animation on shell. The main window might changed
@@ -2426,6 +2426,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                    return false;

                }, true);

            }

            mTransitionController.mTransitionTracer.logRemovingStartingWindow(mStartingData);

        } else if (mAttrs.type == TYPE_BASE_APPLICATION

                && isSelfAnimating(0, ANIMATION_TYPE_STARTING_REVEAL)) {

            // Cancel the remove starting window animation in case the binder dead before remove