commit 3a24e8f160c7794f44ef9fd5c70a61ff62412717
author Mathias Agopian <mathias@google.com> Wed Sep 19 16:26:30 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 19 16:26:31 2012 -0700
tree aabb6c1868ec93e79d6a6c6c143f2a3a631a47a5
parent d56eff2f49e64bb71863ffb866af8c3f686b96e9
parent 787ac1b388f144f5e6dd38f8b807866a5256dafc

Merge changes I561c198c,Id4865f3c into jb-mr1-dev

* changes:
  improve sensor battery usage tracking
  track UID with connections

services/surfaceflinger/DisplayDevice.cpp

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
index de6e7a7..62cc92a 100644
--- a/services/surfaceflinger/DisplayDevice.cpp
+++ b/services/surfaceflinger/DisplayDevice.cpp
@@ -408,7 +408,7 @@
         "flips=%u, secure=%d, acquired=%d, numLayers=%u\n"
         "   v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], "
         "transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n",
-        mType, mDisplayName.string(),
+        mDisplayName.string(), mType,
         mLayerStack, mDisplayWidth, mDisplayHeight, mNativeWindow.get(),
         mOrientation, tr.getType(), getPageFlipCount(),
         mSecureLayerVisible, mScreenAcquired, mVisibleLayersSortedByZ.size(),