From 4586cec683186b2f1c946fe0f1160f280349b9f7 Mon Sep 17 00:00:00 2001 From: Kiwon Park Date: Wed, 29 May 2024 11:44:26 -0700 Subject: [PATCH 1/3] Enable bootstrap if warranty sku is set Test: verified setupwizard.feature.provisioning_profile_mode is set or unset depending on psku set or unset Bug: 336903409 Change-Id: I3f3f96516a2774e54dcbfa4470cbe1c98e46df7e --- conf/init.caiman.rc | 4 ++++ conf/init.komodo.rc | 4 ++++ conf/init.tokay.rc | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/conf/init.caiman.rc b/conf/init.caiman.rc index c63cfa7d..cc70e3ec 100644 --- a/conf/init.caiman.rc +++ b/conf/init.caiman.rc @@ -79,3 +79,7 @@ on property:sys.boot_completed=1 # it should be written by the system init. on property:ro.boot.hardware.sku=GWVK6 setprop audio.camerasound.force true + +# Enable bootstrap when warrarnty is set +on boot && property:ro.boot.warranty.sku=* + setprop setupwizard.feature.provisioning_profile_mode true \ No newline at end of file diff --git a/conf/init.komodo.rc b/conf/init.komodo.rc index 51d7027f..ca74c2b8 100644 --- a/conf/init.komodo.rc +++ b/conf/init.komodo.rc @@ -83,3 +83,7 @@ on property:sys.boot_completed=1 # it should be written by the system init. on property:ro.boot.hardware.sku=GQ57S setprop audio.camerasound.force true + +# Enable bootstrap when warrarnty is set +on boot && property:ro.boot.warranty.sku=* + setprop setupwizard.feature.provisioning_profile_mode true diff --git a/conf/init.tokay.rc b/conf/init.tokay.rc index f0626726..b1aeeb19 100644 --- a/conf/init.tokay.rc +++ b/conf/init.tokay.rc @@ -81,3 +81,7 @@ on fs # it should be written by the system init. on property:ro.boot.hardware.sku=G1B60 setprop audio.camerasound.force true + +# Enable bootstrap when warrarnty is set +on boot && property:ro.boot.warranty.sku=* + setprop setupwizard.feature.provisioning_profile_mode true \ No newline at end of file From 2c04e6bee6825f32cec0fd938e5b9805281e2c7b Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 5 Jun 2024 20:11:39 +0000 Subject: [PATCH 2/3] Override config_useDeadZone on caimito devices Bug: 324611410 Change-Id: Iacb3b4cb74106e3b3eecd1c7adb7de8e48a852aa Test: Tested on komodo --- .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ .../frameworks/base/packages/SystemUI/res/values/config.xml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index bd5eb09e..116b0df5 100644 --- a/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/caiman/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -73,4 +73,7 @@ false + + + false diff --git a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index 8d5d2460..7b3e4c74 100644 --- a/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/komodo/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -73,4 +73,7 @@ false + + + false diff --git a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml index dbc18d0f..6564d57a 100644 --- a/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml +++ b/tokay/overlay/frameworks/base/packages/SystemUI/res/values/config.xml @@ -73,4 +73,7 @@ false + + + false From 313e0cbebbc33dcdcfacd9b978313be15e1d5eac Mon Sep 17 00:00:00 2001 From: David Chao Date: Thu, 23 May 2024 06:09:40 +0000 Subject: [PATCH 3/3] thermal: update charging thermal throttling Increase K_I and PowerWeight to reduce temperature and charging throttling overshoots. Bug: 338150302 Test: boot and charging thermal throtlting worked properly. Change-Id: Ia7b2b5f7b2f8d62d1cde800be149993b284f72d4 --- thermal/thermal_info_config_caiman.json | 4 ++-- thermal/thermal_info_config_charge_caiman.json | 4 ++-- thermal/thermal_info_config_charge_komodo.json | 4 ++-- thermal/thermal_info_config_charge_tokay.json | 4 ++-- thermal/thermal_info_config_komodo.json | 4 ++-- thermal/thermal_info_config_tokay.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index cf136b77..03f0f21b 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -967,7 +967,7 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], @@ -979,7 +979,7 @@ "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index d491fadd..f2ad61be 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -196,7 +196,7 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], @@ -208,7 +208,7 @@ "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 6ae44ce1..1851ceb4 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -207,7 +207,7 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], @@ -219,7 +219,7 @@ "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index 64d2197f..740ecfa1 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -174,7 +174,7 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], @@ -186,7 +186,7 @@ "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index ed4db31f..22db4453 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -990,7 +990,7 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], @@ -1002,7 +1002,7 @@ "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index e315a9c8..e2c71651 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -924,7 +924,7 @@ "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 50, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], @@ -936,7 +936,7 @@ "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.12, 0.12, 1.0, 1.0, 1.0, 1.0, 1.0] } ], "BindedCdevInfo": [