From 3fe5d8dc8db182ca9f7c35a47a2a52b04de0d655 Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 3 Feb 2022 22:18:37 +0100 Subject: [PATCH] Fixing battery stats history parsing --- mvt/android/modules/adb/dumpsys_accessibility.py | 1 - mvt/android/modules/adb/dumpsys_dbinfo.py | 1 - mvt/android/modules/bugreport/battery_history.py | 8 -------- 3 files changed, 10 deletions(-) diff --git a/mvt/android/modules/adb/dumpsys_accessibility.py b/mvt/android/modules/adb/dumpsys_accessibility.py index c51e2a8..10baf3e 100644 --- a/mvt/android/modules/adb/dumpsys_accessibility.py +++ b/mvt/android/modules/adb/dumpsys_accessibility.py @@ -43,4 +43,3 @@ class DumpsysAccessibility(AndroidExtraction): log.info("Found installed accessibility service \"%s\"", result.get("service")) self.log.info("Identified a total of %d accessibility services", len(self.results)) - diff --git a/mvt/android/modules/adb/dumpsys_dbinfo.py b/mvt/android/modules/adb/dumpsys_dbinfo.py index d5dcae5..5a10e98 100644 --- a/mvt/android/modules/adb/dumpsys_dbinfo.py +++ b/mvt/android/modules/adb/dumpsys_dbinfo.py @@ -46,4 +46,3 @@ class DumpsysDBInfo(AndroidExtraction): self.log.info("Extracted a total of %d records from database information", len(self.results)) - diff --git a/mvt/android/modules/bugreport/battery_history.py b/mvt/android/modules/bugreport/battery_history.py index 9f86c09..09de1ed 100644 --- a/mvt/android/modules/bugreport/battery_history.py +++ b/mvt/android/modules/bugreport/battery_history.py @@ -42,16 +42,8 @@ class BatteryHistory(BugReportModule): return lines = [] - in_batterystats = False in_history = False for line in content.decode(errors="ignore").splitlines(): - if line.strip() == "********** Print latest newbatterystats **********": - in_batterystats = True - continue - - if not in_batterystats: - continue - if line.strip().startswith("Battery History "): lines.append(line) in_history = True