summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJae Seo <jaeseo@google.com>2014-08-25 10:22:31 -0700
committerJae Seo <jaeseo@google.com>2014-08-25 10:23:18 -0700
commit2220f6f8a60a9aaf9be1fc3e5ce53ce410efb08e (patch)
tree746dd159784c3007ed3513782aaaa81a176f4617
parent20060091e2bd116d3a137f9194511532842432d1 (diff)
downloadframeworks_base-2220f6f8a60a9aaf9be1fc3e5ce53ce410efb08e.zip
frameworks_base-2220f6f8a60a9aaf9be1fc3e5ce53ce410efb08e.tar.gz
frameworks_base-2220f6f8a60a9aaf9be1fc3e5ce53ce410efb08e.tar.bz2
CEC: Log the current time instead when the timing information is empty
Bug: 17237045 Change-Id: Iaa59167c23ce5b460ccfefcf31b6f579f8dda98a
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiLogger.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiLogger.java b/services/core/java/com/android/server/hdmi/HdmiLogger.java
index 36159cb..93ccfe1 100644
--- a/services/core/java/com/android/server/hdmi/HdmiLogger.java
+++ b/services/core/java/com/android/server/hdmi/HdmiLogger.java
@@ -47,7 +47,7 @@ final class HdmiLogger {
long curTime = SystemClock.uptimeMillis();
Pair<Long, Integer> timing = mWarningTimingCache.get(logMessage);
if (shouldLogNow(timing, curTime)) {
- Slog.w(mTag, buildMessage(logMessage, timing));
+ Slog.w(mTag, buildMessage(logMessage, timing, curTime));
mWarningTimingCache.put(logMessage, new Pair<>(curTime, 1));
} else {
increaseLogCount(mWarningTimingCache, logMessage);
@@ -58,17 +58,17 @@ final class HdmiLogger {
long curTime = SystemClock.uptimeMillis();
Pair<Long, Integer> timing = mErrorTimingCache.get(logMessage);
if (shouldLogNow(timing, curTime)) {
- Slog.e(mTag, buildMessage(logMessage, timing));
+ Slog.e(mTag, buildMessage(logMessage, timing, curTime));
mErrorTimingCache.put(logMessage, new Pair<>(curTime, 1));
} else {
increaseLogCount(mErrorTimingCache, logMessage);
}
}
- private String buildMessage(String message, Pair<Long, Integer> timing) {
+ private String buildMessage(String message, Pair<Long, Integer> timing, long curTime) {
return new StringBuilder()
- .append("[").append(timing.second).append("]:").append(message)
- .toString();
+ .append("[").append(timing == null ? curTime : timing.second).append("]:")
+ .append(message).toString();
}
private void increaseLogCount(HashMap<String, Pair<Long, Integer>> cache, String message) {