From db339d7ccb7ab40bbb52805655d7e74fe747c23d Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Thu, 13 Jan 2022 23:06:36 +0000
Subject: [PATCH 1/2] Revert "Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS"

Revert "Remove BOARD_WITHOUT_DTLS"

Revert "Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS"

Revert "Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS"

Revert "Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS"

Revert submission 16603844-colefaust_dauntless

Reason for revert: Broke other products that didn't set BOARD_WITHOUT_DTLS
Reverted Changes:
I3b4ab3ed2:Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS
Iee95550f4:Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS
I1b210d8ab:Make BOARD_WITHOUT_DTLS work without an override
I80bfec988:Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS
I5f51cf010:Use BOARD_HAS_DTLS instead of BOARD_WITHOUT_DTLS
If6592aa18:Remove BOARD_WITHOUT_DTLS

Change-Id: Ibb34b7d0f36ffc1ddfa60fa8a23483891c89a78d
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index b4d31b9f..edf7620a 100644
--- a/device.mk
+++ b/device.mk
@@ -564,7 +564,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
 
 # Titan-M
-ifneq (,$(BOARD_HAS_DTLS))
+ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
 include hardware/google/pixel/dauntless/dauntless.mk
 endif
 

From 270f0d46efd21ae23cc42f26d6ea541e94995b2a Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Wed, 12 Jan 2022 15:21:28 -0800
Subject: [PATCH 2/2] Added default TCP buffer size for Pixels

Bug: 213596972
Test: Manual
Change-Id: Ib2dbd339d9b8ae9f9f1248f7be518cdf5830ec7c
---
 .../base/core/res/res/values/config.xml           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index f7058380..31b59d74 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -266,4 +266,19 @@
 
     <!-- Enable Zram writeback feature to allow unused pages in zram be written to flash. -->
     <bool name="config_zramWriteback">true</bool>
+
+    <!-- Configure tcp buffer sizes in the form:
+         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
+         If this is configured as an empty string, the system default will be applied.
+
+         For now this config is used by mobile data only. In the future it should be
+         used by Wi-Fi as well.
+
+         Note that starting from Android 13, the TCP buffer size is fixed after boot up, and should
+         never be changed based on carriers or the network types. The value should be configured
+         appropriately based on the device's memory and performance. It is recommended to use lower
+         values if the device has low memory or doesn't support high-speed network such like LTE,
+         NR, or Wifi.
+    -->
+    <string name="config_tcp_buffers" translatable="false">2097152,6291456,16777216,512000,2097152,8388608</string>
 </resources>