Merge "Fix system crash during RWC#resumeHomeActivity called." (97de281b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityStack.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3059,7 +3059,11 @@ class ActivityStack extends ConfigurationContainer {
	// activity in home stack.		// activity in home stack.
	// See {@link #mInResumeTopActivity}.		// See {@link #mInResumeTopActivity}.
	mService.mH.post(		mService.mH.post(
	() -> mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId));		() -> {
			synchronized (mService.mGlobalLock) {
			mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);
			}
			});
	return true;		return true;
	} else {		} else {
	return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);		return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);