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

Commit e58f122e authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am: 72e80b5b 

am: efeaad32

Change-Id: I16ff57136a2f53e97b494c866ac3497e00996823
parents 6a9a4a37 efeaad32

core/java/android/app/ActivityThread.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -5659,6 +5659,11 @@ public final class ActivityThread extends ClientTransactionHandler { 
    private void handleBindApplication(AppBindData data) {

    private void handleBindApplication(AppBindData data) {

        // Register the UI Thread as a sensitive thread to the runtime.

        // Register the UI Thread as a sensitive thread to the runtime.

        VMRuntime.registerSensitiveThread();

        VMRuntime.registerSensitiveThread();

        // In the case the stack depth property exists, pass it down to the runtime.

        String property = SystemProperties.get("debug.allocTracker.stackDepth");

        if (property.length() != 0) {

            VMDebug.setAllocTrackerStackDepth(Integer.parseInt(property));

        }

        if (data.trackAllocation) {

        if (data.trackAllocation) {

            DdmVmInternal.enableRecentAllocations(true);

            DdmVmInternal.enableRecentAllocations(true);

        }

        }