Merge pull request dtmilano#254 from knorrium/master

dtmilano · web-flow · commit 8983205c01b5 · 2018-08-21T23:37:10.000-07:00
add support for activities within inner classes
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -1287,7 +1287,7 @@ def getFocusedWindowName(self):
     def getTopActivityNameAndPid(self):
         dat = self.shell('dumpsys activity top')
         lines = dat.splitlines()
-        activityRE = re.compile('\s*ACTIVITY ([A-Za-z0-9_.]+)/([A-Za-z0-9_.]+) \w+ pid=(\d+)')
+        activityRE = re.compile('\s*ACTIVITY ([A-Za-z0-9_.]+)/([A-Za-z0-9_.\$]+) \w+ pid=(\d+)')
         m = activityRE.search(lines[1])
         if m:
             return m.group(1), m.group(2), m.group(3)
