Fixed logging in adb modules

This commit is contained in:
Nex 2022-02-03 20:19:07 +01:00
parent ed8a5a3845
commit 6a723e533f
6 changed files with 16 additions and 14 deletions

View File

@ -78,5 +78,8 @@ class ChromeHistory(AndroidExtraction):
log.info("Extracted a total of %d history items", len(self.results))
def run(self):
self._adb_process_file(os.path.join("/", CHROME_HISTORY_PATH),
self._parse_db)
try:
self._adb_process_file(os.path.join("/", CHROME_HISTORY_PATH),
self._parse_db)
except Exception as e:
self.log.error(e)

View File

@ -34,8 +34,9 @@ class DumpsysAccessibility(AndroidExtraction):
def run(self):
self._adb_connect()
output = self._adb_command("dumpsys accessibility")
self._adb_disconnect()
self.results = parse_dumpsys_accessibility(output)
for result in self.results:
@ -43,4 +44,3 @@ class DumpsysAccessibility(AndroidExtraction):
self.log.info("Identified a total of %d accessibility services", len(self.results))
self._adb_disconnect()

View File

@ -37,8 +37,9 @@ class DumpsysActivities(AndroidExtraction):
def run(self):
self._adb_connect()
output = self._adb_command("dumpsys package")
self._adb_disconnect()
self.results = parse_dumpsys_activity_resolver_table(output)
self._adb_disconnect()
self.log.info("Extracted activities for %d intents", len(self.results))

View File

@ -42,10 +42,9 @@ class DumpsysBatteryDaily(AndroidExtraction):
def run(self):
self._adb_connect()
output = self._adb_command("dumpsys batterystats --daily")
self._adb_disconnect()
self.results = parse_dumpsys_battery_daily(output)
self.log.info("Extracted %d records from battery daily stats", len(self.results))
self._adb_disconnect()

View File

@ -34,10 +34,9 @@ class DumpsysBatteryHistory(AndroidExtraction):
def run(self):
self._adb_connect()
output = self._adb_command("dumpsys batterystats --history")
self._adb_disconnect()
self.results = parse_dumpsys_battery_history(output)
self.log.info("Extracted %d records from battery history", len(self.results))
self._adb_disconnect()

View File

@ -39,11 +39,11 @@ class DumpsysDBInfo(AndroidExtraction):
def run(self):
self._adb_connect()
output = self._adb_command("dumpsys dbinfo")
self._adb_disconnect()
self.results = parse_dumpsys_dbinfo(output)
self.log.info("Extracted a total of %d records from database information",
len(self.results))
self._adb_disconnect()