Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev

Dianne Hackborn · Android (Google) Code Review · commit 11d8481f10a1 · 2012-10-02T09:22:12.000-07:00
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
@@ -2700,6 +2700,7 @@ public final ActivityClientRecord performResumeActivity(IBinder token,
                 r.activity.mStartedActivity = false;
             }
             try {
+                r.activity.mFragments.noteStateNotSaved();
                 if (r.pendingIntents != null) {
                     deliverNewIntents(r, r.pendingIntents);
                     r.pendingIntents = null;

Original file line number	Diff line number	Diff line change
`@@ -2700,6 +2700,7 @@ public final ActivityClientRecord performResumeActivity(IBinder token,`
`2700`	`2700`	`r.activity.mStartedActivity = false;`
`2701`	`2701`	`}`
`2702`	`2702`	`try {`
	`2703`	`+ r.activity.mFragments.noteStateNotSaved();`
`2703`	`2704`	`if (r.pendingIntents != null) {`
`2704`	`2705`	`deliverNewIntents(r, r.pendingIntents);`
`2705`	`2706`	`r.pendingIntents = null;`