summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wm/ActivityStack.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 4c9b80be5d7c..46c017ec7f4f 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -3059,7 +3059,11 @@ class ActivityStack extends ConfigurationContainer {
// activity in home stack.
// See {@link #mInResumeTopActivity}.
mService.mH.post(
- () -> mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId));
+ () -> {
+ synchronized (mService.mGlobalLock) {
+ mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);
+ }
+ });
return true;
} else {
return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);