diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-06-09 17:50:36 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-06-09 17:50:36 -0700 |
| commit | f741e679c496f7345304a6543f01d7048e31d1a7 (patch) | |
| tree | e53a3b9f98c16611761a062dc0d60828ce74b365 /services/java/com/android/server/wm/DimSurface.java | |
| parent | aab49b40e8dd78aca67db160f5d0c787379c8f7f (diff) | |
| parent | e2aa04908cfdf65ef309f1491f31a0c8846977ff (diff) | |
| download | frameworks_base-f741e679c496f7345304a6543f01d7048e31d1a7.zip frameworks_base-f741e679c496f7345304a6543f01d7048e31d1a7.tar.gz frameworks_base-f741e679c496f7345304a6543f01d7048e31d1a7.tar.bz2 | |
resolved conflicts for merge of e2aa0490 to master
Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
Diffstat (limited to 'services/java/com/android/server/wm/DimSurface.java')
| -rw-r--r-- | services/java/com/android/server/wm/DimSurface.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/DimSurface.java b/services/java/com/android/server/wm/DimSurface.java index 220c7fb..d7bb8b3 100644 --- a/services/java/com/android/server/wm/DimSurface.java +++ b/services/java/com/android/server/wm/DimSurface.java @@ -32,8 +32,9 @@ class DimSurface { DimSurface(SurfaceSession session) { if (mDimSurface == null) { - if (WindowManagerService.SHOW_TRANSACTIONS) Slog.i(WindowManagerService.TAG, " DIM " - + mDimSurface + ": CREATE"); + if (WindowManagerService.SHOW_TRANSACTIONS || + WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG, + " DIM " + mDimSurface + ": CREATE"); try { mDimSurface = new Surface(session, 0, "DimSurface", |