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

Commit b5314651 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid including com.android.server.power.stats in presubmit twice" into... 

Merge "Avoid including com.android.server.power.stats in presubmit twice" into udc-qpr-dev am: 61a737c6 am: af58245d

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



Change-Id: I5e4c4b93a653c2ad68d2b700dba8d5a310f8e67e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9902c91d af58245d

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"}

      ]

    }

  ]