commit bd790123219a3777b35c41666348a249b97f914b
author Robert Shih <robertshih@google.com> Mon Mar 01 20:45:31 2021 -0800
committer Robert Shih <robertshih@google.com> Mon Mar 01 22:19:29 2021 -0800
tree efe165f1938271d7b166e8a3a2232199982b9a51
parent 8b57c7220e9f332ebb9c8e94c5db196978d6c92c

libmediadrm: log uuid on errors

Other misc changes:
* Cleanup include ordering
* Log more messages e.g. when scheme not supported

Bug: 162255728
Test: MediaDrmTest#testGetLogMessages
Change-Id: I6d82ed5374df90091fa087d7b3094f34211a9196

drm/libmediadrm/DrmUtils.cpp

diff --git a/drm/libmediadrm/DrmUtils.cpp b/drm/libmediadrm/DrmUtils.cpp
index f7e6717..9b125af 100644
--- a/drm/libmediadrm/DrmUtils.cpp
+++ b/drm/libmediadrm/DrmUtils.cpp
@@ -108,7 +108,7 @@
     factory->createPlugin(toHidlArray16(uuid), hidl_string(appPackageName),
                           [&](::V1_0::Status status, const sp<::V1_0::IDrmPlugin> &hPlugin) {
                               if (status != ::V1_0::Status::OK) {
-                                  LOG2BE("MakeDrmPlugin failed: %d", status);
+                                  LOG2BE(uuid, "MakeDrmPlugin failed: %d", status);
                                   return;
                               }
                               plugin = hPlugin;
@@ -123,7 +123,7 @@
     factory->createPlugin(toHidlArray16(uuid), toHidlVec(initData, initDataSize),
                           [&](::V1_0::Status status, const sp<::V1_0::ICryptoPlugin> &hPlugin) {
                               if (status != ::V1_0::Status::OK) {
-                                  LOG2BE("MakeCryptoPlugin failed: %d", status);
+                                  LOG2BE(uuid, "MakeCryptoPlugin failed: %d", status);
                                   return;
                               }
                               plugin = hPlugin;