Snap for 8203021 from 6b95566a55 to udc-release

Change-Id: I2dba07572c2e35cf08d42af42b7daaf84b90a211
This commit is contained in:
Android Build Coastguard Worker 2022-02-19 06:06:08 +00:00
commit fa57c603a6
8 changed files with 59 additions and 12 deletions

View file

@ -153,8 +153,7 @@ USE_SWIFTSHADER := false
# HWUI
TARGET_USES_VULKAN = false
# PRODUCT_SOONG_NAMESPACES += \
# vendor/arm/mali/valhall
PRODUCT_SOONG_NAMESPACES += vendor/arm/mali/valhall
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
@ -229,8 +228,8 @@ DEVICE_MATRIX_FILE := \
DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay
# This will be updated to 31 (Android S) for shipping
PRODUCT_SHIPPING_API_LEVEL := 30
# This will be updated to 33 (Android T) for shipping
PRODUCT_SHIPPING_API_LEVEL := 31
# Temporarily disable the debugfs restriction on 31 (Android S)
PRODUCT_SET_DEBUGFS_RESTRICTIONS := false
@ -1038,10 +1037,6 @@ PRODUCT_PACKAGES += \
update_engine_sideload \
update_verifier
# tetheroffload HAL
PRODUCT_PACKAGES += \
vendor.samsung_slsi.hardware.tetheroffload@1.0-service
# pKVM
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
PRODUCT_BUILD_PVMFW_IMAGE := true

View file

@ -1,4 +1,20 @@
<compatibility-matrix version="1.0" type="framework" level="5">
<compatibility-matrix version="1.0" type="framework" level="6">
<hal format="aidl">
<name>android.hardware.contexthub</name>
<version>1</version>
<interface>
<name>IContextHub</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.graphics.composer3</name>
<version>1</version>
<interface>
<name>IComposer</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.radio</name>
<version>1.2</version>
@ -15,6 +31,14 @@
<instance>dual</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.wifi.hostapd</name>
<version>1</version>
<interface>
<name>IHostapd</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl" optional="true">
<name>android.vendor.samsung_slsi.telephony.hardware.radio</name>
<version>1.1</version>

View file

@ -1005,6 +1005,7 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
bool tcpdumpEnabled = android::base::GetBoolProperty(TCPDUMP_PERSIST_PROPERTY, false);
bool cameraLogsEnabled = android::base::GetBoolProperty(
"vendor.camera.debug.camera_performance_analyzer.attach_to_bugreport", true);
bool gxpDumpEnabled = android::base::GetBoolProperty("vendor.gxp.attach_to_bugreport", false);
int maxFileNum = android::base::GetIntProperty(MODEM_LOGGING_NUMBER_BUGREPORT_PROPERTY, 100);
if (tcpdumpEnabled) {
@ -1048,6 +1049,18 @@ void DumpstateDevice::dumpModem(int fd, int fdModem)
dumpCameraLogs(STDOUT_FILENO, modemLogAllDir);
}
if (gxpDumpEnabled) {
const int maxGxpDebugDumps = 8;
const std::string gxpCoredumpOutputDir = modemLogAllDir + "/gxp_ssrdump";
const std::string gxpCoredumpInputDir = "/data/vendor/ssrdump";
RunCommandToFd(fd, "MKDIR GXP COREDUMP", {"/vendor/bin/mkdir", "-p", gxpCoredumpOutputDir}, CommandOptions::WithTimeout(2).Build());
// Copy GXP coredumps and crashinfo to the output directory.
dumpLogs(fd, gxpCoredumpInputDir + "/coredump", gxpCoredumpOutputDir, maxGxpDebugDumps, "coredump_gxp_platform");
dumpLogs(fd, gxpCoredumpInputDir, gxpCoredumpOutputDir, maxGxpDebugDumps, "crashinfo_gxp_platform");
}
dumpLogs(fd, extendedLogDir, modemLogAllDir, maxFileNum, EXTENDED_LOG_PREFIX);
dumpRilLogs(fd, modemLogAllDir);
dumpNetmgrLogs(modemLogAllDir);

View file

@ -1,4 +1,4 @@
<manifest version="1.0" type="device" target-level="5">
<manifest version="1.0" type="device" target-level="6">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>

View file

@ -1,4 +1,4 @@
<manifest version="1.0" type="device" target-level="5">
<manifest version="1.0" type="device" target-level="6">
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>

View file

@ -260,10 +260,19 @@
<item>jp.konami.epjCastlevania2</item>
</string-array>
<!-- The default intensity level for alarm vibrations. See
Settings.System.ALARM_VIBRATION_INTENSITY more details on the constant values and
meanings. -->
<integer name="config_defaultAlarmVibrationIntensity">3</integer>
<!-- The default intensity level for haptic feedback. See
Settings.System.HAPTIC_FEEDBACK_INTENSITY more details on the constant values and
meanings. -->
<integer name="config_defaultHapticFeedbackIntensity">3</integer>
<!-- The default intensity level for media vibrations. See
Settings.System.MEDIA_VIBRATION_INTENSITY more details on the constant values and
meanings. -->
<integer name="config_defaultMediaVibrationIntensity">3</integer>
<!-- The default intensity level for notification vibrations. See
Settings.System.NOTIFICATION_VIBRATION_INTENSITY more details on the constant values and
meanings. -->

View file

@ -400,6 +400,12 @@
"Duration": 0,
"Value": "2"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUBigClusterMaxFreq",
"Duration": 5000,
"Value": "9999999"
},
{
"PowerHint": "LAUNCH",
"Node": "CPUMidClusterMaxFreq",

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/vendor/bin/sh
# Switch into /proc/irq/$IRQ for the dwc3 usb controller
cd /proc/irq/*/dwc3/.. || exit 7