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

Commit 0203775a authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Update Perfetto Protolog flag name 

Needed to create a new flag because we can't set flag to readonly once created

Bug: 276432490
Test: mp droid
Change-Id: I45598a8e91d8959fd957dc23af20c7817ebc31fe
parent a600e33d

core/java/com/android/internal/protolog/ProtoLogImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class ProtoLogImpl { 
     */

    public static synchronized IProtoLog getSingleInstance() {

        if (sServiceInstance == null) {

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

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

                sServiceInstance =

                        new PerfettoProtoLogImpl(sViewerConfigPath);

            } else {

libs/WindowManager/Shell/src/com/android/wm/shell/ProtoLogController.java

+4 −4
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 
        final ILogger logger = pw::println;

        switch (args[0]) {

            case "status": {

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

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

                    pw.println("(Deprecated) legacy command. Use Perfetto commands instead.");

                    return false;

                }
@@ -59,7 +59,7 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 
                return true;

            }

            case "start": {

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

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

                    pw.println("(Deprecated) legacy command. Use Perfetto commands instead.");

                    return false;

                }
@@ -67,7 +67,7 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 
                return true;

            }

            case "stop": {

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

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

                    pw.println("(Deprecated) legacy command. Use Perfetto commands instead.");

                    return false;

                }
@@ -101,7 +101,7 @@ public class ProtoLogController implements ShellCommandHandler.ShellCommandActio 
                return mShellProtoLog.stopLoggingToLogcat(groups, logger) == 0;

            }

            case "save-for-bugreport": {

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

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

                    pw.println("(Deprecated) legacy command");

                    return false;

                }

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -6701,7 +6701,7 @@ public class WindowManagerService extends IWindowManager.Stub 


    private void dumpLogStatus(PrintWriter pw) {

        pw.println("WINDOW MANAGER LOGGING (dumpsys window logging)");

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

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

            pw.println("Deprecated legacy command. Use Perfetto commands instead.");

            return;

        }

services/core/java/com/android/server/wm/WindowTracing.java

+2 −2
Original line number Diff line number Diff line
@@ -155,13 +155,13 @@ class WindowTracing { 
            logAndPrintln(pw, "Stop tracing to " + mTraceFile + ". Waiting for traces to flush.");

            writeTraceToFileLocked();

            logAndPrintln(pw, "Trace written to " + mTraceFile + ".");

            if (!android.tracing.Flags.perfettoProtolog()) {

            if (!android.tracing.Flags.perfettoProtologTracing()) {

                ((LegacyProtoLogImpl) mProtoLog).stopProtoLog(pw, true);

            }

            logAndPrintln(pw, "Start tracing to " + mTraceFile + ".");

            mBuffer.resetBuffer();

            mEnabled = mEnabledLockFree = true;

            if (!android.tracing.Flags.perfettoProtolog()) {

            if (!android.tracing.Flags.perfettoProtologTracing()) {

                ((LegacyProtoLogImpl) mProtoLog).startProtoLog(pw);

            }

        }

tests/Internal/src/com/android/internal/protolog/PerfettoDataSourceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import perfetto.protos.ProtologConfig; 
public class PerfettoDataSourceTest {

    @Before

    public void before() {

        assumeTrue(android.tracing.Flags.perfettoProtolog());

        assumeTrue(android.tracing.Flags.perfettoProtologTracing());

    }



    @Test