From 9776979f75d6523ed2e65c8e7c50e85eb4e13660 Mon Sep 17 00:00:00 2001
From: Robert Shih <robertshih@google.com>
Date: Mon, 19 Apr 2021 14:58:29 -0700
Subject: [PATCH 1/2] metrics: set OEMCrypto initialization errors correctly

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

Bug: 162763203
Test: adb shell dumpsys media.metrics
Change-Id: I4e34d2ca924e271d31952ca4258287f0c9c96f38
---
 libwvdrmengine/cdm/metrics/src/metrics_collections.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp b/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
index 8bc7fb63..19727e12 100644
--- a/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
+++ b/libwvdrmengine/cdm/metrics/src/metrics_collections.cpp
@@ -291,11 +291,11 @@ void OemCryptoDynamicAdapterMetrics::Serialize(
   std::unique_lock<std::mutex> lock(adapter_lock_);
 
   engine_metrics->set_allocated_level3_oemcrypto_initialization_error(
-      oemcrypto_initialization_mode_.ToProto());
+      level3_oemcrypto_initialization_error_.ToProto());
   engine_metrics->set_allocated_oemcrypto_initialization_mode(
       oemcrypto_initialization_mode_.ToProto());
   engine_metrics->set_allocated_previous_oemcrypto_initialization_failure(
-      oemcrypto_initialization_mode_.ToProto());
+      previous_oemcrypto_initialization_failure_.ToProto());
   engine_metrics->set_allocated_oemcrypto_l1_api_version(
       oemcrypto_l1_api_version_.ToProto());
   engine_metrics->set_allocated_oemcrypto_l1_min_api_version(

From 07440a83bf34b1c1c2e0f106b8a5ce6b244528f3 Mon Sep 17 00:00:00 2001
From: Ulya Trafimovich <skvadrik@google.com>
Date: Tue, 27 Apr 2021 14:20:27 +0100
Subject: [PATCH 2/2] Disable dexpreopt and <uses-library> check for tests.

Bug: 132357300
Test: treehugger
Change-Id: Ia2c6cba7a4a91f6d3b0b343a44c4257817c3a4cf
---
 libwvdrmengine/test/castv2/Android.mk               | 4 ++++
 libwvdrmengine/test/java/MediaDrmApiTest/Android.mk | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/libwvdrmengine/test/castv2/Android.mk b/libwvdrmengine/test/castv2/Android.mk
index ffbf5791..210b548a 100644
--- a/libwvdrmengine/test/castv2/Android.mk
+++ b/libwvdrmengine/test/castv2/Android.mk
@@ -17,6 +17,10 @@ LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
+# Disable dexpreopt and <uses-library> check for test.
+LOCAL_ENFORCE_USES_LIBRARIES := false
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk b/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
index 50cf5dd7..d2b98dc5 100644
--- a/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
+++ b/libwvdrmengine/test/java/MediaDrmApiTest/Android.mk
@@ -11,6 +11,8 @@ LOCAL_LICENSE_CONDITIONS := by_exception_only
 
 LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
 
+# Disable dexpreopt and <uses-library> check for test.
+LOCAL_ENFORCE_USES_LIBRARIES := false
 LOCAL_DEX_PREOPT := false
 
 # When built, explicitly put it in the data/app partition.