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

Commit 7169e51c authored by Andreas Gampe's avatar Andreas Gampe Committed by Android (Google) Code Review
Browse files

Merge "Frameworks/base: Stop profiling on uncaught exception"

parents 1c8e12bc 4c79fea9

core/java/android/app/ActivityThread.java

+10 −0
Original line number Diff line number Diff line
@@ -4660,6 +4660,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));