From 13d556fa490303e5404c49739984cc8e2f2aea75 Mon Sep 17 00:00:00 2001
From: Calvin Huang <calhuang@google.com>
Date: Tue, 14 Feb 2023 21:43:18 +0000
Subject: [PATCH 1/2] Make tangorpro board work with aae-on-phone

Bug: 268520081
Test: lunch tangorpro_car-userdebug & build & adb shell wm density
Change-Id: I8277b1751a22ab8e5e310bbd169032a4a83e32d0
---
 tangorpro/BoardConfig.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk
index c5abe34..fdd1772 100644
--- a/tangorpro/BoardConfig.mk
+++ b/tangorpro/BoardConfig.mk
@@ -15,7 +15,13 @@
 #
 TARGET_BOARD_INFO_FILE := device/google/tangorpro/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := tangorpro
-TARGET_SCREEN_DENSITY := 320
+
+ifdef PHONE_CAR_BOARD_PRODUCT
+    include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+else
+    TARGET_SCREEN_DENSITY := 320
+endif
+
 BOARD_USES_GENERIC_AUDIO := true
 USES_DEVICE_GOOGLE_TANGORPRO := true
 BOARD_KERNEL_CMDLINE += swiotlb=noforce

From 82957e675832b327fe3e8b5026162f48f4a4a1dd Mon Sep 17 00:00:00 2001
From: Michael Wachenschwanz <mwachens@google.com>
Date: Thu, 2 Mar 2023 23:57:40 +0000
Subject: [PATCH 2/2] Revert "Don't reset BatteryStats on high battery level or
 signif..."

Revert submission 21485850

Reason for revert: introduced deadlock

Reverted changes: /q/submissionid:21485850

Change-Id: I7993970d19ade8c9340c70ab825b762160fb6667
---
 .../overlay/frameworks/base/core/res/res/values/config.xml   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
index 9911982..572d514 100644
--- a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml
@@ -590,9 +590,4 @@
 
     <!-- Shutdown if the battery temperature exceeds (this value * 0.1) Celsius. -->
     <integer name="config_shutdownBatteryTemperature">580</integer>
-
-    <!-- Whether to reset Battery Stats on unplug when the battery level is high. -->
-    <bool name="config_batteryStatsResetOnUnplugHighBatteryLevel">false</bool>
-    <!-- Whether to reset Battery Stats on unplug if the battery was significantly charged -->
-    <bool name="config_batteryStatsResetOnUnplugAfterSignificantCharge">false</bool>
 </resources>