Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Debug for bug 18017409" into lmp-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-10-22 03:01:40 +00:00
committed by Android (Google) Code Review
parent 754bffe969 5a3c231dc8
commit 4816ed65c6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -120,7 +120,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
static final boolean DEBUG_RELEASE = DEBUG || false; static final boolean DEBUG_RELEASE = DEBUG || false;
static final boolean DEBUG_SAVED_STATE = DEBUG || false; static final boolean DEBUG_SAVED_STATE = DEBUG || false;
static final boolean DEBUG_SCREENSHOTS = 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; static final boolean DEBUG_VISIBLE_BEHIND = DEBUG || false;
public static final int HOME_STACK_ID = 0; public static final int HOME_STACK_ID = 0;

8
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2509,9 +2509,8 @@ public class WindowManagerService extends IWindowManager.Stub
} }
mInputMonitor.updateInputWindowsLw(false /*force*/); mInputMonitor.updateInputWindowsLw(false /*force*/);
if (localLOGV) Slog.v( if (true || localLOGV) Slog.v(TAG, "addWindow: New client " + client.asBinder()
TAG, "New client " + client.asBinder() + ": window=" + win + " Callers=" + Debug.getCallers(5));
+ ": window=" + win);
if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) { if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) {
reportNewConfig = true; reportNewConfig = true;
@@ -2675,7 +2674,8 @@ public class WindowManagerService extends IWindowManager.Stub
mPolicy.removeWindowLw(win); mPolicy.removeWindowLw(win);
win.removeLocked(); 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()); mWindowMap.remove(win.mClient.asBinder());
if (win.mAppOp != AppOpsManager.OP_NONE) { if (win.mAppOp != AppOpsManager.OP_NONE) {
mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage()); mAppOps.finishOp(win.mAppOp, win.getOwningUid(), win.getOwningPackage());