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

Commit 526ad439 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

1/n Move TaskContainers out of DisplayContent class 

No changes in logic, just moving the code around.

Bug: 152116619
Test: WM CTS and unit tests
Change-Id: I4aa142e07e39950d077c685bb157b4abb2172886
parent 5bc4b972

data/etc/services.core.protolog.json

+18 −24
Original line number Diff line number Diff line
@@ -193,12 +193,6 @@ 
      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/WindowState.java"

    },

    "-1741065110": {

      "message": "No app is requesting an orientation, return %d for display id=%d",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/DisplayContent.java"

    },

    "-1730156332": {

      "message": "Display id=%d rotation changed to %d from %d, lastOrientation=%d",

      "level": "VERBOSE",
@@ -547,6 +541,12 @@ 
      "group": "WM_DEBUG_APP_TRANSITIONS",

      "at": "com\/android\/server\/wm\/AppTransitionController.java"

    },

    "-993446393": {

      "message": "App is requesting an orientation, return %d for display id=%d",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/TaskContainers.java"

    },

    "-993378225": {

      "message": "finishDrawingLocked: mDrawState=COMMIT_DRAW_PENDING %s in %s",

      "level": "VERBOSE",
@@ -715,12 +715,6 @@ 
      "group": "WM_DEBUG_REMOTE_ANIMATIONS",

      "at": "com\/android\/server\/wm\/RemoteAnimationController.java"

    },

    "-650040763": {

      "message": "rotationForOrientation(orient=%d, last=%d); user=%d %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/DisplayRotation.java"

    },

    "-639305784": {

      "message": "Could not report config changes to the window token client.",

      "level": "WARN",
@@ -1021,12 +1015,6 @@ 
      "group": "WM_ERROR",

      "at": "com\/android\/server\/wm\/WindowManagerService.java"

    },

    "44438983": {

      "message": "performLayout: Activity exiting now removed %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ADD_REMOVE",

      "at": "com\/android\/server\/wm\/DisplayContent.java"

    },

    "45285419": {

      "message": "startingWindow was set but startingSurface==null, couldn't remove",

      "level": "VERBOSE",
@@ -1087,6 +1075,12 @@ 
      "group": "WM_SHOW_TRANSACTIONS",

      "at": "com\/android\/server\/wm\/WindowSurfaceController.java"

    },

    "137835146": {

      "message": "No app is requesting an orientation, return %d for display id=%d",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/TaskContainers.java"

    },

    "140319294": {

      "message": "IME target changed within ActivityRecord",

      "level": "DEBUG",
@@ -1531,12 +1525,6 @@ 
      "group": "WM_DEBUG_REMOTE_ANIMATIONS",

      "at": "com\/android\/server\/wm\/RemoteAnimationController.java"

    },

    "845234215": {

      "message": "App is requesting an orientation, return %d for display id=%d",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ORIENTATION",

      "at": "com\/android\/server\/wm\/DisplayContent.java"

    },

    "853091290": {

      "message": "Moved stack=%s behind stack=%s",

      "level": "DEBUG",
@@ -1927,6 +1915,12 @@ 
      "group": "WM_DEBUG_STARTING_WINDOW",

      "at": "com\/android\/server\/wm\/ActivityRecord.java"

    },

    "1685441447": {

      "message": "performLayout: Activity exiting now removed %s",

      "level": "VERBOSE",

      "group": "WM_DEBUG_ADD_REMOVE",

      "at": "com\/android\/server\/wm\/TaskContainers.java"

    },

    "1720229827": {

      "message": "Creating animation bounds layer",

      "level": "INFO",

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

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.wm; 
import android.content.res.Resources;

import android.text.TextUtils;



import com.android.server.wm.DisplayContent.TaskContainers;



/**

 * Policy that manages DisplayAreas.

 */

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

+1 −534

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+570 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tests/wmtests/src/com/android/server/wm/DisplayAreaProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class DisplayAreaProviderTest { 
        @Override

        public DisplayAreaPolicy instantiate(WindowManagerService wmService, DisplayContent content,

                DisplayArea.Root root, DisplayArea<? extends WindowContainer> imeContainer,

                DisplayContent.TaskContainers taskContainers) {

                TaskContainers taskContainers) {

            throw new RuntimeException("test stub");

        }

    }