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

Commit 6191149c authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Cache reference to stack objects we use a lot in WM. 

This helps with fast access since we are no longer using stack ids
to look-up stack objects.

Test: Existing tests pass.
Test: go/wm-smoke
Change-Id: I98cb6f4eb1e6d6acb81b2077aee03265a075a227
parent 5ff4bcb7

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

+2 −3
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ import android.annotation.UserIdInt; 
import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.ActivityManager.StackId;

import android.app.ActivityManager.StackInfo;

import android.app.ActivityManagerInternal.SleepToken;

import android.app.ActivityOptions;
@@ -3891,8 +3890,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D 
                final ActivityStack stack = stacks.get(stackNdx);

                pw.println();

                pw.println("  Stack #" + stack.mStackId

                        + ": type=" + activityTypeToString(getActivityType())

                        + " mode=" + windowingModeToString(getWindowingMode()));

                        + ": type=" + activityTypeToString(stack.getActivityType())

                        + " mode=" + windowingModeToString(stack.getWindowingMode()));

                pw.println("  mFullscreen=" + stack.mFullscreen);

                pw.println("  isSleeping=" + stack.shouldSleepActivities());

                pw.println("  mBounds=" + stack.mBounds);

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

+1 −2
Original line number Diff line number Diff line
@@ -1310,8 +1310,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 


                // Notify the pinned stack upon all windows drawn. If there was an animation in

                // progress then this signal will resume that animation.

                final TaskStack pinnedStack =

                        mDisplayContent.getStack(WINDOWING_MODE_PINNED);

                final TaskStack pinnedStack = mDisplayContent.getPinnedStack();

                if (pinnedStack != null) {

                    pinnedStack.onAllWindowsDrawn();

                }

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

+183 −122

File changed.

Preview size limit exceeded, changes collapsed.

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

+9 −10

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −2
Original line number Diff line number Diff line
@@ -417,8 +417,7 @@ class PinnedStackController { 
                            false /* useCurrentMinEdgeSize */);

                }

                final Rect animatingBounds = mTmpAnimatingBoundsRect;

                final TaskStack pinnedStack =

                        mDisplayContent.getStack(WINDOWING_MODE_PINNED);

                final TaskStack pinnedStack = mDisplayContent.getPinnedStack();

                if (pinnedStack != null) {

                    pinnedStack.getAnimationOrCurrentBounds(animatingBounds);

                } else {