Squashed merge 3 CLs.
1. "Change CdmResponseType from enum into a struct" Merged from http://go/wvgerrit/163199 Bug: 253271674 2. "Log request information when server returns 401" Bug: 260760387 Bug: 186031735 Merged from http://go/wvgerrit/162798 3. "Specify server version on the command line" Bug: 251599048 Merged from http://go/wvgerrit/158897 Test: build android.hardware.drm-service.widevine Test: Netflix and Play Movies & TV Test: build_and_run_all_unit_tests.sh Bug: 253271674 Change-Id: I70c950acce070609ee0343920ec68e66b058bc23
This commit is contained in:
@@ -18,6 +18,11 @@ using ::aidl::android::hardware::drm::Status;
|
||||
|
||||
template <typename S = Status>
|
||||
static S mapCdmResponseType(wvcdm::CdmResponseType res) {
|
||||
return mapCdmResponseType(static_cast<wvcdm::CdmResponseType>(res));
|
||||
}
|
||||
|
||||
template <typename S = Status>
|
||||
static S mapCdmResponseType(wvcdm::CdmResponseEnum res) {
|
||||
Status err = Status::ERROR_DRM_UNKNOWN;
|
||||
switch (res) {
|
||||
case wvcdm::KEY_ADDED:
|
||||
|
||||
Reference in New Issue
Block a user