Merge "Fix NPE in ActivityThread.installProvider()." into main (da7bea9b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8288,12 +8288,12 @@ public final class ActivityThread extends ClientTransactionHandler
	}		}
	Context c = null;		Context c = null;
	ApplicationInfo ai = info.applicationInfo;		ApplicationInfo ai = info.applicationInfo;
	if (context.getPackageName().equals(ai.packageName)) {		if (context != null && context.getPackageName().equals(ai.packageName)) {
	c = context;		c = context;
	} else if (mInitialApplication != null &&		} else if (mInitialApplication != null &&
	mInitialApplication.getPackageName().equals(ai.packageName)) {		mInitialApplication.getPackageName().equals(ai.packageName)) {
	c = mInitialApplication;		c = mInitialApplication;
	} else {		} else if (context != null) {
	try {		try {
	c = context.createPackageContext(ai.packageName,		c = context.createPackageContext(ai.packageName,
	Context.CONTEXT_INCLUDE_CODE);		Context.CONTEXT_INCLUDE_CODE);