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

Commit 1ed3ca55 authored by Kean Mariotti's avatar Kean Mariotti Committed by Android (Google) Code Review
Browse files

Merge "Flag cleanup" into main

parents 0106cca2 fc63b61b

core/java/android/tracing/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -48,14 +48,6 @@ flag { 
    bug: "352538294"

}



flag {

    name: "system_server_large_perfetto_shmem_buffer"

    namespace: "windowing_tools"

    description: "Large perfetto shmem buffer"

    is_fixed_read_only: true

    bug: "382369925"

}



flag {

    name: "imetracker_protolog"

    namespace: "windowing_tools"

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

+3 −5
Original line number Diff line number Diff line
@@ -837,11 +837,9 @@ public final class SystemServer implements Dumpable { 
    private void run() {

        TimingsTraceAndSlog t = new TimingsTraceAndSlog();

        try {

            if (android.tracing.Flags.systemServerLargePerfettoShmemBuffer()) {

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

            android.tracing.perfetto.Producer.init(new InitArguments(

                    InitArguments.PERFETTO_BACKEND_SYSTEM, 4 * 1024));

            }



            t.traceBegin("InitBeforeStartServices");