summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/wm/WindowManagerService.java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-10-11 16:49:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-11 16:49:55 +0000
commitd69417d2f62606af76ec4cea72bff089ff27b2f2 (patch)
tree357af654ca56409cbd70e34e9a7fe832e9c39734 /services/java/com/android/server/wm/WindowManagerService.java
parent0b713a096171d27ed832175b31abff2b870de44e (diff)
parent2881630af92aa089e8d4c68527198379a3895dee (diff)
Merge "Reduce jank on incoming phone call during dream." into klp-dev
Diffstat (limited to 'services/java/com/android/server/wm/WindowManagerService.java')
-rw-r--r--services/java/com/android/server/wm/WindowManagerService.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index aa8851ce5030..821676987131 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8502,6 +8502,8 @@ public class WindowManagerService extends IWindowManager.Stub
// example, when this transition is being done behind
// the lock screen.
if (!mPolicy.allowAppAnimationsLw()) {
+ if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
+ "Animations disallowed by keyguard or dream.");
animLp = null;
}
@@ -8544,8 +8546,7 @@ public class WindowManagerService extends IWindowManager.Stub
NN = mClosingApps.size();
for (i=0; i<NN; i++) {
AppWindowToken wtoken = mClosingApps.get(i);
- if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
- "Now closing app " + wtoken);
+ if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Now closing app " + wtoken);
wtoken.mAppAnimator.clearThumbnail();
wtoken.inPendingTransaction = false;
wtoken.mAppAnimator.animation = null;
@@ -10394,7 +10395,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
pw.println();
if (dumpAll) {
- pw.print(" mSystemDecorLayer="); pw.print(mSystemDecorLayer);
+ pw.print(" mSystemDecorLayer="); pw.print(mSystemDecorLayer);
pw.print(" mScreenRect="); pw.println(mScreenRect.toShortString());
if (mLastStatusBarVisibility != 0) {
pw.print(" mLastStatusBarVisibility=0x");