diff options
| author | Dianne Hackborn <hackbod@android.com> | 2013-05-26 00:02:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-26 00:02:24 -0700 |
| commit | 087384b0af6fd3912a3d3e32b9ade7e4604e6537 (patch) | |
| tree | 316cd2e017abcad1aea50530541edf8937d47f2c /services | |
| parent | d607b9c725d8a080842e5969b2d6001249ad88cd (diff) | |
| parent | f325103356c559d6378da7fb7db3b2a49aba5d13 (diff) | |
| download | frameworks_base-087384b0af6fd3912a3d3e32b9ade7e4604e6537.zip frameworks_base-087384b0af6fd3912a3d3e32b9ade7e4604e6537.tar.gz frameworks_base-087384b0af6fd3912a3d3e32b9ade7e4604e6537.tar.bz2 | |
am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"
* commit 'f325103356c559d6378da7fb7db3b2a49aba5d13':
Framework/base: Added synchronization block to avoid race condition
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 0f1700d..c344023 100644 --- 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; |