Merge "Finish attach appliation before creating app context" (a1160c96) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -6717,6 +6717,13 @@ public final class ActivityThread extends ClientTransactionHandler
		ii = null;
		}

		final IActivityManager mgr = ActivityManager.getService();
		try {
		mgr.finishAttachApplication(mStartSeq);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}

		final ContextImpl appContext = ContextImpl.createAppContext(this, data.info);
		mConfigurationController.updateLocaleListFromAppContext(appContext);

		@@ -6785,13 +6792,6 @@ public final class ActivityThread extends ClientTransactionHandler
		final StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskWrites();
		final StrictMode.ThreadPolicy writesAllowedPolicy = StrictMode.getThreadPolicy();

		final IActivityManager mgr = ActivityManager.getService();
		try {
		mgr.finishAttachApplication(mStartSeq);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}

		// Wait for debugger after we have notified the system to finish attach application
		if (data.debugMode != ApplicationThreadConstants.DEBUG_OFF) {
		// XXX should have option to change the port.