Merge "Merge "Remove no-op std::max call" am: c00af4c533 am: ef5e579cec am: f3310cb3b1" into oc-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-05-01 18:53:43 +00:00
committed by Android (Google) Code Review

View File

@@ -291,7 +291,6 @@ void JankTracker::addFrame(const FrameInfo& frame) {
/ kSlowFrameBucketIntervalMs;
framebucket = std::min(framebucket,
static_cast<uint32_t>(mData->slowFrameCounts.size() - 1));
framebucket = std::max(framebucket, 0u);
mData->slowFrameCounts[framebucket]++;
}