Merge pull request #1067 from so-lli/vxp

Android 11: fixed opening of many applications

Author: tiann

VirtualApp/lib/src/main/java/com/lody/virtual/client/VClientImpl.java

@@ -76,6 +76,7 @@
 import mirror.com.android.internal.content.ReferrerIntent;
 import mirror.dalvik.system.VMRuntime;
 import mirror.java.lang.ThreadGroupN;
+import mirror.android.security.net.config.ApplicationConfig;
 
 import static com.lody.virtual.os.VUserHandle.getUserId;
 
@@ -343,7 +344,8 @@ private void bindApplicationNoCheck(String packageName, String processName, Cond
         } else {
             VLog.w(TAG, "Xposed is disable..");
         }
-
+        if (Build.VERSION.SDK_INT >= 30)
+            ApplicationConfig.setDefaultInstance.call(new Object[] { null });
         mInitialApplication = LoadedApk.makeApplication.call(data.info, false, null);
 
         // ExposedBridge.patchAppClassLoader(context);

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());
@@ -1386,6 +1391,11 @@ public Object call(Object who, Method method, Object... args) throws Throwable {
                     return null;
                 }
                 args[nameIdx] = VASettings.getStubAuthority(targetVPid);
+                
+                if (Build.VERSION.SDK_INT >= 30) {
+                    args[1] = VirtualCore.get().getContext().getPackageName();
+                }
+                
                 Object holder = method.invoke(who, args);
                 if (holder == null) {
                     return null;

VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/location/MethodProxies.java

@@ -4,6 +4,7 @@
 import android.location.LocationRequest;
 import android.os.Build;
 
+import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.client.hook.base.MethodProxy;
 import com.lody.virtual.client.hook.base.ReplaceLastPkgMethodProxy;
 import com.lody.virtual.client.ipc.VirtualLocationManager;
@@ -84,6 +85,11 @@ public Object call(final Object who, Method method, Object... args) throws Throw
                 }
                 return 0;
             }
+            
+            if (Build.VERSION.SDK_INT >= 30) {
+                args[3] = VirtualCore.get().getContext().getPackageName();
+            }
+            
             return super.call(who, method, args);
         }
     }

VirtualApp/lib/src/main/java/com/lody/virtual/client/hook/proxies/notification/MethodProxies.java

@@ -105,13 +105,23 @@ public Object call(Object who, Method method, Object... args) throws Throwable {
             if (getHostPkg().equals(pkg)) {
                 return method.invoke(who, args);
             }
-            String tag = (String) args[1];
-            int id = (int) args[2];
+            
+            int index_tag = 1;
+            int index_id = 2;
+
+            if (Build.VERSION.SDK_INT >= 30) {
+                index_tag = 2;
+                index_id = 3;
+            }
+            
+            String tag = (String) args[index_tag];
+            int id = (int) args[index_id];
+
             id = VNotificationManager.get().dealNotificationId(id, pkg, tag, getAppUserId());
             tag = VNotificationManager.get().dealNotificationTag(id, pkg, tag, getAppUserId());
 
-            args[1] = tag;
-            args[2] = id;
+            args[index_tag] = tag;
+            args[index_id] = id;
             return method.invoke(who, args);
         }
     }

VirtualApp/lib/src/main/java/mirror/mirror/android/security/net/config/ApplicationConfig.java

@@ -0,0 +1,10 @@
+package mirror.android.security.net.config;
+
+import mirror.RefClass;
+import mirror.RefStaticMethod;
+
+public class ApplicationConfig {
+    public static Class<?> TYPE = RefClass.load(ApplicationConfig.class, "android.security.net.config.ApplicationConfig");
+
+    public static RefStaticMethod setDefaultInstance;
+}