diff options
| author | Craig Mautner <cmautner@google.com> | 2014-10-22 05:56:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-22 05:56:21 +0000 |
| commit | d676295be4708aef8e5cda197ccfdf38a19f5c92 (patch) | |
| tree | ba645655a7864d4a399c2c7d8ce4fc73967c8695 | |
| parent | 9a23332716d0aad7d5f99f6c70c7298db96b7a83 (diff) | |
| parent | 80a274c69648e1a3f272c0668c257487ae790c80 (diff) | |
| download | frameworks_base-d676295be4708aef8e5cda197ccfdf38a19f5c92.zip frameworks_base-d676295be4708aef8e5cda197ccfdf38a19f5c92.tar.gz frameworks_base-d676295be4708aef8e5cda197ccfdf38a19f5c92.tar.bz2 | |
am 4816ed65: Merge "Debug for bug 18017409" into lmp-mr1-dev automerge: 880eb34
automerge: 80a274c
* commit '80a274c69648e1a3f272c0668c257487ae790c80':
Debug for bug 18017409
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 03dd3c0..c1bf955 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -120,7 +120,7 @@ public final class ActivityStackSupervisor implements DisplayListener { static final boolean DEBUG_RELEASE = DEBUG || false; static final boolean DEBUG_SAVED_STATE = DEBUG || false; static final boolean DEBUG_SCREENSHOTS = DEBUG || false; - static final boolean DEBUG_STATES = DEBUG || false; + static final boolean DEBUG_STATES = DEBUG || true; static final boolean DEBUG_VISIBLE_BEHIND = DEBUG || false; public static final int HOME_STACK_ID = 0; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index f82aee4..0a0e8a1 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2509,9 +2509,8 @@ public class WindowManagerService extends IWindowManager.Stub } mInputMonitor.updateInputWindowsLw(false /*force*/); - if (localLOGV) Slog.v( - TAG, "New client " + client.asBinder() - + ": window=" + win); + if (true || localLOGV) Slog.v(TAG, "addWindow: New client " + client.asBinder() + + ": window=" + win + " Callers=" + Debug.getCallers(5)); if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) { reportNewConfig = true; @@ -2675,7 +2674,8 @@ public class WindowManagerService extends IWindowManager.Stub mPolicy.removeWindowLw(win); win.removeLocked(); - if (DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win); + if (true || DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win + + " Callers=" + Debug.getCallers(5)); mWindowMap.remove(win.mClient.asBinder()); if (win.mAppOp != AppOpsManager.OP_NONE) { mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage()); |