commit b4859d29fb43a5ed9ba65a210d4b01e9decbe326
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 24 01:17:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 24 01:17:22 2020 +0000
tree 662feef790e8b676b8050e948516055afe0db7b8
parent 9c1c6ad23a0fe35bc4a2f4c9ad4ddae80b0af443
parent 3843e86e53e6521ec1d14d28b4c683dc76874fc4

Merge "Avoid trigger Battery test when there is no battery" into pie-cts-dev am: e8995fddeb am: fb1e00b8b1 am: 85bb54f0c7 am: 3843e86e53

Original change: https://android-review.googlesource.com/c/platform/cts/+/1414049

Change-Id: I697c573306c5cef35359bc1dae315437271d1ac7

hostsidetests/incident/src/com/android/server/cts/BatteryStatsIncidentTest.java

diff --git a/hostsidetests/incident/src/com/android/server/cts/BatteryStatsIncidentTest.java b/hostsidetests/incident/src/com/android/server/cts/BatteryStatsIncidentTest.java
index e353a8d..c6bb372e 100644
--- a/hostsidetests/incident/src/com/android/server/cts/BatteryStatsIncidentTest.java
+++ b/hostsidetests/incident/src/com/android/server/cts/BatteryStatsIncidentTest.java
@@ -55,7 +55,9 @@
         final BatteryStatsServiceDumpProto dump = getDump(BatteryStatsServiceDumpProto.parser(),
                 "dumpsys batterystats --proto");
 
-        verifyBatteryStatsServiceDumpProto(dump, PRIVACY_NONE);
+        if (BatteryIncidentTest.hasBattery(getDevice())) {
+            verifyBatteryStatsServiceDumpProto(dump, PRIVACY_NONE);
+        }
 
         batteryOffScreenOn();
     }

hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java

diff --git a/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java b/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java
index f7dcec1..a262209 100644
--- a/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java
+++ b/hostsidetests/incident/src/com/android/server/cts/IncidentdTest.java
@@ -44,9 +44,8 @@
 
         NotificationIncidentTest.verifyNotificationServiceDumpProto(dump.getNotification(), filterLevel);
 
-        BatteryStatsIncidentTest.verifyBatteryStatsServiceDumpProto(dump.getBatterystats(), filterLevel);
-
         if (BatteryIncidentTest.hasBattery(getDevice())) {
+            BatteryStatsIncidentTest.verifyBatteryStatsServiceDumpProto(dump.getBatterystats(), filterLevel);
             BatteryIncidentTest.verifyBatteryServiceDumpProto(dump.getBattery(), filterLevel);
         }