am ac28c60d: am 5e956370: am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev

* commit 'ac28c60df74a459dbc8ae1251037bc5461e88b79': I am such an idiot.
2014-09-23 16:21:51 +00:00
parent 962d45035b 3e094bd9cf
commit 5754687448
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18965,6 +18965,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                }
                if (tr.getRootActivity() != null) {
                    moveTaskToFrontLocked(tr.taskId, 0, null);
+                    return;
                }
            }