diff --git a/mvt/android/modules/adb/__init__.py b/mvt/android/modules/adb/__init__.py index 831f91c..139cd8c 100644 --- a/mvt/android/modules/adb/__init__.py +++ b/mvt/android/modules/adb/__init__.py @@ -7,10 +7,7 @@ from .chrome_history import ChromeHistory from .dumpsys_accessibility import DumpsysAccessibility from .dumpsys_activities import DumpsysActivities from .dumpsys_battery_history import DumpsysBatteryHistory -from .dumpsys_batterystats import DumpsysBatterystats from .dumpsys_full import DumpsysFull -from .dumpsys_packages import DumpsysPackages -from .dumpsys_procstats import DumpsysProcstats from .dumpsys_receivers import DumpsysReceivers from .files import Files from .getprop import Getprop @@ -23,7 +20,6 @@ from .sms import SMS from .whatsapp import Whatsapp ADB_MODULES = [ChromeHistory, SMS, Whatsapp, Processes, Getprop, Settings, - DumpsysAccessibility, DumpsysBatterystats, DumpsysProcstats, - DumpsysBatteryHistory, DumpsysPackages, DumpsysReceivers, + DumpsysAccessibility, DumpsysBatteryHistory, DumpsysReceivers, DumpsysActivities, DumpsysFull, Packages, RootBinaries, Logcat, Files] diff --git a/mvt/android/modules/adb/dumpsys_accessibility.py b/mvt/android/modules/adb/dumpsys_accessibility.py index 450d3f9..6dcdb48 100644 --- a/mvt/android/modules/adb/dumpsys_accessibility.py +++ b/mvt/android/modules/adb/dumpsys_accessibility.py @@ -40,12 +40,8 @@ class DumpsysAccessibility(AndroidExtraction): service = line.split(":")[1].strip() log.info("Found installed accessibility service \"%s\"", service) - if self.output_folder: - acc_path = os.path.join(self.output_folder, "dumpsys_accessibility.txt") - with open(acc_path, "w", encoding="utf-8") as handle: - handle.write(stats) + self.results.append(service) - log.info("Records from dumpsys accessibility stored at %s", - acc_path) + log.info("Identified a total of %d accessibility services", len(self.results)) self._adb_disconnect() diff --git a/mvt/android/modules/adb/dumpsys_battery_history.py b/mvt/android/modules/adb/dumpsys_battery_history.py index 3d7a8dd..7c677c7 100644 --- a/mvt/android/modules/adb/dumpsys_battery_history.py +++ b/mvt/android/modules/adb/dumpsys_battery_history.py @@ -28,7 +28,7 @@ class DumpsysBatteryHistory(AndroidExtraction): self.detected.append(result) continue - def process_process_history(self, output): + def process_battery_history(self, output): for line in output.split("\n")[1:]: if line.strip() == "": break @@ -69,12 +69,12 @@ class DumpsysBatteryHistory(AndroidExtraction): "service": service, }) - self.log.info("Extracted %d records from process history", len(self.results)) + self.log.info("Extracted %d records from battery history", len(self.results)) def run(self): self._adb_connect() output = self._adb_command("dumpsys batterystats --history") - self.process_process_history(output) + self.process_battery_history(output) self._adb_disconnect()