commit d0bc92e4354ed95e5f0f2bb771109864489d6e06
author Android Build Merger (Role) <android-build-merger@google.com> Thu Sep 01 00:39:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 01 00:39:42 2016 +0000
tree b92a3193ade292e7a17f0843630e708bae8e9eda
parent dc02317d92ffa2229b9b226d9c66edbe4f4f1eac
parent ad034383886b3a4b9d5e9f3de2e7f801d2322f4d

Merge "docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/31158856 b/31157097 b/31158502 am: 3f2d7d8e22 am: 8d58464e56" into nyc-mr1-dev

services/core/java/com/android/server/wm/WindowSurfaceController.java

diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java
index c77e572..f5ed9d1 100644
--- a/services/core/java/com/android/server/wm/WindowSurfaceController.java
+++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java
@@ -153,9 +153,9 @@
     }
 
     void destroyInTransaction() {
-        //        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
-        Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));
-        //        }
+        if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) {
+            Slog.i(TAG, "Destroying surface " + this + " called by " + Debug.getCallers(8));
+        }
         try {
             if (mSurfaceControl != null) {
                 mSurfaceControl.destroy();