diff options
| author | John Reck <jreck@google.com> | 2016-07-29 10:08:16 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2016-07-29 10:08:16 -0700 |
| commit | fb5c675b7e1fee074f19cf1866b5dda0785dbe64 (patch) | |
| tree | 54c983e39ad8a3ee94062b8c509054ba87c9c81d /libs/hwui/renderthread/RenderThread.cpp | |
| parent | 942ad98481be73e1f4efe0e6837d8930ec4d9d6b (diff) | |
| parent | 67daab6a1e0897cd0528a19071eeb9f4a2b00b49 (diff) | |
resolve merge conflicts of 67daab6 to nyc-mr1-dev-plus-aosp
Change-Id: I35f867b8d6408a7eae9cf5643f0908259de90cb1
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index 3c1c0bceba58..968834056ae1 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -190,7 +190,7 @@ void RenderThread::initThreadLocals() { initializeDisplayEventReceiver(); mEglManager = new EglManager(*this); mRenderState = new RenderState(*this); - mJankTracker = new JankTracker(frameIntervalNanos); + mJankTracker = new JankTracker(mDisplayInfo); } int RenderThread::displayEventReceiverCallback(int fd, int events, void* data) { |