From e831d4def9ff472fbd45706343bc5525ba9b24f1 Mon Sep 17 00:00:00 2001
From: Kai Shi <kaishi@google.com>
Date: Wed, 4 Jan 2023 09:10:24 -0800
Subject: [PATCH 1/2] Enable DTIM multiplier config

Enable DTIM multiplier configuration in Pixels.

Bug: 259554744
Test: manual
Change-Id: Ic8a56a0da307554856dedc2b4ac4e095c43b6831
---
 rro_overlays/WifiOverlay/res/values/config.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 4addce85..2b878db1 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -144,4 +144,8 @@
 
     <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
     <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">true</bool>
+
+    <!-- Boolean indicating whether DTIM multiplier configuration is enabled. DTIM multiplier value
+        is when the system is in the suspended mode -->
+    <bool translatable="false" name="config_wifiDtimMultiplierConfigEnabled">true</bool>
 </resources>

From 3b58ffd784fb1f919749ad57479c3b5c8c20cc6c Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Fri, 30 Dec 2022 01:06:26 +0000
Subject: [PATCH 2/2] Add liboemcrypto.so as provided by vendor

Bug: 243699259
Test: atp v2/widevine-eng/drm_compliance
Change-Id: I3a5db1c8841f63cacd60cbf1148131e56e42a52c
---
 device.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 0ab012ae..217d1b66 100644
--- a/device.mk
+++ b/device.mk
@@ -503,10 +503,9 @@ PRODUCT_PACKAGES += \
 # WideVine modules
 PRODUCT_PACKAGES += \
 	android.hardware.drm-service.clearkey \
-	android.hardware.drm-service.widevine \
 	liboemcrypto \
 
-
+include vendor/widevine/libwvdrmengine/apex/device/device.mk
 
 $(call soong_config_set,google3a_config,soc,gs101)
 $(call soong_config_set,google3a_config,gcam_awb,true)