Snap for 11981331 from cb51a640f4 to 24Q4-release

Change-Id: I47931e1798c82390ffe591bb0335b03314bebb98
This commit is contained in:
Android Build Coastguard Worker 2024-06-17 23:01:50 +00:00
commit 0d6c05668f
8 changed files with 19 additions and 4 deletions

View file

@ -848,6 +848,7 @@ service init_display /vendor/bin/init.display.sh
# bugreport is triggered by holding down volume down, volume up and power
service bugreport /system/bin/dumpstate -d -p -z
class main
user root
disabled
oneshot
keycodes 114 115 116

View file

@ -50,7 +50,6 @@
<!-- Camera -->
<permission name="android.permission.CAMERA" fixed="false"/>
<!-- Camera Connectivity -->
<permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
<permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
<permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>

View file

@ -41,6 +41,7 @@ include device/google/gs-common/betterbug/betterbug.mk
ifneq ($(filter cheetah felix panther, $(TARGET_PRODUCT)),)
include device/google/gs-common/bcmbt/dump/dumplog.mk
endif
include device/google/gs-common/fingerprint/fingerprint.mk
TARGET_BOARD_PLATFORM := gs201
@ -82,6 +83,11 @@ PRODUCT_SOONG_NAMESPACES += \
LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
# Set the environment variable to enable the Secretkeeper HAL service.
SECRETKEEPER_ENABLED := true
endif
# OEM Unlock reporting
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1
@ -255,7 +261,7 @@ PRODUCT_PACKAGES += \
PRODUCT_VENDOR_PROPERTIES += \
vendor.mali.platform.config=/vendor/etc/mali/platform.config \
vendor.mali.debug.config=/vendor/etc/mali/debug.config \
vendor.mali.base_protected_max_core_count=1 \
vendor.mali.base_protected_max_core_count=1 \
vendor.mali.base_protected_tls_max=67108864 \
vendor.mali.platform_agt_frequency_khz=24576
@ -911,6 +917,7 @@ endif
# Exynos RIL and telephony
# Multi SIM(DSDS)
SIM_COUNT := 2
$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
SUPPORT_MULTI_SIM := true
# Support NR
SUPPORT_NR := true

View file

@ -78,7 +78,7 @@
</hal>
<hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name>
<version>11-12</version>
<version>12</version>
<interface>
<name>IDisplay</name>
<instance>default</instance>

View file

@ -145,7 +145,7 @@
<Limit name="measured-frame-rate-320x180" range="847-1271" />
<Limit name="measured-frame-rate-640x360" range="412-618" />
<Limit name="measured-frame-rate-1280x720" range="119-178" />
<Limit name="measured-frame-rate-1920x1080" range="47-70" />
<Limit name="measured-frame-rate-1920x1080" range="28-55" />
</MediaCodec>
<MediaCodec name="c2.android.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
<Limit name="measured-frame-rate-320x180" range="622-934" />

View file

@ -56,6 +56,7 @@ cc_binary {
"libbinder_ndk",
"libprotobuf-cpp-lite",
"server_configurable_flags",
"libaconfig_storage_read_api_cc",
],
static_libs: [
"libpixelusb-aidl",

View file

@ -602,6 +602,11 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
fp = fopen(filename.c_str(), "w");
if (fp != NULL) {
int ret = fputs(convertRoletoString(in_role).c_str(), fp);
if (ret == EAGAIN) {
ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS);
std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS));
ret = fputs(convertRoletoString(in_role).c_str(), fp);
}
fclose(fp);
if ((ret != EOF) && ReadFileToString(filename, &written)) {
written = Trim(written);

View file

@ -56,6 +56,8 @@ constexpr char kGadgetName[] = "11210000.dwc3";
#define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess"
#define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled"
#define ROLE_SWAP_RETRY_MS 700
struct Usb : public BnUsb {
Usb();