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

* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13': Framework/base: Added synchronization block to avoid race condition
2013-05-26 00:02:24 -07:00
parent d607b9c725 f325103356
commit 087384b0af
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;