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

Commit a4e8660d authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Fixed NPE when getting stack for dock divider. 

Also, don't try to resize non-existing stack when transitioning
docked stack to fullscreen.

Change-Id: Ie8b0e1ef7f4265f9133ce9b47e6f9a5db27dbad7
parent 013f84ab

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

+1 −1
Original line number Diff line number Diff line
@@ -3012,7 +3012,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                // In this case we make all other static stacks fullscreen and move all

                // docked stack tasks to the fullscreen stack.

                for (int i = FIRST_STATIC_STACK_ID; i <= LAST_STATIC_STACK_ID; i++) {

                    if (i != DOCKED_STACK_ID) {

                    if (i != DOCKED_STACK_ID && getStack(i) != null) {

                        resizeStackLocked(i, null, preserveWindows);

                    }

                }

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

+4 −2
Original line number Diff line number Diff line
@@ -164,9 +164,11 @@ public class DockedStackDividerController implements View.OnTouchListener, DimLa 
                mStartY = (int) event.getRawY();

                synchronized (mDisplayContent.mService.mWindowMap) {

                    mTaskStack = mDisplayContent.getDockedStackLocked();

                    if (mTaskStack != null) {

                        mTaskStack.getBounds(mOriginalRect);

                        mDockSide = mTaskStack.getDockSide();

                    }

                }

                break;

            case MotionEvent.ACTION_MOVE:

                if (mTaskStack != null) {