commit 0beba056cc852571d4be77a4cd3f4eabc4c49648
author Robert Shih <robertshih@google.com> Sun Feb 14 00:47:00 2021 -0800
committer Robert Shih <robertshih@google.com> Wed Feb 17 16:42:58 2021 -0800
tree b802de04c75434c0b61b7804b2558f88a387555a
parent f3fe1d60eeac2e8bd589024d55cd46b81cedb72b

libmediadrm: comprehensive exception messages

Bug: 162255728
Test: MediaDrmTest#testExceptionMessage
Change-Id: I1c4482d66d1a564d76ce4a2619514cd2d64fa648

drm/libmediadrm/interface/mediadrm/DrmUtils.h

diff --git a/drm/libmediadrm/interface/mediadrm/DrmUtils.h b/drm/libmediadrm/interface/mediadrm/DrmUtils.h
index 10b7207..4a169ee 100644
--- a/drm/libmediadrm/interface/mediadrm/DrmUtils.h
+++ b/drm/libmediadrm/interface/mediadrm/DrmUtils.h
@@ -23,8 +23,11 @@
 #include <android/hardware/drm/1.4/types.h>
 #include <media/stagefright/MediaErrors.h>
 #include <utils/Errors.h>  // for status_t
-#include <utils/Vector.h>
+#include <utils/Log.h>
+#include <utils/String8.h>
 #include <utils/StrongPointer.h>
+#include <utils/Vector.h>
+#include <ctime>
 #include <vector>
 
 
@@ -138,6 +141,54 @@
     return toStatusT(err);
 }
 
+namespace {
+static inline char logPriorityToChar(::V1_4::LogPriority priority) {
+    char p = 'U';
+    switch (priority) {
+        case ::V1_4::LogPriority::VERBOSE:  p = 'V'; break;
+        case ::V1_4::LogPriority::DEBUG:    p = 'D'; break;
+        case ::V1_4::LogPriority::INFO:     p = 'I'; break;
+        case ::V1_4::LogPriority::WARN:     p = 'W'; break;
+        case ::V1_4::LogPriority::ERROR:    p = 'E'; break;
+        case ::V1_4::LogPriority::FATAL:    p = 'F'; break;
+        default: p = 'U'; break;
+    }
+    return p;
+}
+}
+
+template<typename T>
+std::string GetExceptionMessage(status_t err, const char *msg, const sp<T> &iface) {
+    String8 msg8;
+    if (msg) {
+        msg8 += msg;
+        msg8 += ": ";
+    }
+    auto errStr = StrCryptoError(err);
+    msg8 += errStr.c_str();
+
+    Vector<::V1_4::LogMessage> logs;
+    if (iface->getLogMessages(logs) != NO_ERROR) {
+        return msg8.c_str();
+    }
+
+    for (auto log: logs) {
+        time_t seconds = log.timeMs / 1000;
+        int ms = log.timeMs % 1000;
+        char buf[64] = {0};
+        std::string timeStr = "00-00 00:00:00";
+        if (strftime(buf, sizeof buf, "%m-%d %H:%M:%S", std::localtime(&seconds))) {
+            timeStr = buf;
+        }
+
+        char p = logPriorityToChar(log.priority);
+        msg8 += String8::format("\n%s.%03d %c %s",
+                timeStr.c_str(), ms, p, log.message.c_str());
+    }
+
+    return msg8.c_str();
+}
+
 } // namespace DrmUtils
 } // namespace android
 #endif // ANDROID_DRMUTILS_H