Skip to content

Commit 5c9a95f

Browse files
committed
Android 12: Fix junit
Signed-off-by: tiann <[email protected]>
1 parent a2a5244 commit 5c9a95f

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import android.os.StrictMode;
2727
import android.system.ErrnoException;
2828
import android.system.Os;
29-
import android.util.Log;
3029

3130
import com.lody.virtual.client.core.CrashHandler;
3231
import com.lody.virtual.client.core.InvocationStubManager;
@@ -45,6 +44,7 @@
4544
import com.lody.virtual.client.stub.VASettings;
4645
import com.lody.virtual.helper.compat.BuildCompat;
4746
import com.lody.virtual.helper.compat.StorageManagerCompat;
47+
import com.lody.virtual.helper.utils.Reflect;
4848
import com.lody.virtual.helper.utils.VLog;
4949
import com.lody.virtual.os.VEnvironment;
5050
import com.lody.virtual.os.VUserHandle;
@@ -62,6 +62,7 @@
6262
import java.util.Map;
6363
import java.util.Set;
6464

65+
import dalvik.system.DelegateLastClassLoader;
6566
import me.weishu.exposed.ExposedBridge;
6667
import mirror.android.app.ActivityThread;
6768
import mirror.android.app.ActivityThreadNMR1;
@@ -71,13 +72,13 @@
7172
import mirror.android.content.ContentProviderHolderOreo;
7273
import mirror.android.providers.Settings;
7374
import mirror.android.renderscript.RenderScriptCacheDir;
75+
import mirror.android.security.net.config.ApplicationConfig;
7476
import mirror.android.view.HardwareRenderer;
7577
import mirror.android.view.RenderScript;
7678
import mirror.android.view.ThreadedRenderer;
7779
import mirror.com.android.internal.content.ReferrerIntent;
7880
import mirror.dalvik.system.VMRuntime;
7981
import mirror.java.lang.ThreadGroupN;
80-
import mirror.android.security.net.config.ApplicationConfig;
8182

8283
import static com.lody.virtual.os.VUserHandle.getUserId;
8384

@@ -346,8 +347,11 @@ private void bindApplicationNoCheck(String packageName, String processName, Cond
346347
VLog.w(TAG, "Xposed is disable..");
347348
}
348349

349-
ClassLoader call = LoadedApk.getClassLoader.call(data.info);
350-
Log.i("mylog", "classloader: " + call + " parent: " + call.getParent());
350+
ClassLoader cl = LoadedApk.getClassLoader.call(data.info);
351+
if (BuildCompat.isS()) {
352+
ClassLoader parent = cl.getParent();
353+
Reflect.on(cl).set("parent", new DelegateLastClassLoader("/system/framework/android.test.base.jar", parent));
354+
}
351355

352356
if (Build.VERSION.SDK_INT >= 30)
353357
ApplicationConfig.setDefaultInstance.call(new Object[] { null });

0 commit comments

Comments
 (0)