diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-10-08 17:50:36 -0700 |
|---|---|---|
| committer | Jamie Gennis <jgennis@google.com> | 2013-10-08 17:50:36 -0700 |
| commit | b85d2cf0a20e46261db8fee4839840f0ef715c68 (patch) | |
| tree | 845c02e305446e4c9913a25e1018621f6873cb95 /services/surfaceflinger/DisplayHardware/HWComposer.cpp | |
| parent | 192b7fa0289e7a6f45249bc029db1d24f6633b5c (diff) | |
| parent | 790b6d092ce2702c9d561dfd2c873b5793e765d2 (diff) | |
| download | frameworks_native-b85d2cf0a20e46261db8fee4839840f0ef715c68.zip frameworks_native-b85d2cf0a20e46261db8fee4839840f0ef715c68.tar.gz frameworks_native-b85d2cf0a20e46261db8fee4839840f0ef715c68.tar.bz2 | |
resolved conflicts for merge of 790b6d09 to master
Diffstat (limited to 'services/surfaceflinger/DisplayHardware/HWComposer.cpp')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/HWComposer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp index 8a80488..56b0f49 100644 --- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp +++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp @@ -284,7 +284,7 @@ void HWComposer::invalidate() { void HWComposer::vsync(int disp, int64_t timestamp) { if (uint32_t(disp) < HWC_NUM_PHYSICAL_DISPLAY_TYPES) { char tag[16]; - snprintf(tag, sizeof(tag), "VSYNC_%1u", disp); + snprintf(tag, sizeof(tag), "HW_VSYNC_%1u", disp); ATRACE_INT(tag, ++mVSyncCounts[disp] & 1); mEventHandler.onVSyncReceived(disp, timestamp); |