am 1c2f6ca1: am 2f58bab7: am 221b545c: Merge "Fix issue #18510117: Returning... (6acccd52) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2436,7 +2436,7 @@ public final class ActivityThread {
		private void deliverNewIntents(ActivityClientRecord r, List<ReferrerIntent> intents) {
		final int N = intents.size();
		for (int i=0; i<N; i++) {
		Intent intent = intents.get(i);
		ReferrerIntent intent = intents.get(i);
		intent.setExtrasClassLoader(r.activity.getClassLoader());
		intent.prepareToEnterProcess();
		r.activity.mFragments.noteStateNotSaved();

+9 −6

Original line number	Diff line number	Diff line
		@@ -1208,14 +1208,17 @@ public class Instrumentation {
		* @param intent The new intent being received.
		*/
		public void callActivityOnNewIntent(Activity activity, Intent intent) {
		activity.onNewIntent(intent);
		}

		/**
		* @hide
		*/
		public void callActivityOnNewIntent(Activity activity, ReferrerIntent intent) {
		final String oldReferrer = activity.mReferrer;
		try {
		try {
		activity.mReferrer = ((ReferrerIntent)intent).mReferrer;
		} catch (ClassCastException e) {
		activity.mReferrer = null;
		}
		activity.onNewIntent(intent);
		activity.mReferrer = intent.mReferrer;
		callActivityOnNewIntent(activity, new Intent(intent));
		} finally {
		activity.mReferrer = oldReferrer;
		}