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

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

Merge "Clarify costs in onTransactionReady" into tm-qpr-dev am: cd07f0df 

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



Change-Id: I000be7356bdca9e90691887cc1e5f477ccb0a7bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 593af214 cd07f0df

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

+0 −5
Original line number Diff line number Diff line
@@ -1238,11 +1238,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        return "ROOT";

    }



    @Override

    void scheduleAnimation() {

        mWmService.scheduleAnimationLocked();

    }



    @Override

    protected void removeChild(DisplayContent dc) {

        super.removeChild(dc);

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

+29 −26
Original line number Diff line number Diff line
@@ -3624,10 +3624,10 @@ class Task extends TaskFragment { 
    }



    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder(128);

        if (stringName != null) {

            sb.append(stringName);

    String toFullString() {

        final StringBuilder sb = new StringBuilder(192);

        sb.append(this);

        sb.setLength(sb.length() - 1); // Remove tail '}'.

        sb.append(" U=");

        sb.append(mUserId);

        final Task rootTask = getRootTask();
@@ -3648,6 +3648,11 @@ class Task extends TaskFragment { 
        sb.append('}');

        return sb.toString();

    }



    @Override

    public String toString() {

        if (stringName != null) return stringName;

        StringBuilder sb = new StringBuilder(128);

        sb.append("Task{");

        sb.append(Integer.toHexString(System.identityHashCode(this)));

        sb.append(" #");
@@ -3662,11 +3667,9 @@ class Task extends TaskFragment { 
        } else if (affinityIntent != null && affinityIntent.getComponent() != null) {

            sb.append(" aI=");

            sb.append(affinityIntent.getComponent().flattenToShortString());

        } else {

            sb.append(" ??");

        }

        stringName = sb.toString();

        return toString();

        sb.append('}');

        return stringName = sb.toString();

    }



    /**

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

+1 −1
Original line number Diff line number Diff line
@@ -1937,7 +1937,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
                continue;

            }

            final Task rootTask = child.asTask();

            pw.println(doublePrefix + "* " + rootTask);

            pw.println(doublePrefix + "* " + rootTask.toFullString());

            rootTask.dump(pw, triplePrefix, dumpAll);

        }

    }

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

+30 −3
Original line number Diff line number Diff line
@@ -2581,6 +2581,32 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        return getWindowingMode() == WINDOWING_MODE_FULLSCREEN || matchParentBounds();

    }



    String toFullString() {

        final StringBuilder sb = new StringBuilder(128);

        sb.append(this);

        sb.setLength(sb.length() - 1); // Remove tail '}'.

        if (mTaskFragmentOrganizerUid != INVALID_UID) {

            sb.append(" organizerUid=");

            sb.append(mTaskFragmentOrganizerUid);

        }

        if (mTaskFragmentOrganizerProcessName != null) {

            sb.append(" organizerProc=");

            sb.append(mTaskFragmentOrganizerProcessName);

        }

        if (mAdjacentTaskFragment != null) {

            sb.append(" adjacent=");

            sb.append(mAdjacentTaskFragment);

        }

        sb.append('}');

        return sb.toString();

    }



    @Override

    public String toString() {

        return "TaskFragment{" + Integer.toHexString(System.identityHashCode(this))

                + " mode=" + WindowConfiguration.windowingModeToString(getWindowingMode()) + "}";

    }



    boolean dump(String prefix, FileDescriptor fd, PrintWriter pw, boolean dumpAll,

            boolean dumpClient, String dumpPackage, final boolean needSep, Runnable header) {

        boolean printed = false;
@@ -2619,7 +2645,7 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
    }



    void dumpInner(String prefix, PrintWriter pw, boolean dumpAll, String dumpPackage) {

        pw.print(prefix); pw.print("* "); pw.println(this);

        pw.print(prefix); pw.print("* "); pw.println(toFullString());

        final Rect bounds = getRequestedOverrideBounds();

        if (!bounds.isEmpty()) {

            pw.println(prefix + "  mBounds=" + bounds);
@@ -2640,10 +2666,11 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
        final String doublePrefix = prefix + "  ";

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

            final WindowContainer<?> child = mChildren.get(i);

            pw.println(prefix + "* " + child);

            final TaskFragment tf = child.asTaskFragment();

            pw.println(prefix + "* " + (tf != null ? tf.toFullString() : child));

            // Only dump non-activity because full activity info is already printed by

            // RootWindowContainer#dumpActivities.

            if (child.asActivityRecord() == null) {

            if (tf != null) {

                child.dump(pw, doublePrefix, dumpAll);

            }

        }

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

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.graphics.RenderNode; 
import android.hardware.HardwareBuffer;

import android.os.Environment;

import android.os.Handler;

import android.os.Trace;

import android.util.ArraySet;

import android.util.Pair;

import android.util.Slog;
@@ -391,8 +392,10 @@ class TaskSnapshotController { 
    SurfaceControl.ScreenshotHardwareBuffer createTaskSnapshot(@NonNull Task task,

            TaskSnapshot.Builder builder) {

        Point taskSize = new Point();

        Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "createTaskSnapshot");

        final SurfaceControl.ScreenshotHardwareBuffer taskSnapshot = createTaskSnapshot(task,

                mHighResTaskSnapshotScale, builder.getPixelFormat(), taskSize, builder);

        Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

        builder.setTaskSize(taskSize);

        return taskSnapshot;

    }