Snap for 11400057 from ec8594c90ea86373d4e3c8eff94b2e32bd1c6692 to simpleperf-release
Change-Id: Ibb9510099a94609cb9b40aea4c150e1c2d5f1fa3
diff --git a/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index 659b801..9e709d2 100644
--- a/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/common/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,4 +18,5 @@
-->
<resources>
<integer name="def_user_rotation">1</integer>
+ <integer name="def_screen_off_timeout">6000000</integer>
</resources>
diff --git a/common/post_google_car.mk b/common/post_google_car.mk
index 24df3d4..ee1b2e4 100644
--- a/common/post_google_car.mk
+++ b/common/post_google_car.mk
@@ -47,7 +47,8 @@
log.tag.CarTrustAgentUnlockEvent=I
# Phone car targets don't support ramdump
-EXCLUDE_BUILD_RAMDUMP_UPLOADER_DEBUG_TOOL := true
+PRODUCT_PACKAGES += \
+ ExcludeRamdumpUploader
# Disable RCS and EAB for phone car targets
PRODUCT_PRODUCT_PROPERTIES += \
diff --git a/tangorpro_car/aosp_tangorpro_car.mk b/tangorpro_car/aosp_tangorpro_car.mk
index aeb9a9e..96b000c 100644
--- a/tangorpro_car/aosp_tangorpro_car.mk
+++ b/tangorpro_car/aosp_tangorpro_car.mk
@@ -17,11 +17,12 @@
DEVICE_IS_64BIT_ONLY := true
+PRODUCT_PACKAGE_OVERLAYS += device/google_car/tangorpro_car/overlay
+
$(call inherit-product, device/google_car/common/pre_google_car.mk)
$(call inherit-product, device/google_car/tangorpro_car/device-tangorpro-car.mk)
$(call inherit-product, device/google_car/common/post_google_car.mk)
-
PRODUCT_NAME := aosp_tangorpro_car
PRODUCT_DEVICE := tangorpro
PRODUCT_MODEL := AOSP on Tangorpro
diff --git a/tangorpro_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/tangorpro_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
new file mode 100644
index 0000000..b3ea71a
--- /dev/null
+++ b/tangorpro_car/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2023, 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.
+ */
+-->
+<resources>
+ <integer name="def_user_rotation">3</integer>
+</resources>
