Fix batterystats regex as per new builds

Change-Id: Ic6da09bdb57a9ede83d9e51b2edfc162913b0eaa

2 files changed, 62 insertions, 1 deletions

diff --git a/src/com/android/loganalysis/parser/DumpsysBatteryStatsParser.java b/src/com/android/loganalysis/parser/DumpsysBatteryStatsParser.java
index 3e8be2c..8a995e8 100644
--- a/src/com/android/loganalysis/parser/DumpsysBatteryStatsParser.java
+++ b/src/com/android/loganalysis/parser/DumpsysBatteryStatsParser.java
@@ -29,7 +29,8 @@ import java.util.List;
 public class DumpsysBatteryStatsParser extends AbstractSectionParser {
 
     private static final String SUMMARY_INFO_SECTION_REGEX =
-            "Battery History \\(\\d+% used, \\d+KB used of \\d+KB, \\d+ strings using \\d+KB\\):$";
+            "Battery History \\(\\d+% used, \\d+(KB)? used of \\d+KB, \\d+ strings using "
+            + "\\d+(KB)?\\):$";
     private static final String DETAILED_INFO_SECTION_REGEX = "^Statistics since last charge:$";
     private static final String NOOP_SECTION_REGEX = "^Statistics since last unplugged:$";
 
diff --git a/tests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java b/tests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
index 8799a9b..e96491a 100644
--- a/tests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
+++ b/tests/src/com/android/loganalysis/parser/DumpsysBatteryStatsParserTest.java
@@ -89,5 +89,65 @@ public class DumpsysBatteryStatsParserTest extends TestCase {
         assertNotNull(batteryStats.getBatteryStatsSummaryItem());
         assertNotNull(batteryStats.getDetailedBatteryStatsItem());
     }
+
+    public void testBatteryStatsWithNoKB() {
+        List<String> inputBlock = Arrays.asList(
+                "Battery History (37% used, 95 used of 256KB, 166 strings using 15):",
+                "     0 (9) RESET:TIME: 2014-12-09-11-33-29",
+                "     +1s067ms (1) 100 c0500020 -wifi_full_lock -wifi_scan",
+                "     +3s297ms (2) 100 80400020 -wake_lock -screen",
+                "     +30m02s075ms (1) 100 c0500020 wifi_signal_strength=4 wifi_suppl=completed",
+                "     +30m03s012ms (2) 099 c0500020 temp=306 volt=4217",
+                "     +33m48s967ms (1) 099 f8400020 +wifi_scan",
+                "     +33m49s335ms (2) 098 f0400020 temp=324 -wifi_scan",
+                "Statistics since last charge:",
+                " Time on battery: 2h 21m 5s 622ms (12.0%) realtime, 7m 54s 146ms (0.7%) uptime",
+                " Time on battery screen off: 2h 5m 55s 3ms (1%) realtime, 7m 4s 5ms (7%) uptime",
+                " Total run time: 19h 38m 43s 650ms realtime, 17h 25m 32s 175ms uptime",
+                " All kernel wake locks:",
+                " Kernel Wake lock PowerManagerService.WakeLocks: 1h 3m 50s 5ms (8 times) realtime",
+                " Kernel Wake lock event0-2656 : 3m 49s 268ms (2399 times) realtime",
+                " Kernel Wake lock wlan_wd_wake: 3m 34s 639ms (1751 times) realtime",
+                " Kernel Wake lock wlan_rx_wake: 3m 19s 887ms (225 times) realtime",
+                " Kernel Wake lock wlan_tx_wake: 2m 19s 887ms (225 times) realtime",
+                " Kernel Wake lock tx_wake: 1m 19s 887ms (225 times) realtime",
+                " ",
+                " All partial wake locks:",
+                " Wake lock u0a7 NlpWakeLock: 8m 13s 203ms (1479 times) realtime",
+                " Wake lock u0a7 NlpCollectorWakeLock: 6m 29s 18ms (238 times) realtime",
+                " Wake lock u0a7 GCM_CONN_ALARM: 6m 8s 587ms (239 times) realtime",
+                " Wake lock 1000 *alarm*: 5m 11s 316ms (1469 times) realtime",
+                " Wake lock u10 xxx: 4m 11s 316ms (1469 times) realtime",
+                " Wake lock u30 cst: 2m 11s 316ms (1469 times) realtime",
+                " ",
+                " All wakeup reasons:",
+                " Wakeup reason 200:qcom,smd-rpm:222:fc4: 11m 49s 332ms (0 times) realtime",
+                " Wakeup reason 200:qcom,smd-rpm: 48s 45ms (0 times) realtime",
+                " Wakeup reason 2:qcom,smd-rpm:2:f0.qm,mm:22:fc4mi: 3s 417ms (0 times) realtime",
+                " Wakeup reason 188:qcom,smd-adsp:200:qcom,smd-rpm: 1s 656ms (0 times) realtime",
+                " Wakeup reason 58:qcom,smsm-modem:2:qcom,smd-rpm: 6m 16s 1ms (5 times) realtime",
+                " Wakeup reason 57:qcom,smd-modem:200:qcom,smd-rpm: 40s 995ms (0 times) realtime",
+                " Wakeup reason unknown: 8s 455ms (0 times) realtime",
+                " Wakeup reason 9:bcmsdh_sdmmc:2:qcomd-rpm:240:mso: 8m 5s 9ms (0 times) realtime",
+                " ",
+                " 0:",
+                "    User activity: 2 other",
+                "    Wake lock SCREEN_FROZEN realtime",
+                "    Sensor 0: 9s 908ms realtime (1 times)",
+                "    Sensor 1: 9s 997ms realtime (1 times)",
+                "    Foreground for: 2h 21m 5s 622ms",
+                "    Apk android:",
+                "      24 wakeup alarms",
+                " u0a9:",
+                "    Mobile network: 8.1KB received, 1.6KB sent (packets 291 received, 342 sent)",
+                "    Mobile radio active: 3m 43s 890ms (34.2%) 39x @ 354 mspp",
+                "    Sensor 2: 12m 13s 15ms realtime (5 times)",
+                "    Sensor 32: (not used)",
+                "    Sensor 35: (not used)");
+
+        DumpsysBatteryStatsItem batteryStats = new DumpsysBatteryStatsParser().parse(inputBlock);
+        assertNotNull(batteryStats.getBatteryStatsSummaryItem());
+        assertNotNull(batteryStats.getDetailedBatteryStatsItem());
+    }
 }