Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a288c0f authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Revert "The ActivityThread will restart a stopped activity before... 

Merge "Revert "The ActivityThread will restart a stopped activity before sending onActivityResult"" into gingerbread
parents 622972e2 a5cbf219

core/java/android/app/ActivityThread.java

+0 −4
Original line number Diff line number Diff line
@@ -2692,10 +2692,6 @@ public final class ActivityThread { 
                    }

                }

            }

            if (r.stopped) {

                r.activity.performRestart();

                r.stopped = false;

            }

            deliverResults(r, res.results);

            if (resumed) {

                mInstrumentation.callActivityOnResume(r.activity);