Merge "Fix crash in monodroid apps" into oc-dr1-dev (3d80a733) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+17 −6

Original line number	Diff line number	Diff line
		@@ -6480,9 +6480,9 @@ public final class ActivityThread {
		private <T> T instantiate(ClassLoader cl, String className, Context c,
		Instantiator<T> instantiator)
		throws ClassNotFoundException, IllegalAccessException, InstantiationException {
		if (c.getApplicationContext() instanceof Application) {
		T a = instantiator.instantiate((Application) c.getApplicationContext(),
		cl, className);
		Application app = getApp(c);
		if (app != null) {
		T a = instantiator.instantiate(app, cl, className);
		if (a != null) return a;
		}
		return (T) cl.loadClass(className).newInstance();
		@@ -6491,14 +6491,25 @@ public final class ActivityThread {
		private <T> T instantiate(ClassLoader cl, String className, Intent intent, Context c,
		IntentInstantiator<T> instantiator)
		throws ClassNotFoundException, IllegalAccessException, InstantiationException {
		if (c.getApplicationContext() instanceof Application) {
		T a = instantiator.instantiate((Application) c.getApplicationContext(),
		cl, className, intent);
		Application app = getApp(c);
		if (app != null) {
		T a = instantiator.instantiate(app, cl, className, intent);
		if (a != null) return a;
		}
		return (T) cl.loadClass(className).newInstance();
		}

		private Application getApp(Context c) {
		// We need this shortcut to avoid actually calling getApplicationContext() on an Application
		// because the Application may not return itself for getApplicationContext() because the
		// API doesn't enforce it.
		if (c instanceof Application) return (Application) c;
		if (c.getApplicationContext() instanceof Application) {
		return (Application) c.getApplicationContext();
		}
		return null;
		}

		private interface Instantiator<T> {
		T instantiate(Application app, ClassLoader cl, String className)
		throws ClassNotFoundException, IllegalAccessException, InstantiationException;