Merge "coral: add node /dev/qce for widevine" into rvc-qpr-dev
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 2759aa7..38be119 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -220,6 +220,9 @@
else ifeq (,$(filter-out flame_hwasan coral_hwasan, $(TARGET_PRODUCT)))
BOARD_VENDOR_KERNEL_MODULES += \
$(wildcard device/google/coral-kernel/khwasan/*.ko)
+else ifeq (,$(filter-out flame_boundsan coral_boundsan, $(TARGET_PRODUCT)))
+BOARD_VENDOR_KERNEL_MODULES += \
+ $(wildcard device/google/coral-kernel/boundsan/*.ko)
else ifeq (,$(filter-out flame_kernel_debug_memory coral_kernel_debug_memory, $(TARGET_PRODUCT)))
BOARD_VENDOR_KERNEL_MODULES += \
$(wildcard device/google/coral-kernel/debug_memory/*.ko)
diff --git a/default-permissions.xml b/default-permissions.xml
index 6dd1992..c226feb 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -103,7 +103,7 @@
</exception>
<exception package="com.google.android.apps.scone">
- <!-- NLP Location access to determine proximity to country border -->
+ <!-- Location access to determine proximity to a CBRS network coverage area -->
<permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
<permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
<!-- Used to call ActivityTransition API for Smart OOS & Smart PNO -->
diff --git a/device.mk b/device.mk
index 897ac30..d6546ea 100644
--- a/device.mk
+++ b/device.mk
@@ -356,6 +356,7 @@
persist.vendor.radio.custom_ecc=1 \
persist.vendor.radio.data_ltd_sys_ind=1 \
persist.vendor.radio.videopause.mode=1 \
+ persist.vendor.radio.mt_sms_ack=30 \
persist.vendor.radio.multisim_switch_support=true \
persist.vendor.radio.sib16_support=1 \
persist.vendor.radio.data_con_rprt=true \
@@ -966,17 +967,11 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=28
+ ro.vendor.build.svn=30
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
-# ZRAM writeback
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.zram.mark_idle_delay_mins=60 \
- ro.zram.first_wb_delay_mins=180 \
- ro.zram.periodic_wb_delay_hours=24
-
# Disable SPU usage
PRODUCT_PROPERTY_OVERRIDES += \
vendor.gatekeeper.disable_spu = true
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 826841d..86328fc 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -289,7 +289,7 @@
</hal>
<hal format="hidl">
<name>vendor.qti.hardware.radio.qtiradio</name>
- <version>2.3</version>
+ <version>2.4</version>
<interface>
<name>IQtiRadio</name>
<instance>slot1</instance>
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index ab508f9..77c633f 100755
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -528,6 +528,7 @@
DumpFileToFd(fd, "TTF details", "/sys/class/power_supply/battery/ttf_details");
DumpFileToFd(fd, "TTF stats", "/sys/class/power_supply/battery/ttf_stats");
DumpFileToFd(fd, "batt_ce", "/d/logbuffer/batt_ce");
+ DumpFileToFd(fd, "maxfg", "/d/logbuffer/maxfg");
DumpFileToFd(fd, "WLC logs", "/d/logbuffer/wireless");
DumpFileToFd(fd, "ipc-local-ports", "/d/msm_ipc_router/dump_local_ports");
RunCommandToFd(fd, "USB Device Descriptors", {"/vendor/bin/sh", "-c", "cd /sys/bus/usb/devices/1-1 && cat product && cat bcdDevice; cat descriptors | od -t x1 -w16 -N96"});
diff --git a/health/Health.cpp b/health/Health.cpp
index c93f76b..b36c94a 100644
--- a/health/Health.cpp
+++ b/health/Health.cpp
@@ -91,7 +91,7 @@
std::ifstream assert_open(const std::string &path) {
std::ifstream stream(path);
if (!stream.is_open()) {
- LOG(FATAL) << "Cannot read " << path;
+ LOG(WARNING) << "Cannot read " << path;
}
return stream;
}
diff --git a/init.hardware.rc b/init.hardware.rc
index 65a9044..d97314d 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -118,9 +118,6 @@
write /sys/block/zram0/comp_algorithm lz4
write /proc/sys/vm/page-cluster 0
- # Freezer setup
- write /dev/freezer/frozen/freezer.killable 1
-
# Some user code relies on ro.boot.hardware.revision
setprop ro.boot.hardware.revision ${ro.revision}
@@ -165,6 +162,9 @@
chown system system /sys/devices/platform/soc/soc:google,charger/charge_stop_level
chown system system /sys/devices/platform/soc/soc:google,charger/charge_start_level
+ # Charge stats (write 0)
+ chown system system /sys/class/power_supply/battery/charge_stats
+
# b/134578585
on charger
trigger fs
diff --git a/manifest.xml b/manifest.xml
index c8c2b54..c813c40 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -605,7 +605,7 @@
<hal format="hidl">
<name>vendor.qti.hardware.radio.qtiradio</name>
<transport>hwbinder</transport>
- <version>2.3</version>
+ <version>2.4</version>
<interface>
<name>IQtiRadio</name>
<instance>slot1</instance>
diff --git a/overlay/packages/apps/Nfc/res/values/config.xml b/overlay/packages/apps/Nfc/res/values/config.xml
index 830bf6f..3e0ee6d 100644
--- a/overlay/packages/apps/Nfc/res/values/config.xml
+++ b/overlay/packages/apps/Nfc/res/values/config.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
- <bool name="enable_antenna_blocked_alert">true</bool>
+ <bool name="enable_antenna_blocked_alert">false</bool>
<integer name="max_antenna_blocked_failure_count">10</integer>
<integer name="unknown_tag_polling_delay">2000</integer>
<string name="antenna_blocked_alert_link" translatable="false">https://support.google.com/pixelphone?p=nfc_tag_notification</string>
diff --git a/powerhint.json b/powerhint.json
index 14d3e4e..ff2aca3 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -5,7 +5,12 @@
"Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
"Values": [
"9999999",
- "1113600"
+ "1113600",
+ "844800",
+ "1036800",
+ "1209600",
+ "1382400",
+ "1555200"
],
"DefaultIndex": 0,
"ResetOnInit": true
@@ -15,9 +20,10 @@
"Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
"Values": [
"9999999",
- "1113600",
- "576000"
+ "576000",
+ "1113600"
],
+ "DefaultIndex": 1,
"ResetOnInit": true
},
{
@@ -43,9 +49,10 @@
"9999999",
"1497600",
"1401600",
- "1286400",
- "0"
+ "0",
+ "1286400"
],
+ "DefaultIndex": 3,
"ResetOnInit": true
},
{
@@ -70,9 +77,10 @@
"9999999",
"1497600",
"1401600",
- "1286400",
- "0"
+ "0",
+ "1286400"
],
+ "DefaultIndex": 3,
"ResetOnInit": true
},
{
@@ -918,6 +926,48 @@
"Value": "1"
},
{
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
+ "Node": "CPULittleClusterMaxFreq",
+ "Duration": 3600000,
+ "Value": "844800"
+ },
+ {
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
+ "Node": "CPULittleClusterMinFreq",
+ "Duration": 3600000,
+ "Value": "576000"
+ },
+ {
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
+ "Node": "CPULittleClusterMaxFreq",
+ "Duration": 3600000,
+ "Value": "1036800"
+ },
+ {
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_60",
+ "Node": "CPULittleClusterMinFreq",
+ "Duration": 3600000,
+ "Value": "576000"
+ },
+ {
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_70",
+ "Node": "CPULittleClusterMaxFreq",
+ "Duration": 3600000,
+ "Value": "1209600"
+ },
+ {
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_80",
+ "Node": "CPULittleClusterMaxFreq",
+ "Duration": 3600000,
+ "Value": "1382400"
+ },
+ {
+ "PowerHint": "LOW_POWER_LITTLE_CLUSTER_90",
+ "Node": "CPULittleClusterMaxFreq",
+ "Duration": 3600000,
+ "Value": "1555200"
+ },
+ {
"PowerHint": "LOW_POWER_CPU_50",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
@@ -925,11 +975,23 @@
},
{
"PowerHint": "LOW_POWER_CPU_50",
+ "Node": "CPUBigClusterMinFreq",
+ "Duration": 3600000,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "LOW_POWER_CPU_50",
"Node": "CPUBigPlusClusterMaxFreq",
"Duration": 3600000,
"Value": "1401600"
},
{
+ "PowerHint": "LOW_POWER_CPU_50",
+ "Node": "CPUBigPlusClusterMinFreq",
+ "Duration": 3600000,
+ "Value": "0"
+ },
+ {
"PowerHint": "LOW_POWER_CPU_60",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
@@ -937,11 +999,23 @@
},
{
"PowerHint": "LOW_POWER_CPU_60",
+ "Node": "CPUBigClusterMinFreq",
+ "Duration": 3600000,
+ "Value": "0"
+ },
+ {
+ "PowerHint": "LOW_POWER_CPU_60",
"Node": "CPUBigPlusClusterMaxFreq",
"Duration": 3600000,
"Value": "1708800"
},
{
+ "PowerHint": "LOW_POWER_CPU_60",
+ "Node": "CPUBigPlusClusterMinFreq",
+ "Duration": 3600000,
+ "Value": "0"
+ },
+ {
"PowerHint": "LOW_POWER_CPU_70",
"Node": "CPUBigClusterMaxFreq",
"Duration": 3600000,
diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index f3da334..c42d563 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -101,4 +101,10 @@
<!-- Integer delay in milliseconds before set wlan interface up during watchdog recovery -->
<integer name="config_wifi_framework_recovery_timeout_delay">3000</integer>
+
+ <!-- Enable adding minimum confirmation duration when sending network score to connectivity service. -->
+ <bool translatable="false" name="config_wifiMinConfirmationDurationSendNetworkScoreEnabled">true</bool>
+
+ <!-- Disable WPA2 to WPA3 auto-upgrade -->
+ <bool translatable="false" name="config_wifiSaeUpgradeEnabled">false</bool>
</resources>
