Moved OEMCryptoResult string converter.

[ Merge of http://go/wvgerrit/170073 ]

Removed the file "error_string_util.cpp" and its header, moving the
OEMCryptoResult to string converter to "wv_cdm_types.cpp".  This extra
file served little purpose, and created a dependency on the CDM utils
to the CDM itself.

This is part of the effort to fix the formatting of WV metrics; making
enum-to-string conversion uniform throughout the CDM.

Bug: 239462891
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: Manual testing with Google TV
Change-Id: I4bf95d26b623f5b8fa86bdb2578cbc4ee65125cb
This commit is contained in:
Alex Dale
2023-04-05 13:16:50 -07:00
parent 9c844682a6
commit de779e7545
8 changed files with 172 additions and 192 deletions

View File

@@ -23,7 +23,6 @@
#include "WVUUID.h"
#include "android-base/properties.h"
#include "cutils/properties.h"
#include "error_string_util.h"
#include "wv_cdm_constants.h"
#include "wv_content_decryption_module.h"
#include "wv_metrics.h"

View File

@@ -14,7 +14,6 @@
#include <aidl/android/hardware/drm/Status.h>
#include "OEMCryptoCENC.h"
#include "error_string_util.h"
#include "wv_cdm_types.h"
using namespace drm_metrics;
@@ -202,7 +201,8 @@ string FormatAttributes(const string& indent, const Attributes& attributes) {
result.append("oemcrypto_result:\n");
string next_indent = indent + kIndentSpaces;
result.append(next_indent + "name: ");
result.append(::wvutil::OEMCryptoResultToString(attributes.oem_crypto_result()));
result.append(::wvcdm::OemCryptoResultToString(
static_cast<OEMCryptoResult>(attributes.oem_crypto_result())));
result.append("\n" + next_indent + "value: ");
result.append(to_string(attributes.oem_crypto_result()));
}