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

2013-05-26 06:30:26 +00:00
parent 1d8c5b5b1d dd2914e88e
commit f325103356
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
@@ -3623,7 +3623,9 @@ final class ActivityStack {
        }

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

        return res;