Merge "Revert "Only allow 1 Stack on Leanback-only devices"" into lmp-preview-dev (bbd8e6ff) · Commits · e / os / android_frameworks_base

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

+1 −18

Original line number	Diff line number	Diff line
		@@ -207,8 +207,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		/** Set when we have taken too long waiting to go to sleep. */
		boolean mSleepTimeout = false;

		private final boolean mLeanbackOnlyDevice = isLeanbackOnlyDevice();

		/**
		* We don't want to allow the device to go to sleep while in the process
		* of launching an activity. This is primarily to allow alarm intent
		@@ -1389,10 +1387,7 @@ public final class ActivityStackSupervisor implements DisplayListener {

		ActivityStack adjustStackFocus(ActivityRecord r, boolean newTask) {
		final TaskRecord task = r.task;

		// On leanback only devices we should keep all activities in the same stack.
		if (!mLeanbackOnlyDevice &&
		(r.isApplicationActivity() \|\| (task != null && task.isApplicationTask()))) {
		if (r.isApplicationActivity() \|\| (task != null && task.isApplicationTask())) {
		if (task != null) {
		final ActivityStack taskStack = task.stack;
		if (taskStack.isOnHomeDisplay()) {
		@@ -3445,16 +3440,4 @@ public final class ActivityStackSupervisor implements DisplayListener {
		return "VirtualActivityDisplay={" + mDisplayId + "}";
		}
		}

		private boolean isLeanbackOnlyDevice() {
		boolean onLeanbackOnly = false;
		try {
		onLeanbackOnly = AppGlobals.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_LEANBACK_ONLY);
		} catch (RemoteException e) {
		// noop
		}

		return onLeanbackOnly;
		}
		}