Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ife2ff971eaeda2b132658ca2704bf1edde6fd80a
Change-Id: Ic1617d8e3b1aac8c2acc2c483b1347431e911a1e
diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 4b41614..669d091 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -93,7 +93,7 @@
write /proc/sys/net/core/optmem_max 20480
write /proc/sys/net/core/netdev_max_backlog 10000
write /proc/sys/net/ipv4/tcp_rmem "2097152 4194304 8388608"
- write /proc/sys/net/ipv4/tcp_wmem "262144 524288 1048576"
+ write /proc/sys/net/ipv4/tcp_wmem "262144 524288 8388608"
write /proc/sys/net/ipv4/tcp_mem "44259 59012 88518"
write /proc/sys/net/ipv4/udp_mem "88518 118025 177036"
@@ -441,9 +441,6 @@
setprop vendor.all.modules.ready 1
setprop vendor.all.devices.ready 1
- # Update dm-verity state and set partition.*.verified properties
- verity_update_state
-
# Permission for Health Storage HAL
chown system system /dev/sys/block/bootdevice/manual_gc
diff --git a/device.mk b/device.mk
index d0b3194..18961b8 100644
--- a/device.mk
+++ b/device.mk
@@ -113,6 +113,10 @@
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+# Hearing Aid Audio Support Using Bluetooth LE
+PRODUCT_PRODUCT_PROPERTIES += \
+ bluetooth.profile.asha.central.enabled=true
+
PRODUCT_PROPERTY_OVERRIDES += \
telephony.active_modems.max_count=2
@@ -378,14 +382,10 @@
# Power HAL
PRODUCT_COPY_FILES += \
- device/google/gs101/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
-
-PRODUCT_COPY_FILES += \
device/google/gs101/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json
-
+# Legacy HW
PRODUCT_COPY_FILES += \
device/google/gs101/powerhint_a0.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a0.json
-
PRODUCT_COPY_FILES += \
device/google/gs101/powerhint_a1.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint_a1.json
-include hardware/google/pixel/power-libperfmgr/aidl/device.mk
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f705838..f04a57f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -34,12 +34,6 @@
<!-- Maximum number of supported users -->
<integer name="config_multiuserMaximumUsers">4</integer>
- <!-- Boolean indicating if current platform supports HFP inband ringing -->
- <bool name="config_bluetooth_hfp_inband_ringing_support">true</bool>
-
- <!-- Whether Hearing Aid profile is supported -->
- <bool name="config_hearing_aid_profile_supported">true</bool>
-
<!-- Boolean indicating whether the wifi chipset has dual frequency band support -->
<bool translatable="false" name="config_wifi_dual_band_support">true</bool>
@@ -233,7 +227,6 @@
<string-array translatable="false" name="config_defaultPinnerServiceFiles">
<item>"/apex/com.android.art/javalib/core-oj.jar"</item>
<item>"/apex/com.android.art/javalib/core-libart.jar"</item>
- <item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
<item>"/system/framework/framework.jar"</item>
<item>"/system/framework/services.jar"</item>
<item>"/system/bin/surfaceflinger"</item>