commit f01e4af5a3af7ceb7d022660953d3ed6ab2e193c
author John Reck <jreck@google.com> Tue Mar 29 18:08:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 18:08:51 2016 +0000
tree d8561fd52550633549047a1572d8e0e7bb2d5a9a
parent 89d9480be2dbb33e97a6efdf45bc6790eff1e5d0
parent d6e3cf4ab55ea68e60597526f43e973026aa2909

Merge "Fix array out of bounds access in JankTracker" into nyc-dev

libs/hwui/JankTracker.cpp

diff --git a/libs/hwui/JankTracker.cpp b/libs/hwui/JankTracker.cpp
index 2246cf9c..76e587e 100644
--- a/libs/hwui/JankTracker.cpp
+++ b/libs/hwui/JankTracker.cpp
@@ -244,7 +244,7 @@
     int64_t totalDuration =
             frame[FrameInfoIndex::FrameCompleted] - frame[FrameInfoIndex::IntendedVsync];
     uint32_t framebucket = frameCountIndexForFrameTime(
-            totalDuration, mData->frameCounts.size());
+            totalDuration, mData->frameCounts.size() - 1);
     // Keep the fast path as fast as possible.
     if (CC_LIKELY(totalDuration < mFrameInterval)) {
         mData->frameCounts[framebucket]++;