commit 0cde53ea132f3ba49838df1fdc1ebb233a8124d0
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 22 20:53:27 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 22 20:53:30 2016 +0000
tree a610e715624a210b4a9c1a48f5759a3b579a1c42
parent f256805d10b3314a87a92b48ae7e2b65f948947b
parent 5237f47b82696e82d8607f12a6642c056a21bcde

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

core/java/android/util/BootTimingsTraceLog.java

diff --git a/core/java/android/util/BootTimingsTraceLog.java b/core/java/android/util/BootTimingsTraceLog.java
index c782ad7f..2e4319c 100644
--- a/core/java/android/util/BootTimingsTraceLog.java
+++ b/core/java/android/util/BootTimingsTraceLog.java
@@ -52,12 +52,11 @@
         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");