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

Commit 00a13ab0 authored by Denalex Orakwue's avatar Denalex Orakwue
Browse files

Add logging class & logging calls for MediaRouter2 

* Add MediaRouterMetricLogger
* Add logging to MediaRouter2ServiceImpl

Flag: EXEMPT log only update
Bug: 391924847
Change-Id: I7c6bdff7b9a3f688c9c8e39caf8c7fc04ad482e5
parent b80bae8e

services/core/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -121,6 +121,13 @@ genrule { 
    out: ["com/android/server/location/contexthub/ContextHubStatsLog.java"],

}



genrule {

  name: "statslog-mediarouter-java-gen",

  tools: ["stats-log-api-gen"],

  cmd: "$(location stats-log-api-gen) --java $(out) --module mediarouter --javaPackage com.android.server.media --javaClass MediaRouterStatsLog",

  out: ["com/android/server/media/MediaRouterStatsLog.java"],

}



java_library_static {

    name: "services.core.unboosted",

    defaults: [
@@ -136,6 +143,7 @@ java_library_static { 
        ":android.hardware.tv.mediaquality-V1-java-source",

        ":statslog-art-java-gen",

        ":statslog-contexthub-java-gen",

        ":statslog-mediarouter-java-gen",

        ":services.core-aidl-sources",

        ":services.core-sources",

        ":services.core.protologsrc",

services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java

+128 −36

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/media/MediaRouterMetricLogger.java

0 → 100644
+219 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/media/mediarouterservicetest/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ package { 


android_test {

    name: "MediaRouterServiceTests",

    defaults: [

        // For ExtendedMockito dependencies.

        "modules-utils-testable-device-config-defaults",

    ],

    srcs: [

        "src/**/*.java",

    ],
@@ -23,12 +27,17 @@ android_test { 
        "services.core",

        "truth",

    ],

    libs: [

        "android.test.base.stubs",

        "android.test.runner.stubs",

    ],



    platform_apis: true,



    test_suites: [

        // "device-tests",

        "general-tests",

        "mts-statsd",

    ],



    certificate: "platform",
@@ -36,4 +45,5 @@ android_test { 
    optimize: {

        enabled: false,

    },

    min_sdk_version: "30",

}

services/tests/media/mediarouterservicetest/AndroidTest.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
    <option name="test-tag" value="MediaRouterServiceTests" />

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-instrumentation" />

    <option name="test-suite-tag" value="mts" />



    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>
@@ -26,7 +27,7 @@ 
        <option name="install-arg" value="-t" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.InstrumentationTest" >

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.server.media.tests" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>