From c7ab0c8c12e5946dbb2aaf5eb7b3a26b350e3628 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:20:26 +0000 Subject: [PATCH 01/11] update services/drm_service/client/include/key_session_service_proxy.h. Signed-off-by: baoxy92 --- services/drm_service/client/include/key_session_service_proxy.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/drm_service/client/include/key_session_service_proxy.h b/services/drm_service/client/include/key_session_service_proxy.h index 4d88e9b0..8adf2244 100644 --- a/services/drm_service/client/include/key_session_service_proxy.h +++ b/services/drm_service/client/include/key_session_service_proxy.h @@ -41,7 +41,6 @@ public: int32_t GetMediaDecryptModule(sptr &decryptModule) override; int32_t GetContentProtectionLevel(IMediaKeySessionService::ContentProtectionLevel *securityLevel) override; int32_t RequireSecureDecoderModule(std::string &mimeType, bool *status) override; - int32_t SetListenerObject(const sptr &object) override; int32_t SetCallback(sptr &callback) override; private: From b6c224e29264246bdf0d3fe0f0dc0857ee2dfad5 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:22:30 +0000 Subject: [PATCH 02/11] update services/drm_service/client/include/mediakeysystem_service_proxy.h. Signed-off-by: baoxy92 --- .../drm_service/client/include/mediakeysystem_service_proxy.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/drm_service/client/include/mediakeysystem_service_proxy.h b/services/drm_service/client/include/mediakeysystem_service_proxy.h index a0d02754..3c302a5a 100644 --- a/services/drm_service/client/include/mediakeysystem_service_proxy.h +++ b/services/drm_service/client/include/mediakeysystem_service_proxy.h @@ -46,7 +46,6 @@ public: int32_t GetOfflineMediaKeyStatus(std::vector &licenseId, IMediaKeySessionService::OfflineMediaKeyStatus &status) override; int32_t ClearOfflineMediaKeys(std::vector &licenseId) override; - int32_t SetListenerObject(const sptr &object) override; int32_t SetCallback(sptr &callback) override; private: From eb13d61a2a292abd4a94a21a633b6e30fc66516c Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:23:32 +0000 Subject: [PATCH 03/11] update services/drm_service/client/src/key_session_service_proxy.cpp. Signed-off-by: baoxy92 --- .../client/src/key_session_service_proxy.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/services/drm_service/client/src/key_session_service_proxy.cpp b/services/drm_service/client/src/key_session_service_proxy.cpp index acf4b27b..3fd219b3 100644 --- a/services/drm_service/client/src/key_session_service_proxy.cpp +++ b/services/drm_service/client/src/key_session_service_proxy.cpp @@ -404,23 +404,6 @@ int32_t MediaKeySessionServiceProxy::RequireSecureDecoderModule(std::string &mim return ret; } -int32_t MediaKeySessionServiceProxy::SetListenerObject(const sptr &object) -{ - DRM_INFO_LOG("SetListenerObject enter."); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - data.WriteInterfaceToken(GetDescriptor()); - (void)data.WriteRemoteObject(object); - int ret = Remote()->SendRequest(MEDIA_KEY_SESSION_SET_LISTENER_OBJ, data, reply, option); - if (ret != DRM_OK) { - DRM_ERR_LOG("Set listener obj failed, errcode: %{public}d", ret); - return IPC_PROXY_ERR; - } - return reply.ReadInt32(); -} - int32_t MediaKeySessionServiceProxy::SetCallback(sptr &callback) { DRM_INFO_LOG("SetCallback enter."); From c0eff8db5fcc41cd8c208dcb6ae546932ba9bf58 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:23:56 +0000 Subject: [PATCH 04/11] update services/drm_service/client/src/mediakeysystem_service_proxy.cpp. Signed-off-by: baoxy92 --- .../src/mediakeysystem_service_proxy.cpp | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/services/drm_service/client/src/mediakeysystem_service_proxy.cpp b/services/drm_service/client/src/mediakeysystem_service_proxy.cpp index 67b78ccb..35e6d76a 100644 --- a/services/drm_service/client/src/mediakeysystem_service_proxy.cpp +++ b/services/drm_service/client/src/mediakeysystem_service_proxy.cpp @@ -25,26 +25,6 @@ MediaKeySystemServiceProxy::MediaKeySystemServiceProxy(const sptr { } -int32_t MediaKeySystemServiceProxy::SetListenerObject(const sptr &object) -{ - DRM_INFO_LOG("SetListenerObject."); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - data.WriteInterfaceToken(GetDescriptor()); - if (!data.WriteRemoteObject(object)) { - DRM_ERR_LOG("WriteRemoteObject failed."); - return IPC_PROXY_ERR; - } - int ret = Remote()->SendRequest(MEDIA_KEY_SYSTEM_SET_LISTENER_OBJ, data, reply, option); - if (ret != DRM_OK) { - DRM_ERR_LOG("Set listener obj failed, errcode: %{public}d", ret); - return IPC_PROXY_ERR; - } - return reply.ReadInt32(); -} - int32_t MediaKeySystemServiceProxy::Release() { DRM_INFO_LOG("Release enter."); From 6874d0557baafd327d02647a8ed36eb017f76a23 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:24:37 +0000 Subject: [PATCH 05/11] update services/drm_service/ipc/i_keysession_service.h. Signed-off-by: baoxy92 --- services/drm_service/ipc/i_keysession_service.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/drm_service/ipc/i_keysession_service.h b/services/drm_service/ipc/i_keysession_service.h index 4fb36354..0a70e6ef 100644 --- a/services/drm_service/ipc/i_keysession_service.h +++ b/services/drm_service/ipc/i_keysession_service.h @@ -97,7 +97,6 @@ public: virtual int32_t ClearMediaKeys() = 0; virtual int32_t GetContentProtectionLevel(IMediaKeySessionService::ContentProtectionLevel *securityLevel) = 0; virtual int32_t RequireSecureDecoderModule(std::string &mimeType, bool *status) = 0; - virtual int32_t SetListenerObject(const sptr &object) = 0; virtual int32_t SetCallback(sptr &callback) = 0; DECLARE_INTERFACE_DESCRIPTOR(u"IMediaKeySessionService"); }; From dda6026a5553c21f9936f3288a3af4366ca3eda1 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:24:59 +0000 Subject: [PATCH 06/11] update services/drm_service/ipc/i_mediakeysystem_service.h. Signed-off-by: baoxy92 --- services/drm_service/ipc/i_mediakeysystem_service.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/drm_service/ipc/i_mediakeysystem_service.h b/services/drm_service/ipc/i_mediakeysystem_service.h index 600c54f1..d5300536 100644 --- a/services/drm_service/ipc/i_mediakeysystem_service.h +++ b/services/drm_service/ipc/i_mediakeysystem_service.h @@ -76,7 +76,6 @@ public: virtual int32_t GetOfflineMediaKeyStatus(std::vector &licenseId, IMediaKeySessionService::OfflineMediaKeyStatus &status) = 0; virtual int32_t ClearOfflineMediaKeys(std::vector &licenseId) = 0; - virtual int32_t SetListenerObject(const sptr &object) = 0; virtual int32_t SetCallback(sptr &callback) = 0; DECLARE_INTERFACE_DESCRIPTOR(u"IMediaKeySystemSystemService"); }; From 983805afcf6f518ebe4c7f78b897b0e56a6ff12b Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:25:36 +0000 Subject: [PATCH 07/11] update services/drm_service/ipc/remote_request_code.h. Signed-off-by: baoxy92 --- services/drm_service/ipc/remote_request_code.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/drm_service/ipc/remote_request_code.h b/services/drm_service/ipc/remote_request_code.h index 527d9eff..0c41f457 100644 --- a/services/drm_service/ipc/remote_request_code.h +++ b/services/drm_service/ipc/remote_request_code.h @@ -41,7 +41,6 @@ enum MediaKeySystemServiceRequestCode { MEDIA_KEY_SYSTEM_GET_OFFLINELICENSEIDS, MEDIA_KEY_SYSTEM_GET_OFFLINEKEY_STATUS, MEDIA_KEY_SYSTEM_REMOVE_OFFLINELICENSE, - MEDIA_KEY_SYSTEM_SET_LISTENER_OBJ, MEDIA_KEY_SYSTEM_SETCALLBACK, }; @@ -57,7 +56,6 @@ enum MediaKeySessionServiceRequestCode { MEDIA_KEY_SESSION_REMOVE_LICENSE, MEDIA_KEY_SESSION_SET_CALLBACK, MEDIA_KEY_SESSION_REQUIRE_SECURE_DECODER, - MEDIA_KEY_SESSION_SET_LISTENER_OBJ, MEDIA_KEY_SESSION_GETSECURITYLEVEL, }; From 1a2f5befbf1baaeb3e34b8d809a094180c3ce6b5 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:26:13 +0000 Subject: [PATCH 08/11] update services/drm_service/server/include/key_session_service_stub.h. Signed-off-by: baoxy92 --- services/drm_service/server/include/key_session_service_stub.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/drm_service/server/include/key_session_service_stub.h b/services/drm_service/server/include/key_session_service_stub.h index 9f5b8d79..57aac4b3 100644 --- a/services/drm_service/server/include/key_session_service_stub.h +++ b/services/drm_service/server/include/key_session_service_stub.h @@ -32,7 +32,6 @@ public: ~MediaKeySessionServiceStub() = default; virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - int32_t SetListenerObject(const sptr &object) override; private: void MediaKeySessionClientDied(pid_t pid); From 8bc1a0e464acf023fc09bc81886a0c1a926dbc38 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:26:45 +0000 Subject: [PATCH 09/11] update services/drm_service/server/include/mediakeysystem_service_stub.h. Signed-off-by: baoxy92 --- .../drm_service/server/include/mediakeysystem_service_stub.h | 1 - 1 file changed, 1 deletion(-) diff --git a/services/drm_service/server/include/mediakeysystem_service_stub.h b/services/drm_service/server/include/mediakeysystem_service_stub.h index 6e028fae..d9fb4c8d 100644 --- a/services/drm_service/server/include/mediakeysystem_service_stub.h +++ b/services/drm_service/server/include/mediakeysystem_service_stub.h @@ -34,7 +34,6 @@ public: ~MediaKeySystemServiceStub(); virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - int32_t SetListenerObject(const sptr &object) override; private: void MediaKeySystemClientDied(pid_t pid); From 7a5a2fd658d31e5d24a74816e37439bedd5fd05e Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:27:56 +0000 Subject: [PATCH 10/11] update services/drm_service/server/src/key_session_service_stub.cpp. Signed-off-by: baoxy92 --- .../server/src/key_session_service_stub.cpp | 43 ------------------- 1 file changed, 43 deletions(-) diff --git a/services/drm_service/server/src/key_session_service_stub.cpp b/services/drm_service/server/src/key_session_service_stub.cpp index ac48c4ca..b1a1bbe8 100644 --- a/services/drm_service/server/src/key_session_service_stub.cpp +++ b/services/drm_service/server/src/key_session_service_stub.cpp @@ -65,9 +65,6 @@ static int32_t ProcessRequireSecureDecoder(MediaKeySessionServiceStub *stub, Mes static int32_t ProcessGetContentProtectionLevel(MediaKeySessionServiceStub *stub, MessageParcel &data, MessageParcel &reply, MessageOption &option); -static int32_t ProcessSetListenerObject(MediaKeySessionServiceStub *stub, MessageParcel &data, - MessageParcel &reply, MessageOption &option); - static struct ProcessRemoteRequestFuncArray g_mediaKeySessionServiceStubRequestProcessFunc[] = { {GET_MEDIA_DECRYPT_MODULE, ProcessGetMediaDecryptModule}, {KEY_SESSION_RELEASE, ProcessReleaseKeySession}, @@ -80,7 +77,6 @@ static struct ProcessRemoteRequestFuncArray g_mediaKeySessionServiceStubRequestP {MEDIA_KEY_SESSION_REMOVE_LICENSE, ProcessClearMediaKeys}, {MEDIA_KEY_SESSION_SET_CALLBACK, ProcessSetCallback}, {MEDIA_KEY_SESSION_REQUIRE_SECURE_DECODER, ProcessRequireSecureDecoder}, - {MEDIA_KEY_SESSION_SET_LISTENER_OBJ, ProcessSetListenerObject}, {MEDIA_KEY_SESSION_GETSECURITYLEVEL, ProcessGetContentProtectionLevel}, }; @@ -342,45 +338,6 @@ void MediaKeySessionServiceStub::MediaKeySessionClientDied(pid_t pid) DRM_ERR_LOG("MediaKeySession client has died, pid:%{public}d", pid); } -int32_t MediaKeySessionServiceStub::SetListenerObject(const sptr &object) -{ - std::lock_guard lock(drmSessionStubMutex_); - pid_t pid = IPCSkeleton::GetCallingPid(); - if (clientListener_ != nullptr && clientListener_->AsObject() != nullptr && deathRecipient_ != nullptr) { - DRM_DEBUG_LOG("This MediaKeySessionServiceStub has already set listener!"); - (void)clientListener_->AsObject()->RemoveDeathRecipient(deathRecipient_); - deathRecipient_ = nullptr; - clientListener_ = nullptr; - } - - DRM_CHECK_AND_RETURN_RET_LOG(object != nullptr, DRM_MEMORY_ERROR, "set listener object is nullptr"); - sptr clientListener_ = iface_cast(object); - DRM_CHECK_AND_RETURN_RET_LOG( - clientListener_ != nullptr, DRM_MEMORY_ERROR, "failed to convert IDrmListener"); - deathRecipient_ = new (std::nothrow) DrmDeathRecipient(pid); - DRM_CHECK_AND_RETURN_RET_LOG(deathRecipient_ != nullptr, DRM_MEMORY_ERROR, "failed to new DrmDeathRecipient"); - deathRecipient_->SetNotifyCb([this] (pid_t pid) { - this->MediaKeySessionClientDied(pid); - }); - if (clientListener_->AsObject() != nullptr) { - (void)clientListener_->AsObject()->AddDeathRecipient(deathRecipient_); - } - DRM_DEBUG_LOG("MediaKeySession client pid pid:%{public}d", pid); - return DRM_OK; -} - -static int32_t ProcessSetListenerObject(MediaKeySessionServiceStub *stub, MessageParcel &data, - MessageParcel &reply, MessageOption &option) -{ - DRM_INFO_LOG("ProcessSetListenerObject."); - (void)reply; - sptr object = data.ReadRemoteObject(); - int32_t ret = stub->SetListenerObject(object); - DRM_CHECK_AND_RETURN_RET_LOG(ret == DRM_OK, ret, - "ProcessSetListenerObject faild, errCode:%{public}d", ret); - return ret; -} - static int32_t ProcessGetContentProtectionLevel(MediaKeySessionServiceStub *stub, MessageParcel &data, MessageParcel &reply, MessageOption &option) { From 86b7abab586386290bd2eb8f6aa1539e259af469 Mon Sep 17 00:00:00 2001 From: baoxy92 Date: Tue, 31 Dec 2024 08:28:36 +0000 Subject: [PATCH 11/11] update services/drm_service/server/src/mediakeysystem_service_stub.cpp. Signed-off-by: baoxy92 --- .../src/mediakeysystem_service_stub.cpp | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/services/drm_service/server/src/mediakeysystem_service_stub.cpp b/services/drm_service/server/src/mediakeysystem_service_stub.cpp index 52efdf2a..b7591928 100644 --- a/services/drm_service/server/src/mediakeysystem_service_stub.cpp +++ b/services/drm_service/server/src/mediakeysystem_service_stub.cpp @@ -72,9 +72,6 @@ static int32_t ProcessGetOfflineMediaKeyStatus(MediaKeySystemServiceStub *stub, static int32_t ProcessRemoveOfflineMediaKey(MediaKeySystemServiceStub *stub, MessageParcel &data, MessageParcel &reply, MessageOption &option); -static int32_t ProcessSetListenerObject(MediaKeySystemServiceStub *stub, MessageParcel &data, MessageParcel &reply, - MessageOption &option); - static int32_t ProcessSetCallabck(MediaKeySystemServiceStub *stub, MessageParcel &data, MessageParcel &reply, MessageOption &option); @@ -93,7 +90,6 @@ static struct ProcessRemoteRequestFuncArray g_mediaKeySystemServiceStubRequestPr {MEDIA_KEY_SYSTEM_GET_OFFLINELICENSEIDS, ProcessGetOfflineMediaKeyIds}, {MEDIA_KEY_SYSTEM_GET_OFFLINEKEY_STATUS, ProcessGetOfflineMediaKeyStatus}, {MEDIA_KEY_SYSTEM_REMOVE_OFFLINELICENSE, ProcessRemoveOfflineMediaKey}, - {MEDIA_KEY_SYSTEM_SET_LISTENER_OBJ, ProcessSetListenerObject}, {MEDIA_KEY_SYSTEM_SETCALLBACK, ProcessSetCallabck}, }; @@ -379,43 +375,6 @@ void MediaKeySystemServiceStub::MediaKeySystemClientDied(pid_t pid) DRM_ERR_LOG("MediaKeySystemService client has died, pid:%{public}d", pid); } -int32_t MediaKeySystemServiceStub::SetListenerObject(const sptr &object) -{ - pid_t pid = IPCSkeleton::GetCallingPid(); - if (clientListener_ != nullptr && clientListener_->AsObject() != nullptr && deathRecipient_ != nullptr) { - DRM_DEBUG_LOG("This MediaKeySystemServiceStub has already set listener!"); - (void)clientListener_->AsObject()->RemoveDeathRecipient(deathRecipient_); - deathRecipient_ = nullptr; - clientListener_ = nullptr; - } - - DRM_CHECK_AND_RETURN_RET_LOG(object != nullptr, DRM_MEMORY_ERROR, "set listener object is nullptr"); - sptr clientListener_ = iface_cast(object); - DRM_CHECK_AND_RETURN_RET_LOG( - clientListener_ != nullptr, DRM_MEMORY_ERROR, "failed to convert IDrmListener"); - deathRecipient_ = new (std::nothrow) DrmDeathRecipient(pid); - DRM_CHECK_AND_RETURN_RET_LOG(deathRecipient_ != nullptr, DRM_MEMORY_ERROR, "failed to new DrmDeathRecipient"); - deathRecipient_->SetNotifyCb([this] (pid_t pid) { - this->MediaKeySystemClientDied(pid); - }); - if (clientListener_->AsObject() != nullptr) { - (void)clientListener_->AsObject()->AddDeathRecipient(deathRecipient_); - } - return DRM_OK; -} - -static int32_t ProcessSetListenerObject(MediaKeySystemServiceStub *stub, MessageParcel &data, MessageParcel &reply, - MessageOption &option) -{ - DRM_INFO_LOG("ProcessSetListenerObject."); - (void)reply; - sptr object = data.ReadRemoteObject(); - int32_t ret = stub->SetListenerObject(object); - DRM_CHECK_AND_RETURN_RET_LOG(ret == DRM_OK, ret, - "ProcessSetListenerObject faild, errCode:%{public}d", ret); - return ret; -} - static int32_t ProcessSetCallabck(MediaKeySystemServiceStub *stub, MessageParcel &data, MessageParcel &reply, MessageOption &option) {