Merge "Use push/peek/pop for operations on stack"

1 files changed, 2 insertions, 3 deletions

diff --git a/core/java/android/util/BootTimingsTraceLog.java b/core/java/android/util/BootTimingsTraceLog.java
index c782ad7f381a..2e4319cca0b9 100644
--- a/core/java/android/util/BootTimingsTraceLog.java
+++ b/core/java/android/util/BootTimingsTraceLog.java
@@ -52,12 +52,11 @@ public class BootTimingsTraceLog {
         if (!DEBUG_BOOT_TIME) {
             return;
         }
-        // Pop the top element without throwing NoSuchElementException
-        Pair<String, Long> event = mStartTimes.pollFirst();
-        if (event == null) {
+        if (mStartTimes.peek() == null) {
             Slog.w(mTag, "traceEnd called more times than traceBegin");
             return;
         }
+        Pair<String, Long> event = mStartTimes.pop();
         // Log the duration so it can be parsed by external tools for performance reporting
         Slog.d(mTag, event.first + " took to complete: "
                 + (SystemClock.elapsedRealtime() - event.second) + "ms");