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

Commit 0d2ecc61 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Baseline `logging` support for SysUI. 

SysUI code heavily relies on utility classes under the `logging`
internal package, which are pretty straightforward.  This change
enables them under Ravenwood, along with tests to confirm.

Some of the foundational interfaces have been moved to modules-utils,
which isn't yet configured to support our Ravenwood annotations, so
we use hard-coded policies.

Bug: 319647875
Test: atest FrameworksCoreTestsRavenwood
Change-Id: I7e670d31e89a0be741df1c118ecc19c91a24d8fb
parent ff93fc40

core/java/android/metrics/LogMaker.java

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import java.util.Arrays; 
 * @hide

 */

@SystemApi

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class LogMaker {

    private static final String TAG = "LogBuilder";

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
 *

 * @hide

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class MetricsLogger {

    // define metric categories in frameworks/base/proto/src/metrics_constants.proto.

    // mirror changes in native version at system/core/libmetricslogger/metrics_logger.cpp

core/java/com/android/internal/logging/testing/FakeMetricsLogger.java

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import java.util.Queue; 
 *

 * @hide.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class FakeMetricsLogger extends MetricsLogger {

    private Queue<LogMaker> logs = new LinkedList<>();

core/java/com/android/internal/logging/testing/UiEventLoggerFake.java

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import java.util.List; 
 *

 * @hide.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class UiEventLoggerFake implements UiEventLogger {

    /**

     * Immutable data class used to record fake log events.

core/tests/coretests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ android_ravenwood_test { 
        "src/android/database/CursorWindowTest.java",

        "src/android/os/**/*.java",

        "src/android/util/**/*.java",

        "src/com/android/internal/logging/**/*.java",

        "src/com/android/internal/os/**/*.java",

        "src/com/android/internal/os/LongArrayMultiStateCounterTest.java",

        "src/com/android/internal/util/**/*.java",

        "src/com/android/internal/power/EnergyConsumerStatsTest.java",