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/mediadrm/src_hidl/WVDrmPlugin.cpp

@@ -20,6 +20,7 @@
 #include "TypeConvert.h"
 #include "android-base/macros.h"
 #include "hidl_metrics_adapter.h"
+#include "log.h"
 #include "mapErrors-inl.h"
 #include "media/stagefright/MediaErrors.h"
 #include "openssl/sha.h"
@@ -198,6 +199,7 @@ WVDrmPlugin::WVDrmPlugin(const sp<WvContentDecryptionModule>& cdm,
     mAppPackageName(appPackageName) {}
 
 WVDrmPlugin::~WVDrmPlugin() {
+  wvcdm::SetLoggingUid(mCdmIdentifierBuilder.user_id());
   typedef map<CdmSessionId, CryptoSession>::iterator mapIterator;
   for (mapIterator iter = mCryptoSessions.begin();
        iter != mCryptoSessions.end();
@@ -2188,6 +2190,7 @@ WVDrmPlugin::CdmIdentifierBuilder::CdmIdentifierBuilder(
     mParent(parent) {
   mCdmIdentifier.app_package_name = mAppPackageName;
   mCdmIdentifier.unique_id = getNextUniqueId();
+  mCdmIdentifier.user_id = wvcdm::GetIpcCallingUid();
 }
 
 Status WVDrmPlugin::CdmIdentifierBuilder::getCdmIdentifier(