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

Commit 997cc66f authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix Ravenwood ProtoLogTest" into main

parents 439e237e c5c930ae

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.protolog; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.ServiceManager;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;
@@ -37,6 +38,7 @@ import java.util.stream.Collectors; 
 * if shared, but instances are intended to be managed by the ProtoLog class or tests.

 * Internal state is synchronized via mInitLock.

 */

@RavenwoodKeepWholeClass

public class ProtoLogController {



    @Nullable

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

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ import org.junit.runner.RunWith; 
public class ProtoLogTest {

    @Test

    public void canTrace() {

        ProtoLog.init(TEST_GROUP_1, TEST_GROUP_2);

        ProtoLog.registerLogGroupInProcess(TEST_GROUP_1, TEST_GROUP_2);

        ProtoLog.init();



        ProtoLog.v(TEST_GROUP_1, "Verbose message");

        ProtoLog.d(TEST_GROUP_1, "Debug message");

ravenwood/texts/ravenwood-annotation-allowed-classes.txt

+1 −0
Original line number Diff line number Diff line
@@ -584,6 +584,7 @@ com.android.internal.power.ModemPowerProfile 


com.android.internal.protolog.LogcatOnlyProtoLogImpl

com.android.internal.protolog.ProtoLog

com.android.internal.protolog.ProtoLogController



com.android.internal.protolog.common.LogLevel