Merge "wvcdm: filter logs by app uid" into sc-dev am: 1f796bc4e3

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13577645

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9084b3e16655257555a3fbdd6b2cf1644f8d834

libwvdrmengine/mediacrypto/src_hidl/WVCryptoPlugin.cpp

@@ -15,6 +15,7 @@
 #include <iterator>
 
 #include "HidlTypes.h"
+#include "log.h"
 #include "mapErrors-inl.h"
 #include "OEMCryptoCENC.h"
 #include "openssl/sha.h"
@@ -56,12 +57,21 @@ using wvcdm::WvContentDecryptionModule;
 
 WVCryptoPlugin::WVCryptoPlugin(const void* data, size_t size,
                                const sp<WvContentDecryptionModule>& cdm)
-  : mCDM(cdm){
+  : mCDM(cdm),
+    mUserId(wvcdm::UNKNOWN_UID) {
   if (data != NULL) {
     mSessionId.assign(static_cast<const char *>(data), size);
   }
   if (!mCDM->IsOpenSession(mSessionId)) {
     mSessionId.clear();
+  } else {
+    mCDM->GetSessionUserId(mSessionId, &mUserId);
+  }
+}
+
+WVCryptoPlugin::~WVCryptoPlugin() {
+  if (wvcdm::UNKNOWN_UID != mUserId) {
+    wvcdm::SetLoggingUid(mUserId);
   }
 }