Hook UsageStatsService to track activity resume stop event

Tornaco · Oct 10, 2021 · 199cbf3 · 199cbf3
1 parent 82263b5
commit 199cbf3
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 253 deletions.
diff --git a/...xceptionTransformedInvocationHandler.java → ...xceptionTransformedInvocationHandler.java b/...xceptionTransformedInvocationHandler.java → ...xceptionTransformedInvocationHandler.java
@@ -1,4 +1,4 @@
-package github.tornaco.android.thanox.magisk.bridge.proxy;
+package util;
 
 import android.os.RemoteException;
 import android.util.Log;
@@ -9,6 +9,7 @@
 import java.lang.reflect.Method;
 
 public interface ExceptionTransformedInvocationHandler {
+
     default Object tryInvoke(Object proxy, Method method, Object[] args)
             throws Throwable {
         try {

diff --git a/android/android_framework/base/src/main/java/util/XposedHelpersExt.java b/android/android_framework/base/src/main/java/util/XposedHelpersExt.java
@@ -113,4 +113,11 @@ public static int getIntFieldWithPotentialNames(Object obj, String... potentialF
     }
     throw new NoSuchFieldException(Arrays.toString(potentialFieldNames));
   }
+
+  public static boolean matchMethodNameAndArgs(Method methodToCheck, String methodNameExpected, Class<?>... argTypesExpected) {
+    if (!methodNameExpected.equals(methodToCheck.getName())){
+      return false;
+    }
+    return Arrays.equals(methodToCheck.getParameterTypes(), argTypesExpected);
+  }
 }
diff --git a/...ridge/src/main/java/github/tornaco/android/thanox/magisk/bridge/ProcessHookInstaller.java b/...ridge/src/main/java/github/tornaco/android/thanox/magisk/bridge/ProcessHookInstaller.java
@@ -7,7 +7,6 @@
 
 import com.elvishew.xlog.XLog;
 
-import github.tornaco.android.thanox.magisk.bridge.proxy.ActivityThreadProxy;
 import github.tornaco.android.thanox.magisk.bridge.proxy.SystemServiceRegistryHookInstaller;
 
 public class ProcessHookInstaller implements ProcessHandler {
@@ -40,7 +39,6 @@ public void onStartApplication() {
         }
 
         AppProcessSystemServiceHookInstaller.install();
-        ActivityThreadProxy.install();
     }
 
     @Override

diff --git a/.../java/github/tornaco/android/thanox/magisk/bridge/proxy/ActivityManagerProxyProvider.java b/.../java/github/tornaco/android/thanox/magisk/bridge/proxy/ActivityManagerProxyProvider.java
@@ -10,6 +10,8 @@
 import java.lang.reflect.Proxy;
 import java.util.Arrays;
 
+import util.ExceptionTransformedInvocationHandler;
+
 public class ActivityManagerProxyProvider implements ProxyProvider, ExceptionTransformedInvocationHandler {
     private static final boolean DEBUG_AMS = false;
 

diff --git a/...a/github/tornaco/android/thanox/magisk/bridge/proxy/ActivityTaskManagerProxyProvider.java b/...a/github/tornaco/android/thanox/magisk/bridge/proxy/ActivityTaskManagerProxyProvider.java
@@ -22,6 +22,7 @@
 
 import github.tornaco.android.thanos.core.app.ThanosManagerNative;
 import github.tornaco.android.thanos.core.util.PkgUtils;
+import util.ExceptionTransformedInvocationHandler;
 import util.ObjectsUtils;
 
 public class ActivityTaskManagerProxyProvider implements ProxyProvider, ExceptionTransformedInvocationHandler {

diff --git a/.../src/main/java/github/tornaco/android/thanox/magisk/bridge/proxy/ActivityThreadProxy.java b/.../src/main/java/github/tornaco/android/thanox/magisk/bridge/proxy/ActivityThreadProxy.java
diff --git a/...in/java/github/tornaco/android/thanox/magisk/bridge/proxy/AppOpsManagerProxyProvider.java b/...in/java/github/tornaco/android/thanox/magisk/bridge/proxy/AppOpsManagerProxyProvider.java
@@ -13,6 +13,7 @@
 import github.tornaco.android.thanos.core.IThanos;
 import github.tornaco.android.thanos.core.app.ThanosManagerNative;
 import github.tornaco.android.thanos.core.util.PkgUtils;
+import util.ExceptionTransformedInvocationHandler;
 
 public class AppOpsManagerProxyProvider implements ProxyProvider, ExceptionTransformedInvocationHandler {
     private static final boolean DEBUG_OPS = false;

diff --git a/...a/github/tornaco/android/thanox/magisk/bridge/proxy/NotificationManagerProxyProvider.java b/...a/github/tornaco/android/thanox/magisk/bridge/proxy/NotificationManagerProxyProvider.java
@@ -12,6 +12,7 @@
 
 import github.tornaco.android.thanos.core.app.ThanosManagerNative;
 import github.tornaco.android.thanos.core.n.NotificationRecord;
+import util.ExceptionTransformedInvocationHandler;
 
 public class NotificationManagerProxyProvider implements ProxyProvider, ExceptionTransformedInvocationHandler {
     @Override

diff --git a/...src/main/java/github/tornaco/thanox/android/server/patch/framework/hooks/am/AMSHooks.java b/...src/main/java/github/tornaco/thanox/android/server/patch/framework/hooks/am/AMSHooks.java
@@ -3,6 +3,7 @@
 import static github.tornaco.thanox.android.server.patch.framework.hooks.am.ActiveServicesHooks.attachActiveServices;
 import static github.tornaco.thanox.android.server.patch.framework.hooks.am.AppExitInfoTrackerHooks.installAppExitInfoTracker;
 import static github.tornaco.thanox.android.server.patch.framework.hooks.am.IFWHooks.installIFW;
+import static github.tornaco.thanox.android.server.patch.framework.hooks.app.usage.UsageStatsManagerInternalHooks.installUsageStatsService;
 
 import com.android.server.am.ActivityManagerService;
 import com.elvishew.xlog.XLog;
@@ -31,6 +32,7 @@ private static void installHooksForAMS() {
                         attachActiveServices(ams);
                         installIFW(ams);
                         installAppExitInfoTracker(ams);
+                        installUsageStatsService(ams);
                     });
 
         } catch (Throwable e) {