Delete classloaderutil

limpoxe · limpoxe · commit f06e7253cac1 · 2016-01-15T22:57:02.000+08:00
diff --git a/PluginCore/src/com/plugin/core/PluginAppTrace.java b/PluginCore/src/com/plugin/core/PluginAppTrace.java
@@ -6,7 +6,6 @@
 import android.os.IBinder;
 import android.os.Message;
 
-import com.plugin.util.ClassLoaderUtil;
 import com.plugin.util.LogUtil;
 import com.plugin.util.RefInvoker;
 
@@ -85,7 +84,7 @@ private static Result beforeCreateService(Message msg) {
 		String serviceName = PluginIntentResolver.hackServiceName(msg.obj);
 
 		if (serviceName != null) {
-			ClassLoaderUtil.hackHostClassLoaderIfNeeded();
+			PluginInjector.hackHostClassLoaderIfNeeded();
 		}
 		Result result = new Result();
 		result.serviceName = serviceName;
diff --git a/PluginCore/src/com/plugin/core/PluginInjector.java b/PluginCore/src/com/plugin/core/PluginInjector.java
@@ -23,7 +23,6 @@
 import com.plugin.content.PluginProviderInfo;
 import com.plugin.core.annotation.AnnotationProcessor;
 import com.plugin.core.annotation.FragmentContainer;
-import com.plugin.util.ClassLoaderUtil;
 import com.plugin.util.LogUtil;
 import com.plugin.util.RefInvoker;
 import com.plugin.util.ResourceUtil;
@@ -102,7 +101,7 @@ static void installContentProviders(Context context, Collection<PluginProviderIn
 		LogUtil.d("安装插件ContentProvider", pluginProviderInfos.size());
 		Object activityThread = PluginInjector.getActivityThread();
 		if (activityThread != null) {
-			ClassLoaderUtil.hackHostClassLoaderIfNeeded();
+			PluginInjector.hackHostClassLoaderIfNeeded();
 			List<ProviderInfo> providers = new ArrayList<ProviderInfo>();
 			for (PluginProviderInfo pluginProviderInfo : pluginProviderInfos) {
 				ProviderInfo p = new ProviderInfo();
@@ -366,4 +365,20 @@ static void replaceContext(Object manager, Context context) {
 			RefInvoker.setFieldObject(manager, manager.getClass().getName(), "mContext", context);
 		}
 	}
+
+	/**
+	 * 如果插件中不包含service、receiver和contentprovider，是不需要替换classloader的
+	 */
+	public static void hackHostClassLoaderIfNeeded() {
+		Object mLoadedApk = RefInvoker.getFieldObject(PluginLoader.getApplicatoin(), Application.class.getName(),
+				"mLoadedApk");
+		ClassLoader originalLoader = (ClassLoader) RefInvoker.getFieldObject(mLoadedApk, "android.app.LoadedApk",
+				"mClassLoader");
+		if (!(originalLoader instanceof HostClassLoader)) {
+			HostClassLoader newLoader = new HostClassLoader("", PluginLoader.getApplicatoin()
+					.getCacheDir().getAbsolutePath(),
+					PluginLoader.getApplicatoin().getCacheDir().getAbsolutePath(), originalLoader);
+			RefInvoker.setFieldObject(mLoadedApk, "android.app.LoadedApk", "mClassLoader", newLoader);
+		}
+	}
 }
diff --git a/PluginCore/src/com/plugin/core/PluginIntentResolver.java b/PluginCore/src/com/plugin/core/PluginIntentResolver.java
@@ -9,7 +9,6 @@
 import com.plugin.content.PluginActivityInfo;
 import com.plugin.content.PluginDescriptor;
 import com.plugin.content.PluginReceiverIntent;
-import com.plugin.util.ClassLoaderUtil;
 import com.plugin.util.LogUtil;
 import com.plugin.util.RefInvoker;
 
@@ -23,7 +22,7 @@ public class PluginIntentResolver {
 	public static void resolveService(Intent service) {
 		ArrayList<String> classNameList = PluginLoader.matchPlugin(service, PluginDescriptor.SERVICE);
 		if (classNameList != null && classNameList.size() > 0) {
-			ClassLoaderUtil.hackHostClassLoaderIfNeeded();
+			PluginInjector.hackHostClassLoaderIfNeeded();
 			String stubServiceName = PluginStubBinding.bindStubService(classNameList.get(0));
 			if (stubServiceName != null) {
 				service.setComponent(new ComponentName(PluginLoader.getApplicatoin().getPackageName(), stubServiceName));
@@ -37,7 +36,7 @@ public static ArrayList<Intent> resolveReceiver(final Intent intent) {
 		ArrayList<Intent> result = new ArrayList<Intent>();
 		ArrayList<String> classNameList = PluginLoader.matchPlugin(intent, PluginDescriptor.BROADCAST);
 		if (classNameList != null && classNameList.size() > 0) {
-			ClassLoaderUtil.hackHostClassLoaderIfNeeded();
+			PluginInjector.hackHostClassLoaderIfNeeded();
 
 			for(String className: classNameList) {
 				Intent newIntent = new Intent(intent);
diff --git a/PluginCore/src/com/plugin/util/ClassLoaderUtil.java b/PluginCore/src/com/plugin/util/ClassLoaderUtil.java
