From 127299fb5b2568b6e498a6d14357c218dd84c310 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Tue, 12 Nov 2013 17:57:47 +0000 Subject: Revert "Add logging for b10858941." This reverts commit 02d3c985f3755c736d7528f57b0c519ba7b1fa65. Change-Id: Ida2b1aa6116fdaf003c6611890a19c1c312d2bd1 --- services/java/com/android/server/CircularLog.java | 73 ---------------------- .../java/com/android/server/am/ActivityStack.java | 7 --- .../android/server/am/ActivityStackSupervisor.java | 8 --- .../java/com/android/server/wm/DisplayContent.java | 6 +- services/java/com/android/server/wm/TaskStack.java | 2 - .../android/server/wm/WindowManagerService.java | 2 +- .../java/com/android/server/wm/WindowState.java | 2 - 7 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 services/java/com/android/server/CircularLog.java diff --git a/services/java/com/android/server/CircularLog.java b/services/java/com/android/server/CircularLog.java deleted file mode 100644 index f53af1a12611..000000000000 --- a/services/java/com/android/server/CircularLog.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server; - -import android.text.format.DateFormat; - -import java.io.PrintWriter; - -public class CircularLog { - private final String[] mLog; - int mHead; - - public CircularLog(int size) { - mLog = new String[size]; - mLog[mHead++] = "Log start, less than " + size + " log entries entered."; - } - - public void add(String msg) { - StringBuffer sb = new StringBuffer(); - long now = System.currentTimeMillis(); - sb.append(DateFormat.format("yyyy-MM-dd HH:mm:ss", now)); - sb.append("."); - sb.append(String.format("%03d: ", now % 1000)); - sb.append(msg); - - mLog[(int)(mHead % mLog.length)] = sb.toString(); - ++mHead; - } - - public String[] getLog() { - final int length = Math.min(mHead, mLog.length); - final String[] logCopy = new String[length]; - if (mHead > length) { - final int start = mHead % length; - System.arraycopy(mLog, start, logCopy, 0, length - start); - System.arraycopy(mLog, 0, logCopy, length - start, start); - } else { - System.arraycopy(mLog, 0, logCopy, 0, length); - } - return logCopy; - } - - public void dump(PrintWriter pw, String prefix) { - final int length = Math.min(mHead, mLog.length); - if (mHead > length) { - final int start = mHead % length; - for (int i = start; i < length; ++i) { - pw.print(prefix); pw.println(mLog[i]); - } - for (int i = 0; i < start; ++i) { - pw.print(prefix); pw.println(mLog[i]); - } - } else { - for (int i = 0; i < length; ++i) { - pw.print(prefix); pw.println(mLog[i]); - } - } - } -} diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 08ee51ab902a..2312d41ef926 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -1093,8 +1093,6 @@ final class ActivityStack { // to now show its window. if (DEBUG_VISBILITY) Slog.v( TAG, "Making visible and scheduling visibility: " + r); - mStackSupervisor.mStackLog.add( - "ensureVisibility: Scheduling visibility: " + r); try { if (mTranslucentActivityWaiting != null) { mUndrawnActivitiesBelowTopTranslucent.add(r); @@ -1143,8 +1141,6 @@ final class ActivityStack { if (r.app != null && r.app.thread != null) { if (DEBUG_VISBILITY) Slog.v( TAG, "Scheduling invisibility: " + r); - mStackSupervisor.mStackLog.add( - "ensureVisibility: Scheduling invisibility: " + r); r.app.thread.scheduleWindowVisibility(r.appToken, false); } break; @@ -3005,7 +3001,6 @@ final class ActivityStack { final TaskRecord task = mTaskHistory.get(taskNdx); if (task.isHomeTask()) { if (DEBUG_TASKS || DEBUG_STACK) Slog.d(TAG, "moveHomeTaskToTop: moving " + task); - mStackSupervisor.mStackLog.add("moveHomeTaskToTop: moving " + task); mTaskHistory.remove(taskNdx); mTaskHistory.add(top, task); mWindowManager.moveTaskToTop(task.taskId); @@ -3033,7 +3028,6 @@ final class ActivityStack { final void moveTaskToFrontLocked(TaskRecord tr, ActivityRecord reason, Bundle options) { if (DEBUG_SWITCH) Slog.v(TAG, "moveTaskToFront: " + tr); - mStackSupervisor.mStackLog.add("moveTaskToFrontLocked: " + tr); final int numTasks = mTaskHistory.size(); final int index = mTaskHistory.indexOf(tr); @@ -3121,7 +3115,6 @@ final class ActivityStack { if (tr == null) { return false; } - mStackSupervisor.mStackLog.add("moveTaskToBackLocked: " + tr); mTaskHistory.remove(tr); mTaskHistory.add(0, tr); diff --git a/services/java/com/android/server/am/ActivityStackSupervisor.java b/services/java/com/android/server/am/ActivityStackSupervisor.java index 6aef643cf479..82513643ff0f 100644 --- a/services/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/java/com/android/server/am/ActivityStackSupervisor.java @@ -72,7 +72,6 @@ import android.util.SparseIntArray; import com.android.internal.app.HeavyWeightSwitcherActivity; import com.android.internal.os.TransferPipe; -import com.android.server.CircularLog; import com.android.server.am.ActivityManagerService.PendingActivityLaunch; import com.android.server.am.ActivityStack.ActivityState; import com.android.server.wm.StackBox; @@ -207,8 +206,6 @@ public final class ActivityStackSupervisor { /** Stack id of the front stack when user switched, indexed by userId. */ SparseIntArray mUserStackInFront = new SparseIntArray(2); - CircularLog mStackLog = new CircularLog(30); - public ActivityStackSupervisor(ActivityManagerService service, Context context, Looper looper) { mService = service; @@ -276,9 +273,6 @@ public final class ActivityStackSupervisor { if (DEBUG_STACK) Slog.d(TAG, "moveHomeTask: mStackState old=" + stackStateToString(mStackState) + " new=" + stackStateToString(homeInFront ? STACK_STATE_HOME_TO_BACK : STACK_STATE_HOME_TO_FRONT)); - mStackLog.add("moveHomeTask: mStackState old=" + stackStateToString(mStackState) - + " new=" + stackStateToString(homeInFront ? - STACK_STATE_HOME_TO_BACK : STACK_STATE_HOME_TO_FRONT)); mStackState = homeInFront ? STACK_STATE_HOME_TO_BACK : STACK_STATE_HOME_TO_FRONT; } } @@ -2390,8 +2384,6 @@ public final class ActivityStackSupervisor { pw.print(prefix); pw.println("mSleepTimeout=" + mSleepTimeout); pw.print(prefix); pw.println("mCurTaskId=" + mCurTaskId); pw.print(prefix); pw.println("mUserStackInFront=" + mUserStackInFront); - pw.print(prefix); pw.println("mStackLog="); - mStackLog.dump(pw, prefix + " "); } ArrayList getDumpActivitiesLocked(String name) { diff --git a/services/java/com/android/server/wm/DisplayContent.java b/services/java/com/android/server/wm/DisplayContent.java index 2fe70a7d207e..52f2325d3d33 100644 --- a/services/java/com/android/server/wm/DisplayContent.java +++ b/services/java/com/android/server/wm/DisplayContent.java @@ -28,7 +28,6 @@ import android.os.Debug; import android.util.Slog; import android.view.Display; import android.view.DisplayInfo; -import com.android.server.CircularLog; import java.io.PrintWriter; import java.util.ArrayList; @@ -115,8 +114,6 @@ class DisplayContent { final WindowManagerService mService; - CircularLog mVisibilityLog = new CircularLog(30); - /** * @param display May not be null. * @param service TODO(cmautner): @@ -459,7 +456,7 @@ class DisplayContent { } } - public void dump(PrintWriter pw, String prefix) { + public void dump(String prefix, PrintWriter pw) { pw.print(prefix); pw.print("Display: mDisplayId="); pw.println(mDisplayId); final String subPrefix = " " + prefix; pw.print(subPrefix); pw.print("init="); pw.print(mInitialDisplayWidth); pw.print("x"); @@ -524,7 +521,6 @@ class DisplayContent { token.dump(pw, " "); } } - pw.print(prefix); pw.println("mVisibilityLog:"); mVisibilityLog.dump(pw, prefix + " "); pw.println(); } } diff --git a/services/java/com/android/server/wm/TaskStack.java b/services/java/com/android/server/wm/TaskStack.java index 28279219b41e..34bef68aeb7c 100644 --- a/services/java/com/android/server/wm/TaskStack.java +++ b/services/java/com/android/server/wm/TaskStack.java @@ -127,14 +127,12 @@ public class TaskStack { boolean moveTaskToTop(Task task) { if (DEBUG_TASK_MOVEMENT) Slog.d(TAG, "moveTaskToTop: task=" + task + " Callers=" + Debug.getCallers(6)); - mDisplayContent.mVisibilityLog.add("moveTaskToTop: " + task); mTasks.remove(task); return addTask(task, true); } boolean moveTaskToBottom(Task task) { if (DEBUG_TASK_MOVEMENT) Slog.d(TAG, "moveTaskToBottom: task=" + task); - mDisplayContent.mVisibilityLog.add("moveTaskToBottom: " + task); mTasks.remove(task); return addTask(task, false); } diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index cb576ee97012..f24afc12b82f 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -10271,7 +10271,7 @@ public class WindowManagerService extends IWindowManager.Stub final int numDisplays = mDisplayContents.size(); for (int displayNdx = 0; displayNdx < numDisplays; ++displayNdx) { final DisplayContent displayContent = mDisplayContents.valueAt(displayNdx); - displayContent.dump(pw, " "); + displayContent.dump(" ", pw); } } else { pw.println(" NO DISPLAY"); diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 0be07729498b..2d087925e56b 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -1087,7 +1087,6 @@ final class WindowState implements WindowManagerPolicy.WindowState { return false; } if (DEBUG_VISIBILITY) Slog.v(TAG, "Policy visibility true: " + this); - mDisplayContent.mVisibilityLog.add("showLw: Policy visibility true: " + this); if (doAnimation) { if (DEBUG_VISIBILITY) Slog.v(TAG, "doAnimation: mPolicyVisibility=" + mPolicyVisibility + " mAnimation=" + mWinAnimator.mAnimation); @@ -1134,7 +1133,6 @@ final class WindowState implements WindowManagerPolicy.WindowState { doAnimation = false; } } - mDisplayContent.mVisibilityLog.add("hideLw: Policy visibility false: " + this); if (doAnimation) { mPolicyVisibilityAfterAnim = false; } else { -- cgit v1.2.3-59-g8ed1b