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

Commit 258a554f authored by Tobias Thierer's avatar Tobias Thierer Committed by Gerrit Code Review
Browse files

Merge "Stop profiling on uncaught exception."

parents d13954e8 8ad86a3d

core/java/android/app/ActivityThread.java

+10 −0
Original line number Diff line number Diff line
@@ -4294,6 +4294,16 @@ public final class ActivityThread { 
        }

    }



    /**

     * Public entrypoint to stop profiling. This is required to end profiling when the app crashes,

     * so that profiler data won't be lost.

     *

     * @hide

     */

    public void stopProfiling() {

        mProfiler.stopProfiling();

    }



    static final void handleDumpHeap(boolean managed, DumpHeapData dhd) {

        if (managed) {

            try {

core/java/com/android/internal/os/RuntimeInit.java

+7 −0
Original line number Diff line number Diff line
@@ -86,6 +86,13 @@ public class RuntimeInit { 
                    Clog_e(TAG, message.toString(), e);

                }



                // Try to end profiling. If a profiler is running at this point, and we kill the

                // process (below), the in-memory buffer will be lost. So try to stop, which will

                // flush the buffer. (This makes method trace profiling useful to debug crashes.)

                if (ActivityThread.currentActivityThread() != null) {

                    ActivityThread.currentActivityThread().stopProfiling();

                }



                // Bring up crash dialog, wait for it to be dismissed

                ActivityManagerNative.getDefault().handleApplicationCrash(

                        mApplicationObject, new ApplicationErrorReport.CrashInfo(e));