From 8b6cea62ef650f4e41221c43d39d97f443557375 Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 27 Oct 2021 15:22:57 +0000
Subject: [PATCH] Fixup for OPPO Reno6 on Android 12

Change-Id: I30cc8d6ade9725d8e0f2e50e05f22924fcfae3d4
---
 OPPO/PEQM00-SystemUI/AndroidManifest.xml | 6 +++---
 OPPO/PEQM00/AndroidManifest.xml          | 6 +++---
 OPPO/PEQM00/res/values/config.xml        | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/OPPO/PEQM00-SystemUI/AndroidManifest.xml b/OPPO/PEQM00-SystemUI/AndroidManifest.xml
index 1e514e9..660a17a 100644
--- a/OPPO/PEQM00-SystemUI/AndroidManifest.xml
+++ b/OPPO/PEQM00-SystemUI/AndroidManifest.xml
@@ -3,8 +3,8 @@
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="com.android.systemui"
-                android:requiredSystemPropertyName="ro.vendor.product.oem"
-                android:requiredSystemPropertyValue="PEQM00"
-		android:priority="1812"
+                android:requiredSystemPropertyName="ro.boot.prjname"
+                android:requiredSystemPropertyValue="20181"
+		android:priority="2018"
 		android:isStatic="true" />
 </manifest>
diff --git a/OPPO/PEQM00/AndroidManifest.xml b/OPPO/PEQM00/AndroidManifest.xml
index d2b8406..05b07ff 100644
--- a/OPPO/PEQM00/AndroidManifest.xml
+++ b/OPPO/PEQM00/AndroidManifest.xml
@@ -3,8 +3,8 @@
         android:versionCode="1"
         android:versionName="1.0">
         <overlay android:targetPackage="android"
-                android:requiredSystemPropertyName="ro.vendor.product.oem"
-                android:requiredSystemPropertyValue="PEQM00"
-		android:priority="1811"
+                android:requiredSystemPropertyName="ro.boot.prjname"
+                android:requiredSystemPropertyValue="20181"
+		android:priority="2018"
 		android:isStatic="true" />
 </manifest>
diff --git a/OPPO/PEQM00/res/values/config.xml b/OPPO/PEQM00/res/values/config.xml
index 0b6690e..89123b2 100644
--- a/OPPO/PEQM00/res/values/config.xml
+++ b/OPPO/PEQM00/res/values/config.xml
@@ -48,4 +48,5 @@
     </integer-array>
 
     <string name="config_mainBuiltInDisplayCutout">M -540,0 L -540,106 L -401,106 L -401,0 Z</string>
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation">M -540,0 L -540,106 L -401,106 L -401,0 Z</string>
 </resources>