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

am b1ce68f5: am 09cb9bdc: Merge "Add test for topmost home stack activity being home." into klp-dev

Browse Source 
* commit 'b1ce68f5a4064d6c57cdc13e4708a0ee6bf5b970':
  Add test for topmost home stack activity being home.
This commit is contained in:
Craig Mautner
2013-10-11 12:55:36 -07:00
committed by Android Git Automerger
parent 0234285b43 b1ce68f5a4
commit 6b2a6a1140
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -285,7 +285,7 @@ public final class ActivityStackSupervisor {
} }
mHomeStack.moveHomeTaskToTop(); mHomeStack.moveHomeTaskToTop();
ActivityRecord r = mHomeStack.topRunningActivityLocked(null); ActivityRecord r = mHomeStack.topRunningActivityLocked(null);
if (r != null) { if (r != null && r.isHomeActivity()) {
mService.setFocusedActivityLocked(r); mService.setFocusedActivityLocked(r);
return resumeTopActivitiesLocked(mHomeStack, prev, null); return resumeTopActivitiesLocked(mHomeStack, prev, null);
} }