summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WCNSS_qcom_cfg.ini9
-rw-r--r--audio_platform_info_intcodec_b4.xml18
-rw-r--r--audio_platform_info_intcodec_s4.xml18
-rw-r--r--device-common.mk3
-rw-r--r--device.mk11
-rw-r--r--fstab.hardware2
-rw-r--r--gpt-utils/gpt-utils.h2
-rw-r--r--manifest.xml4
-rw-r--r--nfc/com.google.hardware.pixel.japan.xml21
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml2
10 files changed, 84 insertions, 6 deletions
diff --git a/WCNSS_qcom_cfg.ini b/WCNSS_qcom_cfg.ini
index c7f7ace3..c4335484 100644
--- a/WCNSS_qcom_cfg.ini
+++ b/WCNSS_qcom_cfg.ini
@@ -298,7 +298,7 @@ g_enable_probereq_whitelist_ies=1
# g_probe_req_ie_bitmap_0=0x00000000 #[] (default)
# g_probe_req_ie_bitmap_1=0x80000009 #[32, 35, 63]
g_probe_req_ie_bitmap_0=0x0000000B
-# g_probe_req_ie_bitmap_1=0x00000000
+g_probe_req_ie_bitmap_1=0x00040000
# g_probe_req_ie_bitmap_2=0x00000000
# g_probe_req_ie_bitmap_3=0x00000000
# g_probe_req_ie_bitmap_4=0x00000000
@@ -697,6 +697,13 @@ oce_enable_rssi_assoc_reject=0
#Enable/Disable Secondary Retry Rate feature subset
gEnableSecondaryRate=0x17
+#Timer waiting for interface up from the upper layer
+gInterfaceChangeWait=1000
+
+#Enable Bmps(power save in connected state) based on timer
+#Timer value is in seconds
+gAutoBmpsTimerValue=90
+
END
# Note: Configuration parser would not read anything past the END marker
diff --git a/audio_platform_info_intcodec_b4.xml b/audio_platform_info_intcodec_b4.xml
index 2343d57a..8750bbc5 100644
--- a/audio_platform_info_intcodec_b4.xml
+++ b/audio_platform_info_intcodec_b4.xml
@@ -170,6 +170,9 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" backend="speaker" interface="SEC_TDM_RX-and-HDMI_RX"/>
<device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="SEC_TDM_RX_0"/>
<device name="SND_DEVICE_IN_HANDSET_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_HANDSET_MIC_AEC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_HANDSET_MIC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_CAMCORDER_LANDSCAPE" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_CAMCORDER_PORTRAIT" backend="handset-mic" interface="PRI_TDM_TX_0"/>
@@ -210,9 +213,24 @@
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
+ <device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_VOICE_HEARING_AID" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
</backend_names>
<app_types>
diff --git a/audio_platform_info_intcodec_s4.xml b/audio_platform_info_intcodec_s4.xml
index dd311c14..6a68fd3d 100644
--- a/audio_platform_info_intcodec_s4.xml
+++ b/audio_platform_info_intcodec_s4.xml
@@ -170,6 +170,9 @@
<device name="SND_DEVICE_OUT_SPEAKER_AND_HDMI" backend="speaker" interface="SEC_TDM_RX-and-HDMI_RX"/>
<device name="SND_DEVICE_OUT_HANDSET" backend="handset" interface="SEC_TDM_RX_0"/>
<device name="SND_DEVICE_IN_HANDSET_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_HANDSET_MIC_AEC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_HANDSET_MIC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_CAMCORDER_LANDSCAPE" backend="handset-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_CAMCORDER_PORTRAIT" backend="handset-mic" interface="PRI_TDM_TX_0"/>
@@ -210,9 +213,24 @@
<device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
+ <device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" backend="headset-mic" interface="INT3_MI2S_TX"/>
<device name="SND_DEVICE_IN_VOICE_HEARING_AID" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_MIC_AEC_NS" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_UNPROCESSED_STEREO_MIC" backend="handset-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
+ <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" backend="speaker-mic" interface="PRI_TDM_TX_0"/>
</backend_names>
<app_types>
diff --git a/device-common.mk b/device-common.mk
index 2ff1ccf3..78ec0e57 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -123,3 +123,6 @@ AB_OTA_POSTINSTALL_CONFIG += \
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_color_management=true
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.protected_contents=true
+# Set thermal warm reset
+PRODUCT_PRODUCT_PROPERTIES += \
+ ro.thermal_warmreset = true \
diff --git a/device.mk b/device.mk
index 0e31e63d..71273928 100644
--- a/device.mk
+++ b/device.mk
@@ -324,6 +324,9 @@ PRODUCT_PROPERTY_OVERRIDES += \
persist.rcs.supported=1 \
vendor.rild.libpath=/vendor/lib64/libril-qc-hal-qmi.so \
ro.hardware.keystore_desede=true \
+ ro.zram.mark_idle_delay_mins=60 \
+ ro.zram.first_wb_delay_mins=180 \
+ ro.zram.periodic_wb_delay_hours=24 \
# Disable snapshot timer
PRODUCT_PROPERTY_OVERRIDES += \
@@ -390,7 +393,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
ro.vendor.bt.bdaddr_path=/proc/device-tree/chosen/cdt/cdb2/bt_addr
# Enable Perfetto traced
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
persist.traced.enable=1
# Bluetooth WiPower
@@ -425,7 +428,11 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020E/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020F/android.hardware.nfc.uicc.xml \
frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020G/android.hardware.nfc.uicc.xml \
- frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020H/android.hardware.nfc.ese.xml \
+ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/odm/etc/permissions/sku_G020H/android.hardware.nfc.ese.xml
+
+PRODUCT_COPY_FILES += \
+ device/google/bonito/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020D/com.google.hardware.pixel.japan.xml \
+ device/google/bonito/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020H/com.google.hardware.pixel.japan.xml
PRODUCT_PACKAGES += \
android.hardware.usb@1.1-service.bonito
diff --git a/fstab.hardware b/fstab.hardware
index 422c9ccf..aa9a63db 100644
--- a/fstab.hardware
+++ b/fstab.hardware
@@ -17,5 +17,5 @@ product /product
# and fails if it does not find it.
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
/devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
-/dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8
+/dev/block/zram0 none swap defaults zramsize=2147483648,max_comp_streams=8,zram_loopback_path=/data/per_boot/zram_swap,zram_loopback_size=512M
/dev/block/platform/soc/7c4000.sdhci/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,noatime,barrier=1 wait,first_stage_mount
diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h
index dcf805b0..fb272ef8 100644
--- a/gpt-utils/gpt-utils.h
+++ b/gpt-utils/gpt-utils.h
@@ -72,7 +72,7 @@ extern "C" {
#define AB_PARTITION_ATTR_SLOT_ACTIVE (0x1<<2)
#define AB_PARTITION_ATTR_BOOT_SUCCESSFUL (0x1<<6)
#define AB_PARTITION_ATTR_UNBOOTABLE (0x1<<7)
-#define AB_SLOT_ACTIVE_VAL 0x3F
+#define AB_SLOT_ACTIVE_VAL 0x1F
#define AB_SLOT_INACTIVE_VAL 0x0
#define AB_SLOT_ACTIVE 1
#define AB_SLOT_INACTIVE 0
diff --git a/manifest.xml b/manifest.xml
index 81cea842..ed627401 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -241,7 +241,9 @@
<name>android.hardware.neuralnetworks</name>
<transport>hwbinder</transport>
<fqname>@1.0::IDevice/paintbox</fqname>
- <fqname>@1.1::IDevice/default</fqname>
+ <fqname>@1.2::IDevice/qti-default</fqname>
+ <fqname>@1.2::IDevice/qti-dsp</fqname>
+ <fqname>@1.2::IDevice/qti-gpu</fqname>
</hal>
<hal format="hidl">
<name>android.hardware.nfc</name>
diff --git a/nfc/com.google.hardware.pixel.japan.xml b/nfc/com.google.hardware.pixel.japan.xml
new file mode 100644
index 00000000..bf06ed24
--- /dev/null
+++ b/nfc/com.google.hardware.pixel.japan.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<!--
+ Feature for Pixel Japan SKU devices.
+-->
+<permissions>
+ <feature name="com.google.hardware.pixel.japan" />
+</permissions>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index bef2559c..1708b4a7 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -410,4 +410,6 @@
<!-- True if the firmware supports connected MAC randomization -->
<bool name="config_wifi_connected_mac_randomization_supported">true</bool>
+ <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
+ <bool name="config_zramWriteback">true</bool>
</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 13:50:16 +0000