Merge "Fix NPE when checking if recents should be launched in docked mode." (6cf93664) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStarter.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1034,7 +1034,8 @@ class ActivityStarter {
		}

		private void launchRecentsAppIfNeeded(ActivityStack topStack) {
		if (topStack.mStackId == HOME_STACK_ID && mTargetStack.mStackId == DOCKED_STACK_ID) {
		if (topStack.mStackId == HOME_STACK_ID && mTargetStack != null
		&& mTargetStack.mStackId == DOCKED_STACK_ID) {
		// We launch an activity while being in home stack, which means either launcher or
		// recents into docked stack. We don't want the launched activity to be alone in a
		// docked stack, so we want to immediately launch recents too.