Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix system crash during RWC#resumeHomeActivity called."

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-27 15:00:34 +00:00
committed by Android (Google) Code Review
parent 648db745cd 553fec2267
commit 97de281b10
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/ActivityStack.java
View File

@@ -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);