commit 0cc3da84213d90d2bf988c2c9173fa11894680a7
author Sohail Nagaraj <sohail.nagaraj@ittiam.com> Wed Nov 30 10:22:37 2022 +0530
committer Sohail Nagaraj <sohail.nagaraj@ittiam.com> Sat Dec 10 00:46:54 2022 +0530
tree c351718b259e3bca75b2caf83f0a18f8ba690569
parent bd526c265548e4528a2b0175df2a24a69947bf1a

New IDrm API return type

Bug: 260065906

Test: gts-tradefed run gts --abi arm64-v8a -m GtsMediaTestCases
Test: atest CtsMediaDrmFrameworkTestCases

Change-Id: Iaa017050e28f6412f62bd9d4a16e62fcea253e32

drm/libmediadrm/interface/mediadrm/DrmUtils.h

diff --git a/drm/libmediadrm/interface/mediadrm/DrmUtils.h b/drm/libmediadrm/interface/mediadrm/DrmUtils.h
index 980ce55..32390d6 100644
--- a/drm/libmediadrm/interface/mediadrm/DrmUtils.h
+++ b/drm/libmediadrm/interface/mediadrm/DrmUtils.h
@@ -22,6 +22,7 @@
 #include <android/hardware/drm/1.4/IDrmPlugin.h>
 #include <android/hardware/drm/1.4/types.h>
 #include <media/stagefright/MediaErrors.h>
+#include <mediadrm/DrmStatus.h>
 #include <utils/Errors.h>  // for status_t
 #include <utils/Log.h>
 #include <utils/String8.h>
@@ -198,7 +199,7 @@
     return toStatusT_1_4(err);
 }
 
-inline status_t statusAidlToStatusT(::ndk::ScopedAStatus &statusAidl) {
+inline DrmStatus statusAidlToDrmStatus(::ndk::ScopedAStatus& statusAidl) {
     if (statusAidl.isOk()) return OK;
     if (statusAidl.getExceptionCode() != EX_SERVICE_SPECIFIC) return DEAD_OBJECT;
     auto status = static_cast<StatusAidl>(statusAidl.getServiceSpecificError());