Android 11: Fix crash when calling external activity

imsourcandy · web-flow · commit c0dc3d60e403 · 2021-11-26T06:25:15.000-08:00
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
@@ -463,6 +463,11 @@ public Object call(Object who, Method method, Object... args) throws Throwable {
                 if (intent.getPackage() != null && isAppPkg(intent.getPackage())) {
                     return ActivityManagerCompat.START_INTENT_NOT_RESOLVED;
                 }
+                
+                if (Build.VERSION.SDK_INT >= 30) {
+                    args[1] = VirtualCore.get().getContext().getPackageName();
+                }
+                
                 return method.invoke(who, args);
             }
             int res = VActivityManager.get().startActivity(intent, activityInfo, resultTo, options, resultWho, requestCode, VUserHandle.myUserId());

Original file line number	Diff line number	Diff line change
`@@ -463,6 +463,11 @@ public Object call(Object who, Method method, Object... args) throws Throwable {`
`463`	`463`	`if (intent.getPackage() != null && isAppPkg(intent.getPackage())) {`
`464`	`464`	`return ActivityManagerCompat.START_INTENT_NOT_RESOLVED;`
`465`	`465`	`}`
	`466`	`+`
	`467`	`+ if (Build.VERSION.SDK_INT >= 30) {`
	`468`	`+ args[1] = VirtualCore.get().getContext().getPackageName();`
	`469`	`+ }`
	`470`	`+`
`466`	`471`	`return method.invoke(who, args);`
`467`	`472`	`}`
`468`	`473`	`int res = VActivityManager.get().startActivity(intent, activityInfo, resultTo, options, resultWho, requestCode, VUserHandle.myUserId());`