widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return failure if ignore keybox debug count is non-zero. am: 1b35b915b5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/16496629

Change-Id: Ibf4fcd015569173fb3779f1a0b09d9e137f84a83
This commit is contained in:
Alex Dale
2022-01-07 05:57:09 +00:00
committed by Automerger Merge Worker
parent bf776ef27d 1b35b915b5
commit d2c1aec4a7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -2970,6 +2970,13 @@ extern "C" OEMCryptoResult OEMCrypto_ProcessOTAKeybox(OEMCrypto_SESSION session,
LOGE("Installed OTA keybox. save ignore count failed %d, count=%u", LOGE("Installed OTA keybox. save ignore count failed %d, count=%u",
static_cast<int>(save_result), ignore_count); static_cast<int>(save_result), ignore_count);
} }
if (ignore_count > 0 && result == OEMCrypto_SUCCESS) {
// If success is returned while the dynamic adapter continues
// to ignore the keybox, the CDM layer will enter an invalid
// state and apps may get stuck.
LOGD("Ignoring install success");
return OEMCrypto_ERROR_UNKNOWN_FAILURE;
}
} }
} }
return result; return result;