widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wv hidl factories: cleanup includes & logging

Browse Source 
Addresses code review comments from http://go/wvgerrit/89383
* Use WVCdm LOG_TAG
* Cleanup includes

Bug: 134787536
Test: build
Change-Id: I2576127489205de62902d6c290f9293947976094
This commit is contained in:
Robert Shih
2019-11-11 16:31:00 -08:00
parent e083240191
commit 84061e93d6
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/src_hidl/WVCryptoFactory.cpp
View File

@@ -5,9 +5,9 @@
// //
//#define LOG_NDEBUG 0 //#define LOG_NDEBUG 0
#define LOG_TAG "WVCryptoFactory" #define LOG_TAG "WVCdm"
#include <utils/Log.h>
#include <hwbinder/IPCThreadState.h> #include <hwbinder/IPCThreadState.h>
#include <utils/Log.h>
#include "WVCryptoFactory.h" #include "WVCryptoFactory.h"
@@ -34,8 +34,8 @@ Return<void> WVCryptoFactory::createPlugin(
const auto& self = android::hardware::IPCThreadState::self(); const auto& self = android::hardware::IPCThreadState::self();
const char* sid = self->getCallingSid(); const char* sid = self->getCallingSid();
sid = strstr(sid, "mediadrmserver") ? sid : (sid ? "app" : "nullptr"); sid = sid ? (strstr(sid, "mediadrmserver") ? sid : "app") : "nullptr";
ALOGI("%s: calling sid [%s]", __func__, sid); ALOGI("[%s] calling %s", sid, __PRETTY_FUNCTION__);
sp<ICryptoPlugin> plugin; sp<ICryptoPlugin> plugin;
if (!isCryptoSchemeSupported(uuid.data())) { if (!isCryptoSchemeSupported(uuid.data())) {

9
libwvdrmengine/src_hidl/WVDrmFactory.cpp
View File

@@ -5,10 +5,9 @@
// //
//#define LOG_NDEBUG 0 //#define LOG_NDEBUG 0
#define LOG_TAG "WVDrmFactory" #define LOG_TAG "WVCdm"
#include <cstring>
#include <utils/Log.h>
#include <hwbinder/IPCThreadState.h> #include <hwbinder/IPCThreadState.h>
#include <utils/Log.h>
#include "WVDrmFactory.h" #include "WVDrmFactory.h"
@@ -67,8 +66,8 @@ Return<void> WVDrmFactory::createPlugin(
const auto& self = android::hardware::IPCThreadState::self(); const auto& self = android::hardware::IPCThreadState::self();
const char* sid = self->getCallingSid(); const char* sid = self->getCallingSid();
sid = strstr(sid, "mediadrmserver") ? sid : (sid ? "app" : "nullptr"); sid = sid ? (strstr(sid, "mediadrmserver") ? sid : "app") : "nullptr";
ALOGI("%s: calling sid [%s]", __func__, sid); ALOGI("[%s] calling %s", sid, __PRETTY_FUNCTION__);
sp<IDrmPlugin> plugin; sp<IDrmPlugin> plugin;
if (!isCryptoSchemeSupported(uuid.data())) { if (!isCryptoSchemeSupported(uuid.data())) {