From c0d282f6b7903470166cbb501aefec85177ecb1f Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 29 Mar 2022 14:35:37 -0700
Subject: [PATCH 1/6] Raviole: disable DD+ decoder

Bug: 225544444
Bug: 228207876
Test: adb shell ps | grep vendor.dolby.media.c2\@ is empty after boot
Change-Id: I030739e6d9772671b160e21afe62579a1bf3b987
---
 device-oriole.mk             | 13 -------
 device-raven.mk              | 13 -------
 media_codecs_bo_dolby_c2.xml | 66 ------------------------------------
 3 files changed, 92 deletions(-)
 delete mode 100644 media_codecs_bo_dolby_c2.xml

diff --git a/device-oriole.mk b/device-oriole.mk
index 6eda039..ff4015b 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -217,16 +217,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # This device is shipped with 31 (Android S)
 PRODUCT_SHIPPING_API_LEVEL := 31
-
-##############################################
-# DOLBY integration
-include vendor/dolby/ds/dolby-buildspec.mk
-$(call inherit-product, vendor/dolby/ds/dolby-product.mk)
-
-# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml
-# with same file but with Dolby codecs listed
-PRODUCT_COPY_FILES := \
-    device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
-    $(PRODUCT_COPY_FILES) 
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/device-raven.mk b/device-raven.mk
index c6c2c9d..7f9c6fb 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -233,16 +233,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 
 # This device is shipped with 31 (Android S)
 PRODUCT_SHIPPING_API_LEVEL := 31
-
-#############################################
-# DOLBY integration
-include vendor/dolby/ds/dolby-buildspec.mk
-$(call inherit-product, vendor/dolby/ds/dolby-product.mk)
-
-# add list of codecs, but overwrite device/google/gs101/media_codecs_bo_c2.xml
-# with same file but with Dolby codecs listed
-PRODUCT_COPY_FILES := \
-    device/google/raviole/media_codecs_bo_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
-    $(PRODUCT_COPY_FILES) 
-
-PRODUCT_RESTRICT_VENDOR_FILES := false
diff --git a/media_codecs_bo_dolby_c2.xml b/media_codecs_bo_dolby_c2.xml
deleted file mode 100644
index 3197674..0000000
--- a/media_codecs_bo_dolby_c2.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<MediaCodecs>
-    <Include href="media_codecs_aosp_c2.xml" />
-    <Decoders>
-        <MediaCodec name="c2.google.av1.decoder" type="video/av01">
-          <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="2x2" />
-          <Limit name="block-size" value="16x16" />
-          <Limit name="block-count" range="36-32400" />
-          <Limit name="blocks-per-second" min="24" max="1944000" />
-          <Limit name="bitrate" range="1-120000000" />
-          <Limit name="frame-rate" range="1-180" />
-          <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
-          <Limit name="performance-point-3840x2160" value="60" />
-          <Feature name="adaptive-playback" />
-          <Feature name="can-swap-width-height" value="1" />
-        </MediaCodec>
-        <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
-          <Limit name="size" min="96x96" max="3840x2160" />
-          <Limit name="alignment" value="2x2" />
-          <Limit name="block-size" value="16x16" />
-          <Limit name="block-count" range="36-32400" />
-          <Limit name="blocks-per-second" min="24" max="1944000" />
-          <Limit name="bitrate" range="1-120000000" />
-          <Limit name="frame-rate" range="1-180" />
-          <Limit name="concurrent-instances" max="16" />
-          <Limit name="performance-point-1280x720" value="180" />
-          <Limit name="performance-point-1920x1080" value="120" />
-          <Limit name="performance-point-3840x2160" value="60" />
-          <Feature name="adaptive-playback" />
-          <Feature name="secure-playback" required="true" />
-          <Feature name="can-swap-width-height" value="1" />
-        </MediaCodec>
-        <MediaCodec name="c2.dolby.eac3.decoder">
-            <Type name="audio/ac3">
-                <Alias name="OMX.dolby.ac3.decoder"/>
-                <Limit name="channel-count" max="6"/>
-                <Limit name="sample-rate" ranges="32000,44100,48000"/>
-                <Limit name="bitrate" range="32000-640000"/>
-            </Type>
-            <Attribute name="software-codec"/>
-            <Type name="audio/eac3">
-                <Alias name="OMX.dolby.eac3.decoder"/>
-                <Limit name="channel-count" max="8"/>
-                <Limit name="sample-rate" ranges="32000,44100,48000"/>
-                <Limit name="bitrate" range="32000-6144000"/>
-            </Type>
-        </MediaCodec>
-    </Decoders>
-</MediaCodecs>

