Merge pull request #415 from WithSecureLabs/414-drozer-does-not-run-o…

…n-android-6-marshmallow Revert back to the old way of getting data dir on SDK < 24
WithSecureLabs · Apr 2, 2024 · c499043 · c499043
2 parents 884496a + 8456245
commit c499043
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/drozer/console/session.py b/src/drozer/console/session.py
@@ -53,8 +53,10 @@ def __init__(self, server, session_id, arguments):
             self.stderr = DecolouredStream(self.stderr)
 
         m = Module(self)
-        if m.has_context():
+        if m.has_context() and self.reflector.resolve("android.os.Build$VERSION").SDK_INT >= 24:
             dataDir = str(m.getContext().getDataDir().getCanonicalPath().native())
+        elif m.has_context():
+            dataDir = str(m.getContext().getApplicationInfo().dataDir)
         else:
             dataDir = str(m.new("java.io.File", ".").getCanonicalPath().native())
         self.variables = {  'PATH': dataDir +'/bin:/sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin',