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

Call AIBinder_setRequestingSid from createBinder override function

Browse Source 
AIBinder_setRequestingSid must be called first upon creation of a
binder object before AIBinder_getCallingSid is called. Call
AIBinder_setRequestingSid in the createBinder override function
for WVDrmFactory, WVDrmPlugin and WVCryptoPlugin classes.

Test: Play TV streaming
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -a

Bug: 237613676
Change-Id: I9dde4715ba2003deb463bd75b23e1ebc2f22a764
This commit is contained in:
Edwin Wong
2022-07-30 01:50:48 +00:00
parent 6a0d1ce668
commit 6797b8eb8a
8 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/mediacrypto/aidl_include/WVCryptoPlugin.h
View File

@@ -76,6 +76,8 @@ class WVCryptoPlugin : public ::aidl::android::hardware::drm::BnCryptoPlugin {
::android::sp<wvcdm::WvContentDecryptionModule> const mCDM;
uint32_t mUserId;
::ndk::SpAIBinder createBinder() override;
::aidl::android::hardware::drm::Status attemptDecrypt(
const wvcdm::CdmDecryptionParametersV16& params,
bool haveEncryptedSubsamples, std::string* errorDetailMsg);

7
libwvdrmengine/mediacrypto/aidl_src/WVCryptoPlugin.cpp
View File

@@ -9,6 +9,7 @@
#include "WVCryptoPlugin.h"
#include <aidlcommonsupport/NativeHandle.h>
#include <android/binder_ibinder_platform.h>
#include <sys/mman.h>
#include <utils/Log.h>
@@ -289,6 +290,12 @@ SharedBufferBase::~SharedBufferBase() {
return toNdkScopedAStatus(Status::OK, detailedError);
}
::ndk::SpAIBinder WVCryptoPlugin::createBinder() {
auto binder = BnCryptoPlugin::createBinder();
AIBinder_setRequestingSid(binder.get(), true);
return binder;
}
Status WVCryptoPlugin::attemptDecrypt(const CdmDecryptionParametersV16& params,
bool hasProtectedData,
std::string* errorDetailMsg) {