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

Merge "Add test for topmost home stack activity being home." into klp-dev

Browse Source
This commit is contained in:
Craig Mautner
2013-10-11 19:50:02 +00:00
committed by Android (Google) Code Review
parent 1001cf21ed 760b2314d9
commit 09cb9bdcc8
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);
} }