diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-12 19:15:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-12 19:15:23 +0000 |
| commit | c641de017ae0b15bbc13f43fd14fca6b1523ec02 (patch) | |
| tree | 99cfc553259c1231c3005dbf5225e4d770d9d41e /services/java/com/android/server/wm/WindowManagerService.java | |
| parent | 3f183a234bef643080d4f9dce44bcaa68e5d4694 (diff) | |
| parent | 2c2549c5f44b712dbbf66a69d91f07d6f5336ee6 (diff) | |
| download | frameworks_base-c641de017ae0b15bbc13f43fd14fca6b1523ec02.zip frameworks_base-c641de017ae0b15bbc13f43fd14fca6b1523ec02.tar.gz frameworks_base-c641de017ae0b15bbc13f43fd14fca6b1523ec02.tar.bz2 | |
Merge "Add event logging for tasks and stacks." into klp-dev
Diffstat (limited to 'services/java/com/android/server/wm/WindowManagerService.java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 818cfec..de307a3 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -3397,10 +3397,10 @@ public class WindowManagerService extends IWindowManager.Stub if (stack == null) { throw new IllegalArgumentException("addAppToken: invalid stackId=" + stackId); } + EventLog.writeEvent(EventLogTags.WM_TASK_CREATED, taskId, stackId); Task task = new Task(atoken, stack, userId); mTaskIdToTask.put(taskId, task); stack.addTask(task, true); - stack.getDisplayContent().moveStack(stack, true); return task; } @@ -4791,7 +4791,6 @@ public class WindowManagerService extends IWindowManager.Stub displayContent.moveHomeStackBox(isHomeStackTask); } stack.moveTaskToTop(task); - displayContent.moveStack(stack, true); } } finally { Binder.restoreCallingIdentity(origId); @@ -4845,7 +4844,6 @@ public class WindowManagerService extends IWindowManager.Stub weight); if (stack != null) { mStackIdToStack.put(stackId, stack); - displayContent.moveStack(stack, true); performLayoutAndPlaceSurfacesLocked(); return; } @@ -4877,6 +4875,7 @@ public class WindowManagerService extends IWindowManager.Stub return; } final TaskStack stack = task.mStack; + EventLog.writeEvent(EventLogTags.WM_TASK_REMOVED, taskId, "removeTask"); stack.removeTask(task); stack.getDisplayContent().layoutNeeded = true; } |