From e083240191972af806f6ddbfa36f7cb145ae0d2d Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Thu, 7 Nov 2019 12:22:02 -0800
Subject: [PATCH] wv hidl factories: getCallingSid logging

[ Merge of http://go/wvgerrit/89383 ]

Bug: 134787536
Test: check calling sid in logs
Change-Id: If47ccaf9296a157b72181fb2bd00318bb957c15c
---
 libwvdrmengine/src_hidl/WVCryptoFactory.cpp | 8 +++++++-
 libwvdrmengine/src_hidl/WVDrmFactory.cpp    | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/libwvdrmengine/src_hidl/WVCryptoFactory.cpp b/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
index c5adc955..1cb08b2a 100644
--- a/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVCryptoFactory.cpp
@@ -5,8 +5,9 @@
 //
 
 //#define LOG_NDEBUG 0
-#define LOG_TAG "WVCdm"
+#define LOG_TAG "WVCryptoFactory"
 #include <utils/Log.h>
+#include <hwbinder/IPCThreadState.h>
 
 #include "WVCryptoFactory.h"
 
@@ -31,6 +32,11 @@ Return<void> WVCryptoFactory::createPlugin(
     const hidl_vec<uint8_t>& initData,
     createPlugin_cb _hidl_cb) {
 
+  const auto& self = android::hardware::IPCThreadState::self();
+  const char* sid = self->getCallingSid();
+  sid = strstr(sid, "mediadrmserver") ? sid : (sid ? "app" : "nullptr");
+  ALOGI("%s: calling sid [%s]", __func__, sid);
+
   sp<ICryptoPlugin> plugin;
   if (!isCryptoSchemeSupported(uuid.data())) {
     ALOGE("Widevine Drm HAL: failed to create crypto plugin, " \
diff --git a/libwvdrmengine/src_hidl/WVDrmFactory.cpp b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
index 560ba3f5..2c89e47d 100644
--- a/libwvdrmengine/src_hidl/WVDrmFactory.cpp
+++ b/libwvdrmengine/src_hidl/WVDrmFactory.cpp
@@ -5,8 +5,10 @@
 //
 
 //#define LOG_NDEBUG 0
-#define LOG_TAG "WVCdm"
+#define LOG_TAG "WVDrmFactory"
+#include <cstring>
 #include <utils/Log.h>
+#include <hwbinder/IPCThreadState.h>
 
 #include "WVDrmFactory.h"
 
@@ -63,6 +65,11 @@ Return<void> WVDrmFactory::createPlugin(
     const hidl_string& appPackageName,
     createPlugin_cb _hidl_cb) {
 
+  const auto& self = android::hardware::IPCThreadState::self();
+  const char* sid = self->getCallingSid();
+  sid = strstr(sid, "mediadrmserver") ? sid : (sid ? "app" : "nullptr");
+  ALOGI("%s: calling sid [%s]", __func__, sid);
+
   sp<IDrmPlugin> plugin;
   if (!isCryptoSchemeSupported(uuid.data())) {
     ALOGE("Widevine Drm HAL: failed to create drm plugin, " \