Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b06a583 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Removed use of leanback mode in ActivityManager. 

Android T.V. will be supporting multi-window mode, so they need
multiple stacks.

Bug: 25006507
Change-Id: Ia83157321dabe85aaf50b314df711cd1c2f7236e
parent b32f8a2b

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

+55 −76
Original line number Diff line number Diff line
@@ -296,10 +296,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    /** Set when we have taken too long waiting to go to sleep. */

    boolean mSleepTimeout = false;



    /** Indicates if we are running on a Leanback-only (TV) device. Only initialized after

     * setWindowManager is called. **/

    private boolean mLeanbackOnlyDevice;



    /**

     * 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
@@ -447,9 +443,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            mHomeStack = mFocusedStack = mLastFocusedStack = getStack(HOME_STACK_ID);



            mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);



            // Initialize this here, now that we can get a valid reference to PackageManager.

            mLeanbackOnlyDevice = isLeanbackOnlyDevice();

        }

    }
@@ -1781,9 +1774,9 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    ActivityStack computeStackFocus(ActivityRecord r, boolean newTask, Rect bounds) {

        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()))) {

            return mHomeStack;

        }



        ActivityStack stack;
@@ -1844,8 +1837,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                + r + " stackId=" + stack.mStackId);

        return stack;

    }

        return mHomeStack;

    }



    boolean setFocusedStack(ActivityRecord r, String reason) {

        if (r == null) {
@@ -3199,7 +3190,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
     */

    private boolean restoreRecentTaskLocked(TaskRecord task, int stackId) {

        if (stackId == INVALID_STACK_ID) {

            stackId = mLeanbackOnlyDevice ? mHomeStack.mStackId : task.getLaunchStackId();

            stackId = task.getLaunchStackId();

        }

        if (task.stack != null) {

            // Task has already been restored once. See if we need to do anything more
@@ -4928,18 +4919,6 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }

    }



    private boolean isLeanbackOnlyDevice() {

        boolean onLeanbackOnly = false;

        try {

            onLeanbackOnly = AppGlobals.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_LEANBACK_ONLY);

        } catch (RemoteException e) {

            // noop

        }



        return onLeanbackOnly;

    }



    /**

     * Adjust bounds to stay within stack bounds.

     *