Fix getSupportedSchemes() in DrmHal.cpp
The original code returns the status of the first call to getSupportedSchemes() and ignores the status of the second call. This is incorrect because the second call may succeed even if the first call fails. The correct behavior is to return OK if either call succeeds, and to return the status of the first call if both calls fail.
Flag: EXEMPT bugfix
Bug: 380122010
Change-Id: I46054f93ec434d2c25943c3b02024f21397e3d0b
diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index 754f066..eaa5bd5 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -288,10 +288,10 @@
}
DrmStatus DrmHal::getSupportedSchemes(std::vector<uint8_t>& schemes) const {
- status_t statusResult;
- statusResult = mDrmHalAidl->getSupportedSchemes(schemes);
- if (statusResult == OK) return statusResult;
- return mDrmHalHidl->getSupportedSchemes(schemes);
+ const DrmStatus statusResultAidl = mDrmHalAidl->getSupportedSchemes(schemes);
+ const DrmStatus statusResultHidl = mDrmHalHidl->getSupportedSchemes(schemes);
+ if (statusResultHidl == OK || statusResultAidl == OK) return OK;
+ return statusResultAidl;
}
} // namespace android