Removing Widevine OEMCrypto Profiler

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

libwvdrmengine/mediadrm/Android.mk

@@ -10,7 +10,6 @@ LOCAL_C_INCLUDES := \
   frameworks/native/include \
   vendor/widevine/libwvdrmengine/cdm/core/include \
   vendor/widevine/libwvdrmengine/cdm/include \
-  vendor/widevine/libwvdrmengine/cdm/profiler/include \
   vendor/widevine/libwvdrmengine/include \
   vendor/widevine/libwvdrmengine/mediadrm/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \

libwvdrmengine/mediadrm/include/WVDrmPlugin.h

@@ -274,14 +274,6 @@ class WVDrmPlugin : public android::DrmPlugin,
   status_t mapAndNotifyOfOEMCryptoResult(const Vector<uint8_t>& sessionId,
                                          OEMCryptoResult res);
 
-  bool tryGettingOEMProfilingHistory(
-      const String8& name,
-      Vector<uint8_t>& value) const;
-
-  bool tryGettingOEMProfilingStats(
-      const String8& name,
-      Vector<uint8_t>& value) const;
-
   status_t mapOEMCryptoResult(OEMCryptoResult res);
 
   bool initDataResemblesPSSH(const Vector<uint8_t>& initData);

libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp

@@ -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);

libwvdrmengine/mediadrm/test/Android.mk

@@ -8,7 +8,6 @@ LOCAL_C_INCLUDES := \
   frameworks/av/include \
   frameworks/native/include \
   vendor/widevine/libwvdrmengine/cdm/core/include \
-  vendor/widevine/libwvdrmengine/cdm/profiler/include \
   vendor/widevine/libwvdrmengine/cdm/include \
   vendor/widevine/libwvdrmengine/include \
   vendor/widevine/libwvdrmengine/mediadrm/include \