Merge "Support activities in the same process having different resources." (783f2869) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4613,7 +4613,7 @@ public class Activity extends ContextThemeWrapper
		if (Looper.myLooper() != mMainThread.getLooper()) {
		throw new IllegalStateException("Must be called from main thread");
		}
		mMainThread.requestRelaunchActivity(mToken, null, null, 0, false, null, false);
		mMainThread.requestRelaunchActivity(mToken, null, null, 0, false, null, null, false);
		}

		/**

core/java/android/app/ActivityThread.java

+22 −11

Original line number	Diff line number	Diff line
		@@ -293,6 +293,7 @@ public final class ActivityThread {
		boolean hideForNow;
		Configuration newConfig;
		Configuration createdConfig;
		Configuration overrideConfig;
		ActivityClientRecord nextIdle;

		ProfilerInfo profilerInfo;
		@@ -615,12 +616,13 @@ public final class ActivityThread {

		// we use token to identify this activity without having to send the
		// activity itself back to the activity manager. (matters more with ipc)
		@Override
		public final void scheduleLaunchActivity(Intent intent, IBinder token, int ident,
		ActivityInfo info, Configuration curConfig, CompatibilityInfo compatInfo,
		String referrer, IVoiceInteractor voiceInteractor, int procState, Bundle state,
		PersistableBundle persistentState, List<ResultInfo> pendingResults,
		List<ReferrerIntent> pendingNewIntents, boolean notResumed, boolean isForward,
		ProfilerInfo profilerInfo) {
		ActivityInfo info, Configuration curConfig, Configuration overrideConfig,
		CompatibilityInfo compatInfo, String referrer, IVoiceInteractor voiceInteractor,
		int procState, Bundle state, PersistableBundle persistentState,
		List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,
		boolean notResumed, boolean isForward, ProfilerInfo profilerInfo) {

		updateProcessState(procState, false);

		@@ -644,16 +646,19 @@ public final class ActivityThread {

		r.profilerInfo = profilerInfo;

		r.overrideConfig = overrideConfig;
		updatePendingConfiguration(curConfig);

		sendMessage(H.LAUNCH_ACTIVITY, r);
		}

		@Override
		public final void scheduleRelaunchActivity(IBinder token,
		List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,
		int configChanges, boolean notResumed, Configuration config) {
		int configChanges, boolean notResumed, Configuration config,
		Configuration overrideConfig) {
		requestRelaunchActivity(token, pendingResults, pendingNewIntents,
		configChanges, notResumed, config, true);
		configChanges, notResumed, config, overrideConfig, true);
		}

		public final void scheduleNewIntent(List<ReferrerIntent> intents, IBinder token) {
		@@ -887,6 +892,7 @@ public final class ActivityThread {
		sendMessage(H.LOW_MEMORY, null);
		}

		@Override
		public void scheduleActivityConfigurationChanged(IBinder token) {
		sendMessage(H.ACTIVITY_CONFIGURATION_CHANGED, token);
		}
		@@ -1668,7 +1674,7 @@ public final class ActivityThread {
		String[] libDirs, int displayId, Configuration overrideConfiguration,
		LoadedApk pkgInfo) {
		return mResourcesManager.getTopLevelResources(resDir, splitResDirs, overlayDirs, libDirs,
		displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo(), null);
		displayId, overrideConfiguration, pkgInfo.getCompatibilityInfo());
		}

		final Handler getHandler() {
		@@ -2353,7 +2359,8 @@ public final class ActivityThread {

		private Context createBaseContextForActivity(ActivityClientRecord r,
		final Activity activity) {
		ContextImpl appContext = ContextImpl.createActivityContext(this, r.packageInfo, r.token);
		ContextImpl appContext =
		ContextImpl.createActivityContext(this, r.packageInfo, r.overrideConfig);
		appContext.setOuterContext(activity);
		Context baseContext = appContext;

		@@ -3561,7 +3568,7 @@ public final class ActivityThread {

		// request all activities to relaunch for the changes to take place
		for (Map.Entry<IBinder, ActivityClientRecord> entry : mActivities.entrySet()) {
		requestRelaunchActivity(entry.getKey(), null, null, 0, false, null, false);
		requestRelaunchActivity(entry.getKey(), null, null, 0, false, null, null, false);
		}
		}
		}
		@@ -3805,7 +3812,7 @@ public final class ActivityThread {
		public final void requestRelaunchActivity(IBinder token,
		List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,
		int configChanges, boolean notResumed, Configuration config,
		boolean fromServer) {
		Configuration overrideConfig, boolean fromServer) {
		ActivityClientRecord target = null;

		synchronized (mResourcesManager) {
		@@ -3854,6 +3861,9 @@ public final class ActivityThread {
		if (config != null) {
		target.createdConfig = config;
		}
		if (overrideConfig != null) {
		target.overrideConfig = overrideConfig;
		}
		target.pendingConfigChanges \|= configChanges;
		}
		}
		@@ -3966,6 +3976,7 @@ public final class ActivityThread {
		}
		}
		r.startsNotResumed = tmp.startsNotResumed;
		r.overrideConfig = tmp.overrideConfig;

		handleLaunchActivity(r, currentIntent);
		}

core/java/android/app/ApplicationThreadNative.java

+28 −17

Original line number	Diff line number	Diff line
		@@ -140,6 +140,10 @@ public abstract class ApplicationThreadNative extends Binder
		int ident = data.readInt();
		ActivityInfo info = ActivityInfo.CREATOR.createFromParcel(data);
		Configuration curConfig = Configuration.CREATOR.createFromParcel(data);
		Configuration overrideConfig = null;
		if (data.readInt() != 0) {
		overrideConfig = Configuration.CREATOR.createFromParcel(data);
		}
		CompatibilityInfo compatInfo = CompatibilityInfo.CREATOR.createFromParcel(data);
		String referrer = data.readString();
		IVoiceInteractor voiceInteractor = IVoiceInteractor.Stub.asInterface(
		@@ -153,8 +157,8 @@ public abstract class ApplicationThreadNative extends Binder
		boolean isForward = data.readInt() != 0;
		ProfilerInfo profilerInfo = data.readInt() != 0
		? ProfilerInfo.CREATOR.createFromParcel(data) : null;
		scheduleLaunchActivity(intent, b, ident, info, curConfig, compatInfo, referrer,
		voiceInteractor, procState, state, persistentState, ri, pi,
		scheduleLaunchActivity(intent, b, ident, info, curConfig, overrideConfig, compatInfo,
		referrer, voiceInteractor, procState, state, persistentState, ri, pi,
		notResumed, isForward, profilerInfo);
		return true;
		}
		@@ -167,11 +171,12 @@ public abstract class ApplicationThreadNative extends Binder
		List<ReferrerIntent> pi = data.createTypedArrayList(ReferrerIntent.CREATOR);
		int configChanges = data.readInt();
		boolean notResumed = data.readInt() != 0;
		Configuration config = null;
		Configuration config = Configuration.CREATOR.createFromParcel(data);
		Configuration overrideConfig = null;
		if (data.readInt() != 0) {
		config = Configuration.CREATOR.createFromParcel(data);
		overrideConfig = Configuration.CREATOR.createFromParcel(data);
		}
		scheduleRelaunchActivity(b, ri, pi, configChanges, notResumed, config);
		scheduleRelaunchActivity(b, ri, pi, configChanges, notResumed, config, overrideConfig);
		return true;
		}

		@@ -775,11 +780,11 @@ class ApplicationThreadProxy implements IApplicationThread {
		}

		public final void scheduleLaunchActivity(Intent intent, IBinder token, int ident,
		ActivityInfo info, Configuration curConfig, CompatibilityInfo compatInfo,
		String referrer, IVoiceInteractor voiceInteractor, int procState, Bundle state,
		PersistableBundle persistentState, List<ResultInfo> pendingResults,
		List<ReferrerIntent> pendingNewIntents, boolean notResumed, boolean isForward,
		ProfilerInfo profilerInfo) throws RemoteException {
		ActivityInfo info, Configuration curConfig, Configuration overrideConfig,
		CompatibilityInfo compatInfo, String referrer, IVoiceInteractor voiceInteractor,
		int procState, Bundle state, PersistableBundle persistentState,
		List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,
		boolean notResumed, boolean isForward, ProfilerInfo profilerInfo) throws RemoteException {
		Parcel data = Parcel.obtain();
		data.writeInterfaceToken(IApplicationThread.descriptor);
		intent.writeToParcel(data, 0);
		@@ -787,6 +792,12 @@ class ApplicationThreadProxy implements IApplicationThread {
		data.writeInt(ident);
		info.writeToParcel(data, 0);
		curConfig.writeToParcel(data, 0);
		if (overrideConfig != null) {
		data.writeInt(1);
		overrideConfig.writeToParcel(data, 0);
		} else {
		data.writeInt(0);
		}
		compatInfo.writeToParcel(data, 0);
		data.writeString(referrer);
		data.writeStrongBinder(voiceInteractor != null ? voiceInteractor.asBinder() : null);
		@@ -810,8 +821,8 @@ class ApplicationThreadProxy implements IApplicationThread {

		public final void scheduleRelaunchActivity(IBinder token,
		List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,
		int configChanges, boolean notResumed, Configuration config)
		throws RemoteException {
		int configChanges, boolean notResumed, Configuration config,
		Configuration overrideConfig) throws RemoteException {
		Parcel data = Parcel.obtain();
		data.writeInterfaceToken(IApplicationThread.descriptor);
		data.writeStrongBinder(token);
		@@ -819,9 +830,10 @@ class ApplicationThreadProxy implements IApplicationThread {
		data.writeTypedList(pendingNewIntents);
		data.writeInt(configChanges);
		data.writeInt(notResumed ? 1 : 0);
		if (config != null) {
		data.writeInt(1);
		config.writeToParcel(data, 0);
		if (overrideConfig != null) {
		data.writeInt(1);
		overrideConfig.writeToParcel(data, 0);
		} else {
		data.writeInt(0);
		}
		@@ -1112,8 +1124,7 @@ class ApplicationThreadProxy implements IApplicationThread {
		data.recycle();
		}

		public final void scheduleActivityConfigurationChanged(
		IBinder token) throws RemoteException {
		public final void scheduleActivityConfigurationChanged(IBinder token) throws RemoteException {
		Parcel data = Parcel.obtain();
		data.writeInterfaceToken(IApplicationThread.descriptor);
		data.writeStrongBinder(token);

core/java/android/app/ContextImpl.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -2264,11 +2264,10 @@ class ContextImpl extends Context {
		}

		static ContextImpl createActivityContext(ActivityThread mainThread,
		LoadedApk packageInfo, IBinder activityToken) {
		LoadedApk packageInfo, Configuration overrideConfiguration) {
		if (packageInfo == null) throw new IllegalArgumentException("packageInfo");
		if (activityToken == null) throw new IllegalArgumentException("activityInfo");
		return new ContextImpl(null, mainThread,
		packageInfo, activityToken, null, false, null, null);
		return new ContextImpl(null, mainThread, packageInfo, null, null, false, null,
		overrideConfiguration);
		}

		private ContextImpl(ContextImpl container, ActivityThread mainThread,
		@@ -2303,15 +2302,14 @@ class ContextImpl extends Context {

		Resources resources = packageInfo.getResources(mainThread);
		if (resources != null) {
		if (activityToken != null
		\|\| displayId != Display.DEFAULT_DISPLAY
		if (displayId != Display.DEFAULT_DISPLAY
		\|\| overrideConfiguration != null
		\|\| (compatInfo != null && compatInfo.applicationScale
		!= resources.getCompatibilityInfo().applicationScale)) {
		resources = mResourcesManager.getTopLevelResources(packageInfo.getResDir(),
		packageInfo.getSplitResDirs(), packageInfo.getOverlayDirs(),
		packageInfo.getApplicationInfo().sharedLibraryFiles, displayId,
		overrideConfiguration, compatInfo, activityToken);
		overrideConfiguration, compatInfo);
		}
		}
		mResources = resources;

core/java/android/app/IApplicationThread.java

+7 −8

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ import android.os.PersistableBundle;
		import android.os.RemoteException;
		import android.os.IBinder;
		import android.os.IInterface;
		import android.service.voice.IVoiceInteractionSession;
		import com.android.internal.app.IVoiceInteractor;
		import com.android.internal.content.ReferrerIntent;

		@@ -59,14 +58,14 @@ public interface IApplicationThread extends IInterface {
		throws RemoteException;
		void scheduleSendResult(IBinder token, List<ResultInfo> results) throws RemoteException;
		void scheduleLaunchActivity(Intent intent, IBinder token, int ident,
		ActivityInfo info, Configuration curConfig, CompatibilityInfo compatInfo,
		String referrer, IVoiceInteractor voiceInteractor, int procState, Bundle state,
		PersistableBundle persistentState, List<ResultInfo> pendingResults,
		List<ReferrerIntent> pendingNewIntents, boolean notResumed, boolean isForward,
		ProfilerInfo profilerInfo) throws RemoteException;
		ActivityInfo info, Configuration curConfig, Configuration overrideConfig,
		CompatibilityInfo compatInfo, String referrer, IVoiceInteractor voiceInteractor,
		int procState, Bundle state, PersistableBundle persistentState,
		List<ResultInfo> pendingResults, List<ReferrerIntent> pendingNewIntents,
		boolean notResumed, boolean isForward, ProfilerInfo profilerInfo) throws RemoteException;
		void scheduleRelaunchActivity(IBinder token, List<ResultInfo> pendingResults,
		List<ReferrerIntent> pendingNewIntents, int configChanges,
		boolean notResumed, Configuration config) throws RemoteException;
		List<ReferrerIntent> pendingNewIntents, int configChanges, boolean notResumed,
		Configuration config, Configuration overrideConfig) throws RemoteException;
		void scheduleNewIntent(List<ReferrerIntent> intent, IBinder token) throws RemoteException;
		void scheduleDestroyActivity(IBinder token, boolean finished,
		int configChanges) throws RemoteException;