Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4cabbef8: Merge "Make sure to stop noHistory="true" activities properly" into jb-dev

Browse Source 
* commit '4cabbef8266c909997cf608d008920f5a2f49937':
  Make sure to stop noHistory="true" activities properly
This commit is contained in:
Christopher Tate
2012-06-12 13:41:31 -07:00
committed by Android Git Automerger
parent 980d7b45ff 4cabbef826
commit 4d3448db54
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -3282,7 +3282,9 @@ final class ActivityStack {
requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null, requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,
"no-history"); "no-history");
} }
} else if (r.app != null && r.app.thread != null) { }
if (r.app != null && r.app.thread != null) {
if (mMainStack) { if (mMainStack) {
if (mService.mFocusedActivity == r) { if (mService.mFocusedActivity == r) {
mService.setFocusedActivityLocked(topRunningActivityLocked(null)); mService.setFocusedActivityLocked(topRunningActivityLocked(null));