Update clear key plugin appData to void*

bug: 77732157
test: CTS MediaCasTest; VTS VtsHalCasV1_0Target.
Change-Id: I4e78d08b164c71abfce012de10c3fa5a2c67664d
gugelfrei
Chong Zhang 6 years ago
parent 2383098d54
commit f872751f9b

@ -55,7 +55,7 @@ status_t ClearKeyCasFactory::queryPlugins(
status_t ClearKeyCasFactory::createPlugin( status_t ClearKeyCasFactory::createPlugin(
int32_t CA_system_id, int32_t CA_system_id,
uint64_t appData, void *appData,
CasPluginCallback callback, CasPluginCallback callback,
CasPlugin **plugin) { CasPlugin **plugin) {
if (!isSystemIdSupported(CA_system_id)) { if (!isSystemIdSupported(CA_system_id)) {
@ -83,7 +83,7 @@ status_t ClearKeyDescramblerFactory::createPlugin(
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
ClearKeyCasPlugin::ClearKeyCasPlugin( ClearKeyCasPlugin::ClearKeyCasPlugin(
uint64_t appData, CasPluginCallback callback) void *appData, CasPluginCallback callback)
: mCallback(callback), mAppData(appData) { : mCallback(callback), mAppData(appData) {
ALOGV("CTOR"); ALOGV("CTOR");
} }

@ -44,7 +44,7 @@ public:
std::vector<CasPluginDescriptor> *descriptors) const override; std::vector<CasPluginDescriptor> *descriptors) const override;
virtual status_t createPlugin( virtual status_t createPlugin(
int32_t CA_system_id, int32_t CA_system_id,
uint64_t appData, void *appData,
CasPluginCallback callback, CasPluginCallback callback,
CasPlugin **plugin) override; CasPlugin **plugin) override;
}; };
@ -62,7 +62,7 @@ public:
class ClearKeyCasPlugin : public CasPlugin { class ClearKeyCasPlugin : public CasPlugin {
public: public:
ClearKeyCasPlugin(uint64_t appData, CasPluginCallback callback); ClearKeyCasPlugin(void *appData, CasPluginCallback callback);
virtual ~ClearKeyCasPlugin(); virtual ~ClearKeyCasPlugin();
virtual status_t setPrivateData( virtual status_t setPrivateData(
@ -94,7 +94,7 @@ private:
Mutex mKeyFetcherLock; Mutex mKeyFetcherLock;
std::unique_ptr<KeyFetcher> mKeyFetcher; std::unique_ptr<KeyFetcher> mKeyFetcher;
CasPluginCallback mCallback; CasPluginCallback mCallback;
uint64_t mAppData; void* mAppData;
}; };
class ClearKeyDescramblerPlugin : public DescramblerPlugin { class ClearKeyDescramblerPlugin : public DescramblerPlugin {

@ -49,7 +49,7 @@ status_t MockCasFactory::queryPlugins(
status_t MockCasFactory::createPlugin( status_t MockCasFactory::createPlugin(
int32_t CA_system_id, int32_t CA_system_id,
uint64_t /*appData*/, void* /*appData*/,
CasPluginCallback /*callback*/, CasPluginCallback /*callback*/,
CasPlugin **plugin) { CasPlugin **plugin) {
if (!isSystemIdSupported(CA_system_id)) { if (!isSystemIdSupported(CA_system_id)) {

@ -39,7 +39,7 @@ public:
std::vector<CasPluginDescriptor> *descriptors) const override; std::vector<CasPluginDescriptor> *descriptors) const override;
virtual status_t createPlugin( virtual status_t createPlugin(
int32_t CA_system_id, int32_t CA_system_id,
uint64_t appData, void *appData,
CasPluginCallback callback, CasPluginCallback callback,
CasPlugin **plugin) override; CasPlugin **plugin) override;
}; };

Loading…
Cancel
Save