Merge "Fix NPE in isTrimmable" into rvc-dev am: a759c596fa am: 6a1dbea74a (7ab13278) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -1387,9 +1387,7 @@ class RecentTasks {
		return false;
		}

		/**
		* @return whether the given task can be trimmed even if it is outside the visible range.
		*/
		/** @return whether the given task can be trimmed even if it is outside the visible range. */
		protected boolean isTrimmable(Task task) {
		final ActivityStack stack = task.getStack();

		@@ -1404,9 +1402,13 @@ class RecentTasks {
		return false;
		}

		final ActivityStack rootHomeTask = stack.getDisplayArea().getRootHomeTask();
		// Home stack does not exist. Don't trim the task.
		if (rootHomeTask == null) {
		return false;
		}
		// Trim tasks that are behind the home task.
		final TaskDisplayArea taskDisplayArea = stack.getDisplayArea();
		return task.compareTo(taskDisplayArea.getRootHomeTask()) < 0;
		return task.compareTo(rootHomeTask) < 0;
		}

		/** Remove the tasks that user may not be able to return. */

+3 −2

Original line number	Diff line number	Diff line
		@@ -406,8 +406,9 @@ public class RecentsAnimationController implements DeathRecipient {
		}

		// Save the minimized home height
		mMinimizedHomeBounds = mDisplayContent.getDefaultTaskDisplayArea().getRootHomeTask()
		.getBounds();
		final ActivityStack rootHomeTask =
		mDisplayContent.getDefaultTaskDisplayArea().getRootHomeTask();
		mMinimizedHomeBounds = rootHomeTask != null ? rootHomeTask.getBounds() : null;

		mService.mWindowPlacerLocked.performSurfacePlacement();

+1 −1

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
		return mChildren.indexOf(stack);
		}

		ActivityStack getRootHomeTask() {
		@Nullable ActivityStack getRootHomeTask() {
		return mRootHomeTask;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1509,7 +1509,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		return mActivityRecord != null ? mActivityRecord.getTask() : null;
		}

		ActivityStack getRootTask() {
		@Nullable ActivityStack getRootTask() {
		final Task task = getTask();
		if (task != null) {
		return (ActivityStack) task.getRootTask();
		@@ -2527,7 +2527,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		final Task task = getTask();
		if (task != null) {
		task.getDimBounds(mTmpRect);
		} else {
		} else if (getRootTask() != null) {
		getRootTask().getDimBounds(mTmpRect);
		}
		}