Commit 087384b0 authored May 26, 2013 by Dianne Hackborn Committed by Android Git Automerger May 26, 2013

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

* commit 'f3251033':
  Framework/base: Added synchronization block to avoid race condition

services/java/com/android/server/am/ActivityStack.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -3655,8 +3655,10 @@ final class ActivityStack {
		}

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

		return res;
		}