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

Commit a27827d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add flag to have system server wait for a debugger to attach" into main

parents 829a7915 d0332e5c

services/java/com/android/server/SystemServer.java

+7 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ import com.android.server.wm.ActivityTaskManagerService; 
import com.android.server.wm.WindowManagerGlobalLock;

import com.android.server.wm.WindowManagerService;



import dalvik.system.VMDebug;

import dalvik.system.VMRuntime;



import java.io.File;
@@ -812,6 +813,12 @@ public final class SystemServer implements Dumpable { 
    }



    private void run() {

        if (VMDebug.isDebuggingEnabled()

                && SystemProperties.getBoolean("debug.system_server.jdwp_wait", false)) {

            Slog.i(TAG, "System server is waiting for debugger before starting...");

            Debug.waitForDebugger();

        }



        TimingsTraceAndSlog t = new TimingsTraceAndSlog();

        try {

            // Explicitly initialize a 4 MB shmem buffer for Perfetto producers (b/382369925)