From 40b5adfd901d3385efb5e08ee8c53f80b0deb7cf Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Wed, 6 Apr 2022 04:56:02 +0000
Subject: [PATCH 2/6] Update oriole SVN to 26

Bug: 228265025
Change-Id: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
---
 device-oriole.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index 6eda039..334a558 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -175,7 +175,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=25
+    ro.vendor.build.svn=26
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 48410f190cd316e03f83ec8449c89c6b2d23b708 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Wed, 6 Apr 2022 04:57:43 +0000
Subject: [PATCH 3/6] Update raven SVN to 26

Bug: 228265025
Change-Id: I0a18a8b09e060e2cbc31e69a0f8fd6675769093a
---
 device-raven.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-raven.mk b/device-raven.mk
index c6c2c9d..d861fd9 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -187,7 +187,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=25
+    ro.vendor.build.svn=26
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From ab0dbdbc8685773169f9f490df6069cea7b6c232 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Fri, 1 Apr 2022 11:54:39 +0800
Subject: [PATCH 4/6] Fixed status bar glitch for apps that access internal
 resource dimen

Bring back old usage of status_bar_height, status_bar_height_portrait,
and status_bar_height_landscape by set the size containing cutout size.

Bug: 216782082
Test: make
Change-Id: I05142c120f05bdb5fa0543e61a6f50f46f6b0d82
---
 oriole/overlay/frameworks/base/core/res/res/values/config.xml | 4 +++-
 raven/overlay/frameworks/base/core/res/res/values/config.xml  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 6eec9d0..574eed6 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -93,7 +93,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_height">74px</dimen>
+    <dimen name="status_bar_height_height_default">74px</dimen>
+    <dimen name="status_bar_height_portrait">124px</dimen>
+    <dimen name="status_bar_height_landscape">74px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index a83a4e4..8d422c3 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -198,7 +198,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height">28dp</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
+    <dimen name="status_bar_height_portrait">145px</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- the number of the max cached processes in the system. -->
     <integer name="config_customizedMaxCachedProcesses">64</integer>

From 77bcf08c3ab93d492ccc05118edd65c071e6fe15 Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Wed, 6 Apr 2022 04:57:43 +0000
Subject: [PATCH 5/6] Update raven SVN to 26

Bug: 228265025
Change-Id: I0a18a8b09e060e2cbc31e69a0f8fd6675769093a
---
 device-raven.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-raven.mk b/device-raven.mk
index 7f9c6fb..f2a5f9c 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -187,7 +187,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=25
+    ro.vendor.build.svn=26
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \

From 08d806ddfd66e4bb5ea41ff592e07960b8a7902e Mon Sep 17 00:00:00 2001
From: Steve Berbary <sberbary@google.com>
Date: Wed, 6 Apr 2022 04:56:02 +0000
Subject: [PATCH 6/6] Update oriole SVN to 26

Bug: 228265025
Change-Id: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
---
 device-oriole.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-oriole.mk b/device-oriole.mk
index ff4015b..dc0c1fe 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -175,7 +175,7 @@ endif
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=25
+    ro.vendor.build.svn=26
 
 # Hide cutout overlays
 PRODUCT_PACKAGES += \