diff options
| author | Dianne Hackborn <hackbod@android.com> | 2013-05-26 06:30:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-26 06:30:26 +0000 |
| commit | f325103356c559d6378da7fb7db3b2a49aba5d13 (patch) | |
| tree | 9108f930eeb61b8c7df37881c112d2f51c8f1039 | |
| parent | 1d8c5b5b1df96004d6c6e0d056f0c3707461a01a (diff) | |
| parent | dd2914e88e27d16fe4b102c798913c841cf04fb4 (diff) | |
| download | frameworks_base-f325103356c559d6378da7fb7db3b2a49aba5d13.zip frameworks_base-f325103356c559d6378da7fb7db3b2a49aba5d13.tar.gz frameworks_base-f325103356c559d6378da7fb7db3b2a49aba5d13.tar.bz2 | |
Merge "Framework/base: Added synchronization block to avoid race condition"
| -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 27dd732..eafd09b 100644 --- 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; |