From 2326e9b21c4a332e00f9709606089a1e6d0e11eb Mon Sep 17 00:00:00 2001 From: Samuel Tan Date: Fri, 15 Apr 2016 13:06:12 -0700 Subject: StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize Reset LogRecords.mOldestIndex when we resize LogRecords with LogRecords.setSize(), so that LogRecords.get() will use the correct index to fetch log records. BUG: 28214608 Change-Id: I58d94d9fe61af6a0e9cba224ff98aad36eb3cd1d --- core/java/com/android/internal/util/StateMachine.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java index dc668189c771..39fd36b9058c 100644 --- a/core/java/com/android/internal/util/StateMachine.java +++ b/core/java/com/android/internal/util/StateMachine.java @@ -593,7 +593,11 @@ public class StateMachine { * @param maxSize number of records to maintain at anyone time. */ synchronized void setSize(int maxSize) { + // TODO: once b/28217358 is fixed, add unit tests to verify that these variables are + // cleared after calling this method, and that subsequent calls to get() function as + // expected. mMaxSize = maxSize; + mOldestIndex = 0; mCount = 0; mLogRecVector.clear(); } -- cgit v1.2.3-59-g8ed1b