Merge "Make sure to stop noHistory="true" activities properly" into jb-dev

2012-06-12 13:38:56 -07:00
parent 36eeb6a5be 5007ddded6
commit 4cabbef826
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -3282,7 +3282,9 @@ final class ActivityStack {
                requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,
                        "no-history");
            }
-        } else if (r.app != null && r.app.thread != null) {
+        }
+
+        if (r.app != null && r.app.thread != null) {
            if (mMainStack) {
                if (mService.mFocusedActivity == r) {
                    mService.setFocusedActivityLocked(topRunningActivityLocked(null));