Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add BatteryUsageStatsProtoTests to presubmit" into sc-dev am: 0a9650dcde

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

Change-Id: I911b98ffe7a8ac94491509e60bd34a05e3cdb7e2
This commit is contained in:
TreeHugger Robot
2021-06-15 18:19:02 +00:00
committed by Automerger Merge Worker
parent 6e298ef6f9 0a9650dcde
commit dfc69a5021
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/os/TEST_MAPPING
View File

@@ -40,7 +40,12 @@
]
},
{
"file_patterns": ["BatteryStats.java"],
"file_patterns": [
"BatteryStats[^/]*\\.java",
"BatteryUsageStats[^/]*\\.java",
"PowerComponents\\.java",
"[^/]*BatteryConsumer[^/]*\\.java"
],
"name": "FrameworksCoreTests",
"options": [
{ "include-filter": "com.android.internal.os.BatteryStatsTests" },
@@ -48,13 +53,26 @@
]
},
{
"file_patterns": ["BatteryStats.java"],
"file_patterns": [
"BatteryStats[^/]*\\.java",
"BatteryUsageStats[^/]*\\.java",
"PowerComponents\\.java",
"[^/]*BatteryConsumer[^/]*\\.java"
],
"name": "FrameworksServicesTests",
"options": [
{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" },
{ "include-filter": "com.android.server.am.MeasuredEnergySnapshotTest" },
{ "include-filter": "com.android.server.am.BatteryExternalStatsWorkerTest" }
]
},
{
"file_patterns": [
"BatteryUsageStats[^/]*\\.java",
"PowerComponents\\.java",
"[^/]*BatteryConsumer[^/]*\\.java"
],
"name": "BatteryUsageStatsProtoTests"
}
],
"postsubmit": [

14
core/java/com/android/internal/os/TEST_MAPPING
View File

@@ -12,6 +12,14 @@
{ "exclude-annotation": "com.android.internal.os.SkipPresubmit" }
]
},
{
"file_patterns": [
"Battery[^/]*\\.java",
"Kernel[^/]*\\.java",
"[^/]*Power[^/]*\\.java"
],
"name": "BatteryUsageStatsProtoTests"
},
{
"file_patterns": [
"BinderDeathDispatcher\\.java"
@@ -23,7 +31,11 @@
]
},
{
"file_patterns": ["Battery[^/]*\\.java"],
"file_patterns": [
"Battery[^/]*\\.java",
"Kernel[^/]*\\.java",
"[^/]*Power[^/]*\\.java"
],
"name": "FrameworksServicesTests",
"options": [
{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" },