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

Commit dcbcacf9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14455055, 14457925, 14457634, 14457944, 14457413,... 

Merge cherrypicks of [14455055, 14457925, 14457634, 14457944, 14457413, 14457414, 14457415, 14458036, 14458037, 14457834, 14458056, 14458057, 14458058, 14458059, 14458060] into sc-d1-release

Change-Id: I7db9da283521fdf1b15e0ac5147b35a97e159f33
parents d2633097 397b13e0

packages/SystemUI/shared/src/com/android/systemui/shared/tracing/FrameProtoTracer.java

+4 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class FrameProtoTracer<P, S extends P, T extends P, R> 
    private final TraceBuffer<P, S, T> mBuffer;

    private final File mTraceFile;

    private final ProtoTraceParams<P, S, T, R> mParams;

    private final Choreographer mChoreographer;

    private Choreographer mChoreographer;

    private final Queue<T> mPool = new LinkedList<>();

    private final ArrayList<ProtoTraceable<R>> mTraceables = new ArrayList<>();

    private final ArrayList<ProtoTraceable<R>> mTmpTraceables = new ArrayList<>();
@@ -94,7 +94,6 @@ public class FrameProtoTracer<P, S extends P, T extends P, R> 
            }

        });

        mTraceFile = params.getTraceFile();

        mChoreographer = Choreographer.getMainThreadInstance();

    }



    public void start() {
@@ -140,6 +139,9 @@ public class FrameProtoTracer<P, S extends P, T extends P, R> 
        }



        // Schedule an update on the next frame

        if (mChoreographer == null) {

            mChoreographer = Choreographer.getMainThreadInstance();

        }

        mChoreographer.postFrameCallback(this);

        mFrameScheduled = true;

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -8212,11 +8212,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
                if (lines > 0) {

                    sb.append("\n");













                    // Merge several logcat streams, and take the last N lines















                    InputStreamReader input = null;















                    try {















                        java.lang.Process logcat = new ProcessBuilder(













                                "/system/bin/timeout", "-k", "15s", "10s",













                                // Time out after 10s, but kill logcat with SEGV













                                // so we can investigate why it didn't finish.













                                "/system/bin/timeout", "-s", "SEGV", "10s",













                                // Merge several logcat streams, and take the last N lines.















                                "/system/bin/logcat", "-v", "threadtime", "-b", "events", "-b", "system",















                                "-b", "main", "-b", "crash", "-t", String.valueOf(lines))















                                        .redirectErrorStream(true).start();