commit f036732c195619d1064ecea86a5e9a44cce37175
author Midas Chien <midaschieh@google.com> Fri Aug 17 04:11:11 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 17 04:11:11 2018 +0000
tree f9dcc6fa2427d12acdbad6068ebea073a2702aa7
parent 3db423465dc6e177aab27f315426541714201ebe
parent bc5f22fd065df41946378d3d0cf1dd221701c29d

Merge "SF: Fix incorrect early sf gl phase information dumped from SurfaceFlinger"

services/surfaceflinger/Scheduler/DispSyncSource.cpp

diff --git a/services/surfaceflinger/Scheduler/DispSyncSource.cpp b/services/surfaceflinger/Scheduler/DispSyncSource.cpp
index 61f2ac8..697d634 100644
--- a/services/surfaceflinger/Scheduler/DispSyncSource.cpp
+++ b/services/surfaceflinger/Scheduler/DispSyncSource.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#define ATRACE_TAG ATRACE_TAG_GRAPHICS
+
 #include "DispSyncSource.h"
 
 #include <android-base/stringprintf.h>

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0e88fa0..67c6325 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4252,7 +4252,7 @@
                 appEarlyOffset,
                 sfEarlyOffset,
                 appEarlyGlOffset,
-                sfEarlyOffset,
+                sfEarlyGlOffset,
                 dispSyncPresentTimeOffset, activeConfig->getVsyncPeriod());
     }
     result.append("\n");