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

Commit 0f642d27 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Android (Google) Code Review
Browse files

Merge "Add a required main category for multi logs."

parents 3101b3ad 5cc5d8a3

core/java/com/android/internal/logging/LogBuilder.java

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ public class LogBuilder { 


    private SparseArray<Object> entries = new SparseArray();



    public LogBuilder() {}



    public LogBuilder(int mainCategory) {

        setCategory(mainCategory);

    }



    public LogBuilder setView(View view) {

        entries.put(MetricsEvent.RESERVED_FOR_LOGBUILDER_VIEW, view.getId());

core/tests/coretests/src/com/android/internal/logging/LogBuilderTest.java

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import junit.framework.TestCase; 
public class LogBuilderTest extends TestCase {



    public void testSerialize() {

        LogBuilder builder = new LogBuilder();

        LogBuilder builder = new LogBuilder(0);

        builder.addTaggedData(1, "one");

        builder.addTaggedData(2, "two");

        Object[] out = builder.serialize();
@@ -16,7 +16,7 @@ public class LogBuilderTest extends TestCase { 
    }



    public void testInvalidInputThrows() {

        LogBuilder builder = new LogBuilder();

        LogBuilder builder = new LogBuilder(0);

        boolean threw = false;

        try {

            builder.addTaggedData(0, new Object());
@@ -28,7 +28,7 @@ public class LogBuilderTest extends TestCase { 
    }



    public void testValidInputTypes() {

        LogBuilder builder = new LogBuilder();

        LogBuilder builder = new LogBuilder(0);

        builder.addTaggedData(1, "onetwothree");

        builder.addTaggedData(2, 123);

        builder.addTaggedData(3, 123L);

proto/src/metrics_constants.proto

+5 −0
Original line number Diff line number Diff line
@@ -3181,6 +3181,11 @@ message MetricsEvent { 
    // user accepted

    ACTION_SKIP_DISCLAIMER_SELECTED = 760;



    // Enclosing category for group of APP_TRANSITION_FOO events,

    // logged when we execute an app transition.

    APP_TRANSITION = 761;





    // ---- End O Constants, all O constants go above this line ----



    // Add new aosp constants above this line.

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ class ActivityMetricsLogger { 
        MetricsLogger.action(mContext, MetricsEvent.APP_TRANSITION_DEVICE_UPTIME_SECONDS,

                (int) (SystemClock.uptimeMillis() / 1000));



        LogBuilder builder = new LogBuilder();

        LogBuilder builder = new LogBuilder(MetricsEvent.APP_TRANSITION);

        builder.addTaggedData(MetricsEvent.APP_TRANSITION_COMPONENT_NAME, componentName);

        builder.addTaggedData(MetricsEvent.APP_TRANSITION_PROCESS_RUNNING, processRunning ? 1 : 0);

        builder.addTaggedData(MetricsEvent.APP_TRANSITION_DEVICE_UPTIME_SECONDS,