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

Commit a4280dc4 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

Merge "Avoid including com.android.server.power.stats in presubmit twice" into main am: 23e53c1c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2847244



Change-Id: Ib294cdfff6f9fa8815aa8a609b78f515599a95e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9338bbda 23e53c1c

core/java/android/os/TEST_MAPPING

+14 −2
Original line number Diff line number Diff line
@@ -52,8 +52,20 @@ 
      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" },

        { "include-filter": "com.android.server.power.stats.BatteryStatsTests" }

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" }

      ]

    },

    {

      "file_patterns": [

        "BatteryStats[^/]*\\.java",

        "BatteryUsageStats[^/]*\\.java",

        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.power.stats" },

        { "exclude-filter": "com.android.server.power.stats.BatteryStatsTests" }

      ]

    },

    {

services/core/java/com/android/server/power/TEST_MAPPING

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"},

        {"exclude-filter": "com.android.server.power.BatteryStatsTests"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"}

      ]
@@ -38,7 +39,8 @@ 
    {

      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"}

        {"include-filter": "com.android.server.power"},

        {"exclude-filter": "com.android.server.power.BatteryStatsTests"}

      ]

    }

  ]