From 293906adffbef5383d647f3f226bf2c39f777bfd Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 29 Feb 2024 02:04:44 +0000 Subject: [PATCH 1/4] thermal: reading the thermistor temperature from upstream sysfs for proto Bug: 326252555 Test: adb shell dumpsys thermalservice Change-Id: I13dc61d5d4df64b3a9858dc062a3eee52d0dee94 --- thermal/thermal_info_config_caiman_proto.json | 8 -------- thermal/thermal_info_config_komodo_proto.json | 8 -------- thermal/thermal_info_config_tokay_proto.json | 8 -------- 3 files changed, 24 deletions(-) diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 2423f412..59ee53fe 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 01113165..41c1a739 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index 839512dc..47d95a46 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -5,7 +5,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -15,7 +14,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -25,7 +23,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -35,7 +32,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -61,7 +56,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -71,7 +65,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 @@ -80,7 +73,6 @@ "Name":"usb_pwr_therm", "Type":"UNKNOWN", "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000 From f08329c9f7b2140023929988d7704bb401a90bc9 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Thu, 4 Jan 2024 07:53:13 +0000 Subject: [PATCH 2/4] Add Thread Service Config Bug: 318601784 Test: Build pass Change-Id: I3fcff022849c2729301e52820ec7139e133131c8 --- threadnetwork/hal/Android.bp | 15 +++++++++++++++ threadnetwork/hal/threadnetwork_hal_service.rc | 4 ++++ 2 files changed, 19 insertions(+) create mode 100644 threadnetwork/hal/Android.bp create mode 100644 threadnetwork/hal/threadnetwork_hal_service.rc diff --git a/threadnetwork/hal/Android.bp b/threadnetwork/hal/Android.bp new file mode 100644 index 00000000..074666f0 --- /dev/null +++ b/threadnetwork/hal/Android.bp @@ -0,0 +1,15 @@ +prebuilt_etc { + name: "caimito_threadnetwork_hal_service.rc", + src: "threadnetwork_hal_service.rc", + installable: false, +} + +override_apex { + name: "com.google.caimito.hardware.threadnetwork", + base: "com.android.hardware.threadnetwork", + prebuilts: [ + "caimito_threadnetwork_hal_service.rc", + "threadnetwork-default.xml", + "android.hardware.thread_network.prebuilt.xml", + ], +} diff --git a/threadnetwork/hal/threadnetwork_hal_service.rc b/threadnetwork/hal/threadnetwork_hal_service.rc new file mode 100644 index 00000000..5e19dfd4 --- /dev/null +++ b/threadnetwork/hal/threadnetwork_hal_service.rc @@ -0,0 +1,4 @@ +service vendor.threadnetwork_hal /apex/com.android.hardware.threadnetwork/bin/hw/android.hardware.threadnetwork-service spinel+socket:///data/vendor/bluetooth/thread_dispatcher_socket + class hal + user thread_network + group system From 1d9c4e70815a2fa82c04b712eefe5f56cc47c8de Mon Sep 17 00:00:00 2001 From: shihchienc Date: Thu, 4 Jan 2024 08:17:16 +0000 Subject: [PATCH 3/4] Support Thread HAL on ripcurrentpro add Thread config into device, default not enabled. Bug: 318601784 Test: build pass Change-Id: I63aa1eb386fcf26967c9b7e2f02b2afc87dcba2f --- device-ripcurrentpro.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 4c927241..c0332e19 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -253,3 +253,6 @@ PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off endif +# Thread HAL +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork From 4ef4ccf7f3624202f381b47ce2494f2548d7fde9 Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 5 Feb 2024 07:15:11 +0000 Subject: [PATCH 4/4] Support Thread HAL on KM4CM4TK4 add Thread config into device, default not enabled. Bug: 318601784 Test: Build pass Change-Id: Ie2fbb205ff373762d20c12f013e7f892cc2787ad --- device-caiman.mk | 4 ++++ device-komodo.mk | 4 ++++ device-tokay.mk | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index 5f6f302b..fabe766b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -375,3 +375,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Exynos RIL and telephony # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true + +# Thread HAL +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork diff --git a/device-komodo.mk b/device-komodo.mk index 6ddaf743..94c97474 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -371,3 +371,7 @@ SUPPORT_RIL_DOMAIN_SELECTION := true # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true + +# Thread HAL +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork diff --git a/device-tokay.mk b/device-tokay.mk index f4ca04c2..842ddd34 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -341,3 +341,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Exynos RIL and telephony # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true + +# Thread HAL +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork