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/include_hidl/WVDrmPlugin.h

@@ -11,6 +11,7 @@
 
 #include "cdm_client_property_set.h"
 #include "cdm_identifier.h"
+#include "log.h"
 #include "wv_cdm_event_listener.h"
 #include "wv_content_decryption_module.h"
 #include "OEMCryptoCENC.h"
@@ -264,6 +265,10 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
  private:
   WVDRM_DISALLOW_COPY_AND_ASSIGN_AND_NEW(WVDrmPlugin);
 
+  // List this field first so it is destructed last; ensure logging uid
+  // is cleared right before plugin is destructed.
+  wvcdm::LoggingUidSetter mLoggingUidSetter;
+
   struct CryptoSession {
    public:
     CryptoSession()
@@ -414,6 +419,8 @@ struct WVDrmPlugin : public ::drm::V1_4::IDrmPlugin, IDrmPluginListener,
     // until a call to getCdmIdentifier.
     bool is_sealed() { return mIsIdentifierSealed; }
 
+    uint32_t user_id() const { return mCdmIdentifier.user_id; }
+
    private:
     WVDRM_DISALLOW_COPY_AND_ASSIGN(CdmIdentifierBuilder);
 

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(

libwvdrmengine/mediadrm/test/Android.mk

@@ -35,6 +35,7 @@ LOCAL_SHARED_LIBRARIES := \
   libbase \
   libcrypto \
   libdl \
+  libhidlbase \
   liblog \
   libprotobuf-cpp-lite \
   libutils \