From b877da7c69d07e0b0fa94a589709cd995511146f Mon Sep 17 00:00:00 2001 From: Kai Shi Date: Tue, 25 Jan 2022 11:58:30 -0800 Subject: [PATCH 1/6] Increase TCP wmem max size Increase TCP wmem max size to allow high Tx throughput over wifi. Bug: 213596972 Test: manual test to confirm TCP memory size is increased and wifi TCP throughput with default TCP window size can reach 700Mbps in HE80 mode. Change-Id: I6058af03da756aaa63e89eddb674f5b054cecf33 --- conf/init.gs101.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 542c688b..7fb052a0 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -97,7 +97,7 @@ on init 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" From 8e741879c4f0db4c36c148978dd995ad0afe908c Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 26 Jan 2022 18:04:54 -0800 Subject: [PATCH 2/6] Delete extra health HIDL entry. The AIDL health entry is already in fragments. Bug: 216416660 Test: vts_treble_vintf_vendor_test Change-Id: I646a5bdb99254331156e5140f510ab4a8ef1388a --- manifest.xml | 9 --------- manifest_64.xml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/manifest.xml b/manifest.xml index 02ed2c9f..c3e774ed 100644 --- a/manifest.xml +++ b/manifest.xml @@ -108,15 +108,6 @@ @1.3::IDevice/google-armnn - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - com.google.input diff --git a/manifest_64.xml b/manifest_64.xml index e3b0d2af..4b0fae7e 100644 --- a/manifest_64.xml +++ b/manifest_64.xml @@ -109,15 +109,6 @@ hwbinder @1.3::IDevice/google-edgetpu - - android.hardware.health - hwbinder - 2.1 - - IHealth - default - - com.google.input From 5869192f8cf02132535130f5a0bc8b5eef8d5b11 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 26 Jan 2022 15:38:26 -0800 Subject: [PATCH 3/6] vendor.charger-gs101 -> vendor.charger The name of the service is changed during HIDL to AIDL migration. Since there are triggers depending on init.svc.vendor.charger, the name needs to be reverted. Test: none Bug: 215152892 Change-Id: I57d32e77bddfed94a0a6458e9bce7ff15a128163 --- health/android.hardware.health-service.gs101.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/health/android.hardware.health-service.gs101.rc b/health/android.hardware.health-service.gs101.rc index b738b5c1..0c313626 100644 --- a/health/android.hardware.health-service.gs101.rc +++ b/health/android.hardware.health-service.gs101.rc @@ -4,7 +4,7 @@ service vendor.health-gs101 /vendor/bin/hw/android.hardware.health-service.gs101 group system capabilities WAKE_ALARM BLOCK_SUSPEND file /dev/kmsg w -service vendor.charger-gs101 /vendor/bin/hw/android.hardware.health-service.gs101 --charger +service vendor.charger /vendor/bin/hw/android.hardware.health-service.gs101 --charger class charger seclabel u:r:charger_vendor:s0 user system From 6d6da105542d7d3b627b682b9357b3fb1b1a4039 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 27 Jan 2022 12:16:58 -0800 Subject: [PATCH 4/6] [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 Added SPDX-license-identifier-Apache-2.0 to: fingerprint/extension/Android.bp usb/usb/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I28953341fc1fdb81a1a8898543fde5477dba0f0f --- fingerprint/extension/Android.bp | 9 +++++++++ usb/usb/Android.bp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/fingerprint/extension/Android.bp b/fingerprint/extension/Android.bp index 4f64c3cb..fa2f13e3 100644 --- a/fingerprint/extension/Android.bp +++ b/fingerprint/extension/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_gs101_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_gs101_license"], +} + sh_binary { name: "fingerprint.extension.sh", init_rc: ["init.fingerprint.extension.rc"], diff --git a/usb/usb/Android.bp b/usb/usb/Android.bp index 0ce3167a..f0f50698 100644 --- a/usb/usb/Android.bp +++ b/usb/usb/Android.bp @@ -14,6 +14,15 @@ // limitations under the License. // +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_gs101_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_gs101_license"], +} + cc_binary { name: "android.hardware.usb-service.gs101", relative_install_path: "hw", From a63220bcd13f12cc4f26cbda79ab0b4b93729fca Mon Sep 17 00:00:00 2001 From: Pat Tjin Date: Thu, 27 Jan 2022 13:30:50 -0800 Subject: [PATCH 5/6] Add tangor% to the pattern match Some targets are using tangor_xxx and some use xxx_tangor, cover both to avoid duplicate zygote props. Test: Build Signed-off-by: Pat Tjin Change-Id: I43b18f6b5296f7b1575a8d5e817b3f2281dc1e1c --- BoardConfig-common.mk | 2 +- aosp_common.mk | 2 +- device.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 1113b588..7b5287dd 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := cortex-a55 TARGET_CPU_VARIANT_RUNTIME := cortex-a55 -ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) +ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a diff --git a/aosp_common.mk b/aosp_common.mk index e4e68635..57d67225 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -17,7 +17,7 @@ # # All components inherited here go to system image # -ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) +ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) diff --git a/device.mk b/device.mk index d153692c..dad8e372 100644 --- a/device.mk +++ b/device.mk @@ -18,7 +18,7 @@ include device/google/gs-common/device.mk TARGET_BOARD_PLATFORM := gs101 -ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) +ifneq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) LOCAL_64ONLY := _64 endif @@ -897,7 +897,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) endif -ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) +ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT))) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) From 443ba63fd23b66f0cf6f758e1a141736930d5347 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 27 Jan 2022 11:38:48 -0800 Subject: [PATCH 6/6] [LSC] Add LOCAL_LICENSE_KINDS to device/google/gs101 Added SPDX-license-identifier-Apache-2.0 to: fingerprint/extension/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: Ic6bbfc7ce50145b8d50dea38369cb4524fc3cc19 Merged-in: I28953341fc1fdb81a1a8898543fde5477dba0f0f --- fingerprint/extension/Android.bp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fingerprint/extension/Android.bp b/fingerprint/extension/Android.bp index 4f64c3cb..fa2f13e3 100644 --- a/fingerprint/extension/Android.bp +++ b/fingerprint/extension/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_google_gs101_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_google_gs101_license"], +} + sh_binary { name: "fingerprint.extension.sh", init_rc: ["init.fingerprint.extension.rc"],