diff options
| author | 2015-10-09 06:03:43 +0000 | |
|---|---|---|
| committer | 2015-10-09 06:03:43 +0000 | |
| commit | f350fa8de665c32a4f59cfe53a90a0e767155bef (patch) | |
| tree | 9b820b5fa36baed9757074cedf6ad9055ef790ea | |
| parent | cccaa51f34eb55f091a38ab5043595bf2ae8890c (diff) | |
| parent | a4e8660d30665dca18d617571c231e545d9311a1 (diff) | |
Merge "Fixed NPE when getting stack for dock divider."
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/DockedStackDividerController.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 8bd9462a290d..8bec7f7cad97 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -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); } } diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java index 610524f50f56..ae7839d52851 100644 --- a/services/core/java/com/android/server/wm/DockedStackDividerController.java +++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java @@ -164,8 +164,10 @@ public class DockedStackDividerController implements View.OnTouchListener, DimLa mStartY = (int) event.getRawY(); synchronized (mDisplayContent.mService.mWindowMap) { mTaskStack = mDisplayContent.getDockedStackLocked(); - mTaskStack.getBounds(mOriginalRect); - mDockSide = mTaskStack.getDockSide(); + if (mTaskStack != null) { + mTaskStack.getBounds(mOriginalRect); + mDockSide = mTaskStack.getDockSide(); + } } break; case MotionEvent.ACTION_MOVE: |