commit e749cd3b15bb14e6dc4ff2724ec1ed56ba269b4c
author Samuel Tan <samueltan@google.com> Tue Apr 19 17:25:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 17:25:33 2016 +0000
tree 566463ae5231df301a745bb342a7ca9863219409
parent 89fa73fd7abe0f87634d2914163a8fc79ba2f738
parent 2326e9b21c4a332e00f9709606089a1e6d0e11eb

Merge "StateMachine: reset LogRecords.mOldestIndex in LogRecords.setSize" into nyc-dev

core/java/com/android/internal/util/StateMachine.java

diff --git a/core/java/com/android/internal/util/StateMachine.java b/core/java/com/android/internal/util/StateMachine.java
index dc66818..39fd36b 100644
--- a/core/java/com/android/internal/util/StateMachine.java
+++ b/core/java/com/android/internal/util/StateMachine.java
@@ -593,7 +593,11 @@
          * @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();
         }