Merge branch 'master' of github.com:Tornaco/Thanox

Tornaco · Sep 25, 2023 · a2c138e · a2c138e
2 parents 32f7233 + 47dd34a
commit a2c138e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/android/android_framework/hidden-api/build.gradle.kts b/android/android_framework/hidden-api/build.gradle.kts
@@ -8,5 +8,5 @@ java {
 }
 
 dependencies {
-    api(files("${rootProject.rootDir.path}/android_sdk/30/android-30.jar"))
+    api(files("${rootProject.rootDir.path}/android_sdk/33/android-33.jar"))
 }
diff --git a/...rk/src/main/java/github/tornaco/thanox/android/server/patch/framework/ThanoxHookImpl.java b/...rk/src/main/java/github/tornaco/thanox/android/server/patch/framework/ThanoxHookImpl.java
@@ -96,19 +96,24 @@ public void runSafety() {
     private void waitForSystemReady(Runnable runnable) {
         XLog.w("waitForSystemReady, current thread: %s", Thread.currentThread());
         new Thread(() -> {
-            ServiceManager.waitForService("package");
-            ServiceManager.waitForService("activity");
-            ServiceManager.waitForService(Context.USER_SERVICE);
-            ServiceManager.waitForService(Context.APP_OPS_SERVICE);
-            while (!ActivityThread.isSystem() || !isSystemReady()) {
-                try {
-                    XLog.d("waitForSystemReady, wait a moment.");
-                    Thread.sleep(100);
-                } catch (InterruptedException e) {
-                    // Noop.
+            try {
+                ServiceManager.waitForService("package");
+                ServiceManager.waitForService("activity");
+                ServiceManager.waitForService(Context.USER_SERVICE);
+                ServiceManager.waitForService(Context.APP_OPS_SERVICE);
+                while (!ActivityThread.isSystem() || !isSystemReady()) {
+                    try {
+                        XLog.d("waitForSystemReady, wait a moment.");
+                        Thread.sleep(100);
+                    } catch (InterruptedException e) {
+                        // Noop.
+                    }
                 }
+                XLog.i("Call runnable");
+                runnable.run();
+            } catch (Throwable e) {
+                XLog.e(e, "waitForSystemReady");
             }
-            runnable.run();
         }).start();
     }
 

diff --git a/...rc/main/java/github/tornaco/thanox/android/server/patch/framework/hooks/ContextProxy.java b/...rc/main/java/github/tornaco/thanox/android/server/patch/framework/hooks/ContextProxy.java
@@ -21,6 +21,11 @@ public ContextProxy(Context base, String tag) {
         this.tag = tag;
     }
 
+    @Override
+    public int getAssociatedDisplayId() {
+        return getBaseContext().getAssociatedDisplayId();
+    }
+
     @Override
     public void enforceCallingPermission(String permission, String message) {
         XLog.i("SystemServiceContextHooks enforceCallingPermission@%s %s %s", tag, permission, message);
@@ -53,4 +58,6 @@ public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int fla
             return false;
         }
     }
+
+
 }
diff --git a/android/android_sdk/33/android-33.jar b/android/android_sdk/33/android-33.jar
diff --git a/android/internal/Thanox-Internal b/android/internal/Thanox-Internal