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

am 316e369c: am 30bd3bb7: Revert "Debug for bug 18017409"

Browse Source 
* commit '316e369c4c053125faf9c78d42855f257cfe48a2':
  Revert "Debug for bug 18017409"
This commit is contained in:
Craig Mautner
2014-11-13 16:55:07 +00:00
committed by Android Git Automerger
parent a28bd7a04b 316e369c4c
commit 759d34cbd0
2 changed files with 3 additions and 4 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

@@ -121,7 +121,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 || true; static final boolean DEBUG_STATES = DEBUG || false;
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;

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

@@ -2541,7 +2541,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
mInputMonitor.updateInputWindowsLw(false /*force*/); mInputMonitor.updateInputWindowsLw(false /*force*/);
if (true || localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG, "addWindow: New client " if (localLOGV || DEBUG_ADD_REMOVE) Slog.v(TAG, "addWindow: New client "
+ client.asBinder() + ": window=" + win + " Callers=" + Debug.getCallers(5)); + client.asBinder() + ": window=" + win + " Callers=" + Debug.getCallers(5));
if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) { if (win.isVisibleOrAdding() && updateOrientationFromAppTokensLocked(false)) {
@@ -2706,8 +2706,7 @@ public class WindowManagerService extends IWindowManager.Stub
mPolicy.removeWindowLw(win); mPolicy.removeWindowLw(win);
win.removeLocked(); win.removeLocked();
if (true || DEBUG_ADD_REMOVE) Slog.v(TAG, "removeWindowInnerLocked: " + win + if (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());