am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"

* commit '087384b0af6fd3912a3d3e32b9ade7e4604e6537': Framework/base: Added synchronization block to avoid race condition
2013-05-26 00:04:57 -07:00
parent 03367e2971 087384b0af
commit d031f9c7b7
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
@@ -3655,7 +3655,9 @@ final class ActivityStack {
        }

        if (activityRemoved) {
-            resumeTopActivityLocked(null);
+            synchronized (mService) {
+                resumeTopActivityLocked(null);
+            }
        }

        return res;