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

2016-11-22 20:53:27 +00:00
parent f256805d10 5237f47b82
commit 0cde53ea13
1 changed files with 2 additions and 3 deletions
--- 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");