Merge "Revert part of ag/6685504" into qt-dev (7219b682) · Commits · e / os / android_frameworks_base

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

+1 −15

Original line number	Original line	Diff line number	Diff line
	@@ -3055,22 +3055,8 @@ class ActivityStack extends ConfigurationContainer {
	ActivityOptions.abort(options);		ActivityOptions.abort(options);
	if (DEBUG_STATES) Slog.d(TAG_STATES,		if (DEBUG_STATES) Slog.d(TAG_STATES,
	"resumeTopActivityInNextFocusableStack: " + reason + ", go home");		"resumeTopActivityInNextFocusableStack: " + reason + ", go home");
	if (isActivityTypeHome()) {
	// resumeTopActivityUncheckedLocked has been prevented to run recursively. Post a
	// runnable to resume home since we are currently in the process of resuming top
	// activity in home stack.
	// See {@link #mInResumeTopActivity}.
	mService.mH.post(
	() -> {
	synchronized (mService.mGlobalLock) {
	mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);
	}
	});
	return true;
	} else {
	return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);		return mRootActivityContainer.resumeHomeActivity(prev, reason, mDisplayId);
	}		}
	}

	/** Returns the position the input task should be placed in this stack. */		/** Returns the position the input task should be placed in this stack. */
	int getAdjustedPositionForTask(TaskRecord task, int suggestedPosition,		int getAdjustedPositionForTask(TaskRecord task, int suggestedPosition,