Merge pull request #809 from 2-young-2-simple/vxp

Fix some bugs on
android-hacker · Mar 4, 2020 · fb72cde · fb72cde
2 parents ec670d0 + 6294a23
commit fb72cde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/VirtualApp/app/src/main/java/io/virtualapp/sys/InstallerActivity.java b/VirtualApp/app/src/main/java/io/virtualapp/sys/InstallerActivity.java
@@ -179,6 +179,8 @@ private boolean dealUpdate(List<AppInfoLite> appList) {
         }
 
         List<String> magicApps = Arrays.asList(EncodeUtils.decode("Y29tLmxiZS5wYXJhbGxlbA=="), // com.lbe.parallel
+                EncodeUtils.decode("aW8udmlydHVhbGFwcC5zYW5kdnhwb3NlZA=="), // io.virtualapp.sandvxposed
+                EncodeUtils.decode("Y29tLnNrLnNwYXRjaA=="), // com.sk.spatch
                 EncodeUtils.decode("Y29tLnFpaG9vLm1hZ2lj"), // com.qihoo.magic
                 EncodeUtils.decode("Y29tLmRvdWJsZW9wZW4=")); // com.doubleopen
 

diff --git a/VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/am/MethodProxies.java b/VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/am/MethodProxies.java
@@ -375,13 +375,8 @@ public String getMethodName() {
 
         @Override
         public Object call(Object who, Method method, Object... args) throws Throwable {
-            String packageName = (String) args[1];
-            if (Constants.WECHAT_PACKAGE.equals(packageName)) {
-                // 解决微信界面跳转狂闪的问题
-                return null;
-            } else {
-                return super.call(who, method, args);
-            }
+            // Many application crash/darkscreen if not return null.
+            return null;
         }
     }
 

diff --git a/VirtualApp/lib/src/main/jni/Foundation/VMPatch.cpp b/VirtualApp/lib/src/main/jni/Foundation/VMPatch.cpp
@@ -427,7 +427,10 @@ void hookAndroidVM(JArrayClass<jobject> javaMethods,
         }
     }
     measureNativeOffset(isArt);
-    replaceGetCallingUid(isArt);
+    // Crash on Q if hook directly by modify entrypoint of function.
+    // Just skip this step on Q and get never crash
+    if(apiLevel<=28)
+        replaceGetCallingUid(isArt);
     replaceOpenDexFileMethod(javaMethods.getElement(OPEN_DEX).get(), isArt,
                              apiLevel);
     replaceCameraNativeSetupMethod(javaMethods.getElement(CAMERA_SETUP).get(),
@@ -492,4 +495,4 @@ void *getDvmOrArtSOHandle() {
         soInfo = RTLD_DEFAULT;
     }
     return soInfo;
-}
+}