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
This commit is contained in:
Dianne Hackborn
2013-05-26 00:04:57 -07:00
committed by Android Git Automerger

View File

@@ -3655,7 +3655,9 @@ final class ActivityStack {
} }
if (activityRemoved) { if (activityRemoved) {
resumeTopActivityLocked(null); synchronized (mService) {
resumeTopActivityLocked(null);
}
} }
return res; return res;