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

Commit 8db4979f authored by Mohamad Mahmoud's avatar Mohamad Mahmoud Committed by Android (Google) Code Review
Browse files

Merge "Allow logcat logs to be collected on synchronous runs, mainly to... 

Merge "Allow logcat logs to be collected on synchronous runs, mainly to collect logcat logs for system server watchdog errors" into main
parents b352e190 387841c5

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

+3 −2
Original line number Diff line number Diff line
@@ -10015,8 +10015,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
                if (crashInfo != null && crashInfo.stackTrace != null) {

                    sb.append(crashInfo.stackTrace);

                }

                boolean shouldAddLogs = logcatLines > 0 || kernelLogLines > 0;

                if (!runSynchronously && shouldAddLogs) {

                boolean shouldAddLogs = (logcatLines > 0 || kernelLogLines > 0)

                        && (Flags.collectLogcatOnRunSynchronously() || !runSynchronously);

                if (shouldAddLogs) {

                    sb.append("\n");

                    if (logcatLines > 0) {

                        fetchLogcatBuffers(sb, logcatLines, LOGCAT_TIMEOUT_SEC,

services/core/java/com/android/server/am/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -152,3 +152,11 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "collect_logcat_on_run_synchronously"

    namespace: "dropbox"

    description: "Allow logcat collection on synchronous dropbox collection"

    bug: "324222683"

    is_fixed_read_only: true

}
 
 No newline at end of file