Merge "CastAuthApk: Add logs on mediaDRM plugin" into tm-qpr-dev am: c88302e8ca

Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/20189552

Change-Id: Iac0184464d3117e2de86a46e0078bd8468dc8e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Haoming Wu 2022-10-19 12:31:48 +00:00 committed by Automerger Merge Worker
commit d8b1550d80

View file

@ -116,6 +116,7 @@ std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
*_aidl_return = std::vector<uint8_t>(); *_aidl_return = std::vector<uint8_t>();
void* cast_auth_handle = ::dlopen("libcast_auth.so", RTLD_LAZY); void* cast_auth_handle = ::dlopen("libcast_auth.so", RTLD_LAZY);
if (!cast_auth_handle) { if (!cast_auth_handle) {
ALOGE("Fail to get TA for signing");
return toNdkScopedAStatus(status); return toNdkScopedAStatus(status);
} }
typedef bool (*func_type)(const std::vector<uint8_t>&, typedef bool (*func_type)(const std::vector<uint8_t>&,
@ -123,6 +124,7 @@ std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
func_type sign_hash_func = func_type sign_hash_func =
reinterpret_cast<func_type>(::dlsym(cast_auth_handle, "SignHash")); reinterpret_cast<func_type>(::dlsym(cast_auth_handle, "SignHash"));
if (!sign_hash_func) { if (!sign_hash_func) {
ALOGE("Fail to apply signing method");
dlclose(cast_auth_handle); dlclose(cast_auth_handle);
return toNdkScopedAStatus(status); return toNdkScopedAStatus(status);
} }
@ -133,6 +135,7 @@ std::vector<uint8_t> readBinaryFile(const std::string& file_path) {
*_aidl_return = signature; *_aidl_return = signature;
status = Status::OK; status = Status::OK;
} }
ALOGE("Get empty result from TA");
return toNdkScopedAStatus(status); return toNdkScopedAStatus(status);
} }