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

Removing Widevine OEMCrypto Profiler

Browse Source 
This is a merge of go/wvgerrit/22806

This change removed the oemcrypto profiler to allow
the new metrics system free-reign over how to collect
and store measurements.

Bug: 33745339
Bug: 26027857
Change-Id: I6b9051faa6835f13860258c94f8bcfd3a59f1be6
This commit is contained in:
Aaron Vaage
2017-01-17 17:53:40 -08:00
parent b413037733
commit af71f66aa4
21 changed files with 2 additions and 1336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

@@ -17,7 +17,6 @@
#include "mapErrors-inl.h"
#include "media/stagefright/MediaErrors.h"
#include "profiler.h"
#include "utils/Errors.h"
#include "wv_cdm_constants.h"
@@ -27,10 +26,6 @@ namespace {
static const char* const kDisable = "disable";
static const std::string kPsshTag = "pssh";
static const char* const kSpecialUnprovisionResponse = "unprovision";
// profiler proterties constants
static const android::String8 kProfilerHistoryTag("oemProfilerHistory");
}
namespace wvdrm {
@@ -497,26 +492,10 @@ status_t WVDrmPlugin::getPropertyString(const String8& name,
return android::OK;
}
bool WVDrmPlugin::tryGettingOEMProfilingHistory(const String8& name,
Vector<uint8_t>& value) const {
if (name == kProfilerHistoryTag) {
std::vector<uint8_t> tempValue;
oemprofiler::Profiler::GetHistory().Read(tempValue);
value.appendArray(tempValue.data(), tempValue.size());
return true;
}
return false;
}
status_t WVDrmPlugin::getPropertyByteArray(const String8& name,
Vector<uint8_t>& value) const {
if (tryGettingOEMProfilingHistory(name, value)) {
return android::OK;
} else if (name == "deviceUniqueId") {
if (name == "deviceUniqueId") {
return queryProperty(QUERY_KEY_DEVICE_ID, value);
} else if (name == "provisioningUniqueId") {
return queryProperty(QUERY_KEY_PROVISIONING_ID, value);