From 2ea6a293049824cade509cbf30ad179265517031 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 17 Feb 2022 16:16:55 +0800 Subject: [PATCH 001/110] powerhint: Update LITTLE control temp value Align LITTLE control temp default value 95C as gchip team recommendation BUG: 220076055 Test: check LITTLE switch_on_temp/contrl_temp can be updated via thermal_stress.sh correctly. Change-Id: I7b5cd3efd9d968884cbdd954ccf921574368ee9e --- powerhint-oriole.json | 2 +- powerhint-raven.json | 2 +- powerhint-slider.json | 2 +- powerhint-whitefin.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index a3b6d99..6a8af9a 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -331,7 +331,7 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "90000", + "95000", "80000" ], "DefaultIndex": 0, diff --git a/powerhint-raven.json b/powerhint-raven.json index 19c6469..7487d32 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -332,7 +332,7 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "90000", + "95000", "80000" ], "DefaultIndex": 0, diff --git a/powerhint-slider.json b/powerhint-slider.json index 70fa4bb..b342d53 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -324,7 +324,7 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "90000", + "95000", "80000" ], "DefaultIndex": 0, diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 70fa4bb..b342d53 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -324,7 +324,7 @@ "Name": "LittleControlTempSet", "Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp", "Values": [ - "90000", + "95000", "80000" ], "DefaultIndex": 0, From 5b09eeaaedf320aeaddef4555772bca5b959539d Mon Sep 17 00:00:00 2001 From: Jimmy Shiu Date: Tue, 22 Feb 2022 23:28:20 +0800 Subject: [PATCH 002/110] powerhint: Remove unused TAUClampBoost value Bug: 207573241 Test: boot to home Change-Id: I21ad42d98d404e0147bba51847acce8e505ffbda --- powerhint-oriole.json | 1 - powerhint-raven.json | 1 - 2 files changed, 2 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6a8af9a..ea75415 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -144,7 +144,6 @@ "Values": [ "553", "108", - "43", "1", "107", "42" diff --git a/powerhint-raven.json b/powerhint-raven.json index 7487d32..ed0144b 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -145,7 +145,6 @@ "553", "158", "108", - "43", "1", "157", "42" From 545d5fe25ff3a45dbfe543e5c4b30b2ee6532b87 Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Wed, 30 Mar 2022 05:53:25 +0000 Subject: [PATCH 003/110] Add powerhint nodes for PMU parameter tune Bug: 223688700 Change-Id: I3abcbd0b8efb696469468dfc190699ec3842db08 Signed-off-by: Taeju Park --- powerhint-oriole.json | 27 +++++++++++++++++++++++++++ powerhint-raven.json | 27 +++++++++++++++++++++++++++ powerhint-slider.json | 27 +++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index a555bca..e76c7ad 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -413,6 +413,15 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "PMU_POLL", + "Path": "/proc/vendor_sched/pmu_poll_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 } ], "Actions": [ @@ -1267,6 +1276,12 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "BigControlTempSet", @@ -1375,6 +1390,12 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", @@ -1458,6 +1479,12 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" } ] } diff --git a/powerhint-raven.json b/powerhint-raven.json index b776df9..69ec157 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -414,6 +414,15 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "PMU_POLL", + "Path": "/proc/vendor_sched/pmu_poll_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 } ], "Actions": [ @@ -1284,6 +1293,12 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "BigControlTempSet", @@ -1392,6 +1407,12 @@ "Duration": 1000, "Value": "1" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", @@ -1475,6 +1496,12 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" } ] } diff --git a/powerhint-slider.json b/powerhint-slider.json index d5eab6b..7ee9ab4 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -379,6 +379,15 @@ ], "DefaultIndex": 0, "ResetOnInit": false + }, + { + "Name": "PMU_POLL", + "Path": "/proc/vendor_sched/pmu_poll_enable", + "Values": [ + "0", + "1" + ], + "DefaultIndex": 0 } ], "Actions": [ @@ -1301,6 +1310,12 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "BigControlTempSet", @@ -1378,6 +1393,18 @@ "Node": "MLUclampBoost", "Duration": 2000, "Value": "512" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" } ] } From ded41286e46237c231f118f4c12f16fe1f5af27c Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 21 Apr 2022 18:18:24 +0000 Subject: [PATCH 004/110] Revert "powerhint: Remove unused TAUClampBoost value" Revert "powerhint: Remove unused TAUClampBoost value" Revert submission 16977206-powerhint_remove_unused_value Reason for revert: resolve merge conflict Reverted Changes: Icd80b1195:powerhint: Remove unused TAUClampBoost value I21ad42d98:powerhint: Remove unused TAUClampBoost value Change-Id: I442ee382c4332f2b8f20cb91fb7ae441427e7883 --- powerhint-oriole.json | 1 + powerhint-raven.json | 1 + 2 files changed, 2 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 48c0939..b616d60 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -144,6 +144,7 @@ "Values": [ "553", "108", + "43", "1", "107", "42" diff --git a/powerhint-raven.json b/powerhint-raven.json index bb0cf89..be5141a 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -145,6 +145,7 @@ "553", "158", "108", + "43", "1", "157", "42" From 8c4bbc8586e252960975c597cb1e409c979a271a Mon Sep 17 00:00:00 2001 From: chungkai Date: Thu, 14 Apr 2022 03:04:02 +0000 Subject: [PATCH 005/110] powerhal: update new boost uclamp value update new boost uclamp value since we update cpu capacity Test: PTS UIBench has no obvious difference Bug: 224649226 Signed-off-by: chungkai Change-Id: I63f72a2f7aa48c3cd915089cfba39d666adcb903 --- powerhint-oriole.json | 28 ++++++++++++++-------------- powerhint-raven.json | 32 ++++++++++++++++---------------- powerhint-slider.json | 38 +++++++++++++++++++------------------- powerhint-whitefin.json | 38 +++++++++++++++++++------------------- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index b616d60..d1fcc97 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -143,11 +143,11 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "108", - "43", + "126", + "56", "1", - "107", - "42" + "125", + "55" ], "ResetOnInit": true }, @@ -155,9 +155,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "125", - "65", - "30" + "160", + "85", + "39" ], "ResetOnInit": true }, @@ -165,7 +165,7 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "154", + "180", "512" ], "DefaultIndex": 0, @@ -438,7 +438,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "DEVICE_IDLE", @@ -450,7 +450,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "LAUNCH", @@ -1164,13 +1164,13 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "107" + "Value": "125" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", @@ -1212,13 +1212,13 @@ "PowerHint": "BOOST_90HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "BOOST_60HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "REFRESH_90FPS", diff --git a/powerhint-raven.json b/powerhint-raven.json index be5141a..cb20729 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -143,12 +143,12 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "158", - "108", - "43", + "185", + "126", + "57", "1", - "157", - "42" + "183", + "55" ], "ResetOnInit": true }, @@ -156,9 +156,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "125", - "65", - "30" + "160", + "85", + "39" ], "ResetOnInit": true }, @@ -166,7 +166,7 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "154", + "180", "512" ], "DefaultIndex": 0, @@ -439,7 +439,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "DEVICE_IDLE", @@ -451,7 +451,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "125" + "Value": "160" }, { "PowerHint": "LAUNCH", @@ -462,7 +462,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "LAUNCH", @@ -1176,13 +1176,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "157" + "Value": "183" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "REFRESH_60FPS", @@ -1229,13 +1229,13 @@ "PowerHint": "BOOST_120HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "158" + "Value": "185" }, { "PowerHint": "BOOST_60HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "REFRESH_120FPS", diff --git a/powerhint-slider.json b/powerhint-slider.json index 55f53f4..3c1b410 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -143,13 +143,13 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "158", - "108", - "43", + "185", + "126", + "56", "1", - "157", - "107", - "42" + "183", + "125", + "55" ], "ResetOnInit": true }, @@ -157,9 +157,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "125", - "65", - "30" + "160", + "85", + "39" ], "ResetOnInit": true }, @@ -167,7 +167,7 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "154", + "180", "512" ], "DefaultIndex": 0, @@ -404,7 +404,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "DEVICE_IDLE", @@ -416,7 +416,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "125" + "Value": "160" }, { "PowerHint": "LAUNCH", @@ -427,7 +427,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "LAUNCH", @@ -1141,13 +1141,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "157" + "Value": "183" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "107" + "Value": "125" }, { "PowerHint": "REFRESH_90FPS", @@ -1158,7 +1158,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "REFRESH_60FPS", @@ -1215,19 +1215,19 @@ "PowerHint": "BOOST_120HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "158" + "Value": "185" }, { "PowerHint": "BOOST_90HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "BOOST_60HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "REFRESH_120FPS", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index fe4a49c..cf69316 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -143,13 +143,13 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "158", - "108", - "43", + "185", + "126", + "56", "1", - "157", - "107", - "42" + "183", + "125", + "55" ], "ResetOnInit": true }, @@ -157,9 +157,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "125", - "65", - "30" + "160", + "85", + "39" ], "ResetOnInit": true }, @@ -167,7 +167,7 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "154", + "180", "512" ], "DefaultIndex": 0, @@ -395,7 +395,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "DEVICE_IDLE", @@ -407,7 +407,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "125" + "Value": "160" }, { "PowerHint": "LAUNCH", @@ -418,7 +418,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "65" + "Value": "85" }, { "PowerHint": "LAUNCH", @@ -1126,13 +1126,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "157" + "Value": "183" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "107" + "Value": "125" }, { "PowerHint": "REFRESH_90FPS", @@ -1143,7 +1143,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "REFRESH_60FPS", @@ -1200,19 +1200,19 @@ "PowerHint": "BOOST_120HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "158" + "Value": "185" }, { "PowerHint": "BOOST_90HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "BOOST_60HZ", "Node": "TAUClampBoost", "Duration": 200, - "Value": "108" + "Value": "126" }, { "PowerHint": "REFRESH_120FPS", From 45ba014dc9f26daff9e7738247f636a96b27fd58 Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Thu, 21 Apr 2022 12:26:48 -0700 Subject: [PATCH 006/110] Add virtual fingerprint HAL to device on debuggable builds. Bug: 228638448 Test: manual Change-Id: I280d77c338a8ae3584956827155d7ba2cbd62aa5 --- device-raven.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/device-raven.mk b/device-raven.mk index 395bb97..06bd62d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -268,3 +268,5 @@ PRODUCT_COPY_FILES := \ $(PRODUCT_COPY_FILES) PRODUCT_RESTRICT_VENDOR_FILES := false + +PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example From 4ffd90e138f7a4d9eee180c372d912043ec57336 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 007/110] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: I29b9b4626565a7d2698745dbb385dc2b90633b3a --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index b6cacb7..4df1b54 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -116,7 +116,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -130,7 +130,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index 06bd62d..09c44ab 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -131,7 +131,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -145,7 +145,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml diff --git a/device-slider.mk b/device-slider.mk index 647ee73..631ee09 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -97,7 +97,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..e55b62a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st - -DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml + android.hardware.nfc-service.st # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 5fdaf5e..3b3e1ee 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 2b455df..165665e 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 4053823d4a03b825fc64d902d1e7aa48a5851020 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Apr 2022 15:53:03 +0000 Subject: [PATCH 008/110] Revert "Switch NFC from HIDL to AIDL" This reverts commit 4ffd90e138f7a4d9eee180c372d912043ec57336. Reason for revert: Broken tests Bug: 230834308 Change-Id: I93f632ed8c489300e10c1acd870fa142ba55ae6e --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- device-slider.mk | 3 ++- device-whitefin.mk | 5 ++++- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4df1b54..b6cacb7 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -116,7 +116,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -130,6 +130,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index 09c44ab..06bd62d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -131,7 +131,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -145,6 +145,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml diff --git a/device-slider.mk b/device-slider.mk index 631ee09..647ee73 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -97,6 +97,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index e55b62a..577092e 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -76,7 +76,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc@1.2-service.st + +DEVICE_MANIFEST_FILE += \ + device/google/raviole/nfc/manifest_nfc.xml # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 3b3e1ee..5fdaf5e 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 165665e..2b455df 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index b7599c7..0035a70 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# Allow list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} +# White list to be set at startup. +DEVICE_HOST_WHITE_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 91a40969dfb29bc2f5d9460424b8b83d5d27c507 Mon Sep 17 00:00:00 2001 From: George Chang Date: Wed, 30 Mar 2022 22:13:09 +0800 Subject: [PATCH 009/110] Switch NFC from HIDL to AIDL Bug: 216290344 Test: atest NfcNciInstrumentationTests Test: atest VtsAidlHalNfcTargetTest Change-Id: Ifde6ab418a18a10b11911cd2e8459f769587f685 --- device-oriole.mk | 3 +-- device-raven.mk | 3 +-- device-slider.mk | 3 +-- device-whitefin.mk | 5 +---- nfc/libnfc-hal-st-debug.conf | 4 ++-- nfc/libnfc-hal-st-disable.conf | 4 ++-- nfc/libnfc-hal-st.conf | 4 ++-- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 32ff22b..e4e1322 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -116,7 +116,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -130,7 +130,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # Vibrator HAL diff --git a/device-raven.mk b/device-raven.mk index 2e3e883..9bf8a47 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -131,7 +131,7 @@ endif PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -145,7 +145,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml diff --git a/device-slider.mk b/device-slider.mk index 647ee73..631ee09 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -84,7 +84,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st + android.hardware.nfc-service.st # SecureElement PRODUCT_PACKAGES += \ @@ -97,7 +97,6 @@ PRODUCT_COPY_FILES += \ device/google/raviole/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml \ device/google/raviole/nfc/manifest_se.xml # PowerStats HAL diff --git a/device-whitefin.mk b/device-whitefin.mk index 577092e..e55b62a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -76,10 +76,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ NfcNci \ Tag \ - android.hardware.nfc@1.2-service.st - -DEVICE_MANIFEST_FILE += \ - device/google/raviole/nfc/manifest_nfc.xml + android.hardware.nfc-service.st # PowerStats HAL PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf index 5fdaf5e..3b3e1ee 100644 --- a/nfc/libnfc-hal-st-debug.conf +++ b/nfc/libnfc-hal-st-debug.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st-disable.conf b/nfc/libnfc-hal-st-disable.conf index 2b455df..165665e 100644 --- a/nfc/libnfc-hal-st-disable.conf +++ b/nfc/libnfc-hal-st-disable.conf @@ -64,8 +64,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 0035a70..b7599c7 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5 NCI_HAL_MODULE="nfc_nci.st21nfc" ############################################################################### -# White list to be set at startup. -DEVICE_HOST_WHITE_LIST={02:C0} +# Allow list to be set at startup. +DEVICE_HOST_ALLOW_LIST={02:C0} ############################################################################### # BAIL OUT value for P2P From 3a3798456c2cf999a0e214bd16971d3ef60e84d4 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 5 May 2022 21:55:37 +0200 Subject: [PATCH 010/110] Bluetooth le_audio_output: use dynamic format The format for output is negotiated, no need to specify it in xml config file. Bug: 230578655 Test: Play music using LE Audio device Change-Id: I44fcba0148dc376c72ccd2180d68f403cef873db --- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +----- .../bluetooth_with_le_audio_policy_configuration_7_0.xml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..4b915ec 100644 --- a/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/oriole/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,11 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - + - - - + Date: Mon, 13 Jun 2022 21:39:55 +0000 Subject: [PATCH 011/110] Allow including car boards from outside google_car Bug: 224902566 Test: Build raven_car and oriole_car Change-Id: If8b3da8c545b89093436f5ed6c0b65caf67bb5c2 --- oriole/BoardConfig.mk | 7 +++++-- raven/BoardConfig.mk | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 1292d4a..916558c 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -13,8 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -ifdef PHONE_CAR_BOARD_PRODUCT - include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +ifdef AUTOMOTIVE_PRODUCT_PATH + #RBC# include_top device/google/auto_tcu + #RBC# include_top device/google/pixel_tcu + #RBC# include_top device/google_car + include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk else TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := oriole diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 2b67f76..7e7ba7e 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -14,8 +14,11 @@ # limitations under the License. # -ifdef PHONE_CAR_BOARD_PRODUCT - include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +ifdef AUTOMOTIVE_PRODUCT_PATH + #RBC# include_top device/google/auto_tcu + #RBC# include_top device/google/pixel_tcu + #RBC# include_top device/google_car + include device/$(AUTOMOTIVE_PRODUCT_PATH)/BoardConfig.mk else TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := raven From 20a2a95dd3dccf58e7bb4a647ce3bddf76a9488b Mon Sep 17 00:00:00 2001 From: justinweng Date: Tue, 25 Jan 2022 15:45:21 +0800 Subject: [PATCH 012/110] Audio configuration for spatial audio Update audio policy and effect configuration files to support spatial audio feature Bug: 237677573 Test: make Change-Id: I4a7e2eb3c44192954b7bcf804d14097e94e90eb0 --- .../config/audio_platform_configuration.xml | 1 + .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- ...licy_configuration_le_offload_disabled.xml | 16 +++++++++------ ...with_le_audio_policy_configuration_7_0.xml | 8 ++++++-- audio/oriole/config/mixer_paths.xml | 12 +++++++++++ .../config/audio_platform_configuration.xml | 1 + .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- ...licy_configuration_le_offload_disabled.xml | 16 +++++++++------ ...with_le_audio_policy_configuration_7_0.xml | 6 +++++- audio/raven/config/mixer_paths.xml | 12 +++++++++++ device-oriole.mk | 7 +++++++ device-raven.mk | 7 +++++++ 14 files changed, 109 insertions(+), 37 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index a4232cd..676131b 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 5bd7ec8..fe4eafb 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -64,6 +64,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> - + + + - \ No newline at end of file + diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index a39fcd0..93e3547 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -429,6 +429,18 @@ + + + + + + + + + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index a4232cd..676131b 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 5bd7ec8..fe4eafb 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -64,6 +64,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> - + + + + + + + + + + + + + + + diff --git a/device-oriole.mk b/device-oriole.mk index 95b0201..f6f46a0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -237,6 +237,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +PRODUCT_PACKAGES += \ + libspatialaudio + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-raven.mk b/device-raven.mk index da3ac3c..a510882 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -251,6 +251,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +PRODUCT_PACKAGES += \ + libspatialaudio + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml From 287239d28aafec502ad27e23911e4deabebe2241 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 20 Jul 2022 11:59:10 +0200 Subject: [PATCH 013/110] Revert "Oriole/Raven: enable Dolby DD+ decoder" This reverts commit 8074cbccb4dd0c0ffe4a6424f65b362014c80ed6. Reason for revet: This should be in vendor make files. Bug: 238831180 Test: make Change-Id: Ib739344838f98bf0d29e7693df57ae5950826703 --- device-oriole.mk | 10 ------ device-raven.mk | 12 ------- media_codecs_dolby_c2.xml | 66 --------------------------------------- 3 files changed, 88 deletions(-) delete mode 100644 media_codecs_dolby_c2.xml diff --git a/device-oriole.mk b/device-oriole.mk index 047bade..ceb5eba 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -248,13 +248,3 @@ PRODUCT_PACKAGES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml - -# Dolby integration --include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) -# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false diff --git a/device-raven.mk b/device-raven.mk index 932db3c..d51b7a0 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -262,15 +262,3 @@ PRODUCT_PACKAGES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml - -# Dolby integration --include vendor/dolby/ds/dolby-buildspec.mk -$(call inherit-product-if-exists, vendor/dolby/ds/dolby-product.mk) -# overwrite file coming from device/google/gs101/media_codecs_bo_c2.xml -PRODUCT_COPY_FILES := \ - device/google/raviole/media_codecs_dolby_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ - $(PRODUCT_COPY_FILES) - -PRODUCT_RESTRICT_VENDOR_FILES := false - -PRODUCT_PACKAGES_DEBUG += android.hardware.biometrics.fingerprint-service.example diff --git a/media_codecs_dolby_c2.xml b/media_codecs_dolby_c2.xml deleted file mode 100644 index e7ecfd9..0000000 --- a/media_codecs_dolby_c2.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 7188df25b772d9fe371a788d2eaef7452f580459 Mon Sep 17 00:00:00 2001 From: jimmyshiu Date: Fri, 24 Jun 2022 07:58:53 +0000 Subject: [PATCH 014/110] Remove universal touch boost Bug: 236781877 Test: PtsUiBench Change-Id: I76b0498c475c2fd839d4938215a80b5f5d10abcb --- powerhint-oriole.json | 63 ---------------------- powerhint-raven.json | 63 ---------------------- powerhint-slider.json | 113 ---------------------------------------- powerhint-whitefin.json | 113 ---------------------------------------- 4 files changed, 352 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index a6934b2..52b054f 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -144,7 +144,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", "1", "55" ], @@ -1302,58 +1301,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1371,16 +1318,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-raven.json b/powerhint-raven.json index 3b9b980..c06d670 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -143,7 +143,6 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", "1", "55" ], @@ -1299,58 +1298,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1368,16 +1315,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-slider.json b/powerhint-slider.json index 1e2df3f..26af88f 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -143,12 +143,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", - "129", - "56", "1", - "183", - "128", "55" ], "ResetOnInit": true @@ -1246,94 +1241,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1351,21 +1258,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", @@ -1377,11 +1269,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, { "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", "Node": "LimitFlashCurrent", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index a590283..3b10212 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -143,12 +143,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "185", - "129", - "56", "1", - "183", - "128", "55" ], "ResetOnInit": true @@ -1231,94 +1226,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "MaskHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "ADPF_DISABLE_TA_BOOST", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "BOOST_DISPLAY", - "Type": "DoHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "INTERACTION", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, - { - "PowerHint": "BOOST_120HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "185" - }, - { - "PowerHint": "BOOST_90HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "BOOST_60HZ", - "Node": "TAUClampBoost", - "Duration": 200, - "Value": "129" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_120FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_60HZ" - }, - { - "PowerHint": "REFRESH_90FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "BOOST_120HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Node": "FGPreferIdle", @@ -1336,21 +1243,6 @@ "Type": "EndHint", "Value": "INTERACTION" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_120HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_90HZ" - }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "BOOST_60HZ" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", @@ -1362,11 +1254,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", - "Type": "DoHint", - "Value": "BOOST_DISPLAY" - }, { "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", "Node": "LimitFlashCurrent", From 727b06a93b0a953b78f85b23a1f36ac63901824e Mon Sep 17 00:00:00 2001 From: Jia-yi Chen Date: Tue, 10 May 2022 15:19:10 -0700 Subject: [PATCH 015/110] powerhal: Remove redundant node MIFTargetLoad pa/2205640 sets the default value for MIFTargetLoad to "20 10 80" so there is no needed to send additional hint to set that value. Bug: 229164049 Test: Boot Change-Id: I3a459c5312c476f130b682308cf5a6205e34f599 --- powerhint-oriole.json | 33 --------------------------------- powerhint-raven.json | 33 --------------------------------- 2 files changed, 66 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 52b054f..558b137 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -130,15 +130,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "MIFTargetLoad", - "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", - "Values": [ - "20 5 80", - "20 10 80" - ], - "ResetOnInit": true - }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", @@ -857,12 +848,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "TAPreferHighCap", @@ -941,12 +926,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "TAPreferHighCap", @@ -1025,12 +1004,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDHighCpusetCpus", @@ -1103,12 +1076,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDHighCpusetCpus", diff --git a/powerhint-raven.json b/powerhint-raven.json index c06d670..5d9328f 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -129,15 +129,6 @@ "DefaultIndex": 0, "ResetOnInit": true }, - { - "Name": "MIFTargetLoad", - "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", - "Values": [ - "20 5 80", - "20 10 80" - ], - "ResetOnInit": true - }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", @@ -867,12 +858,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "TAPreferHighCap", @@ -951,12 +936,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "TAPreferHighCap", @@ -1035,12 +1014,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDHighCpusetCpus", @@ -1113,12 +1086,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "MIFTargetLoad", - "Duration": 0, - "Value": "20 10 80" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDHighCpusetCpus", From 29b699dd55d0539ab44a3965fd350f51c0b8f6e3 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 23:10:38 -0700 Subject: [PATCH 016/110] Remove FPS boost Bug: 241312961 Test: Build Change-Id: I5fbdc1063d2ac0c468d2a8c5b00293adac7d4179 Signed-off-by: Wei Wang --- powerhint-oriole.json | 7 +++---- powerhint-raven.json | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 558b137..6e340f8 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -135,8 +135,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1254,13 +1253,13 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", diff --git a/powerhint-raven.json b/powerhint-raven.json index 5d9328f..822729f 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -134,8 +134,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1246,13 +1245,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", From 0f365e08b67aefc8519f224561ef4530460ad4b9 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Wed, 10 Aug 2022 18:59:17 +0000 Subject: [PATCH 017/110] Enable ADPF CPU hints for SF Allow these devices to send CPU hints to PowerHAL from SF to reduce drops and save power. Bug: b/241152899 Bug: b/195990840 Test: manual Change-Id: I915bf64a669c176e53542752760f21e3a696a57b --- conf/init.raviole.rc | 8 ++++++++ device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ powerhint-oriole.json | 22 ---------------------- powerhint-raven.json | 28 ---------------------------- 5 files changed, 16 insertions(+), 50 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 31ff159..1437c49 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -66,3 +66,11 @@ on property:persist.vendor.se.ese2.mode=ctsmode on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 + +# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints +on property:sys.boot_completed=1 + trigger override-sf-uclamp + +on override-sf-uclamp + write /proc/vendor_sched/rt_uclamp_min 0 + write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/device-oriole.mk b/device-oriole.mk index d618bb8..e30c829 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -248,3 +248,7 @@ PRODUCT_PACKAGES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/device-raven.mk b/device-raven.mk index 1b92705..ca789ed 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -262,3 +262,7 @@ PRODUCT_PACKAGES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6e340f8..3966249 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -148,16 +148,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -475,12 +465,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -499,12 +483,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-raven.json b/powerhint-raven.json index 822729f..26b07ef 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -147,16 +147,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -474,12 +464,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -492,12 +476,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "161" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -509,12 +487,6 @@ "Type": "DoHint", "Value": "LAUNCH_120FPS" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From 6e05ed0e45a349191bc51d1d47aa8afd31282cd9 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 16 Aug 2022 13:56:53 +0800 Subject: [PATCH 018/110] move bcmbt settings to gs-common Bug: 242661555 Test: build pass Change-Id: I5d1a1e6a0ba11009c18d3d9740042b1c67d35c9d --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 3fe36e5..9f026ec 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -33,7 +33,7 @@ include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l25/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk diff --git a/device-raven.mk b/device-raven.mk index 4230140..af96dc5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -32,7 +32,7 @@ include device/google/raviole/audio/raven/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk diff --git a/device-slider.mk b/device-slider.mk index a1662de..1709c87 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -27,7 +27,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) diff --git a/device-whitefin.mk b/device-whitefin.mk index df3ce52..57cafea 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -27,7 +27,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk -include device/google/gs101/bluetooth/bluetooth.mk +include device/google/gs-common/bcmbt/bluetooth.mk $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) From b1d2a66a389bc3cc57cb5687552baec591b17af5 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Tue, 30 Aug 2022 14:18:41 -0700 Subject: [PATCH 019/110] uwb: update vendor hal folder location Bug: 241468038 Change-Id: If64da82541f95b0ce5ee1de528c30ec8f5d66828 --- uwb/uwb_calibration.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 3889a08..0660f86 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -14,7 +14,7 @@ # limitations under the License. # UWB - ultra wide band -$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/raviole/uwb From 42c1ef10d5fbaed7d3e166b1b9319d1fac2f1c8c Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Thu, 1 Sep 2022 21:39:19 +0000 Subject: [PATCH 020/110] Revert "uwb: update vendor hal folder location" Revert "uwb: update vendor hal folder location" Revert "uwb: update vendor hal folder location" Revert "uwb: update vendor hal folder location" Revert "uwb: move uwb hal into dw3000-hal folder" Revert "uwb: update vendor hal folder location" Revert submission 19786107-241468038 Reason for revert: b/244619620 - This change will cause automerger conflicts and should go into tm-qpr-dev since tm-qpr-dev is still actively being used. Reverted Changes: I6c84b59fe:uwb: update vendor hal folder location If64da8254:uwb: update vendor hal folder location Ie3a507f22:uwb: update vendor hal folder location Ib5c22ea7e:uwb: move uwb hal into dw3000-hal folder Id48f26750:uwb: update vendor hal folder location I1a05fe35f:uwb: update vendor hal folder location Change-Id: I26e42a47448675ecfb0b5be79fa1a527d1955912 --- uwb/uwb_calibration.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 0660f86..3889a08 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -14,7 +14,7 @@ # limitations under the License. # UWB - ultra wide band -$(call inherit-product-if-exists, vendor/qorvo/uwb/dw3000-hal/uwb.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/raviole/uwb From 2e4a5c646c830b5eb94ccdb69ea5637167d3ce12 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 5 Sep 2022 12:37:04 +0800 Subject: [PATCH 021/110] move insmod script to gs-common Bug: 243763292 Test: boot to home Change-Id: I197ed4be5c205e5ca9eadb7a7e237cb1c507c457 --- conf/init.raviole.rc | 2 +- conf/init.slider.rc | 2 +- conf/init.whitefin.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 1437c49..908b6cd 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -32,7 +32,7 @@ on boot && property:ro.build.type=userdebug && \ property:persist.vendor.fingerprint.disable.fake.override=100 setprop vendor.fingerprint.disable.fake ${persist.vendor.fingerprint.disable.fake.override} -service insmod_sh_raviole /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_raviole /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.slider.rc b/conf/init.slider.rc index 3042b5b..af4a484 100644 --- a/conf/init.slider.rc +++ b/conf/init.slider.rc @@ -20,7 +20,7 @@ on early-boot start insmod_sh_slider -service insmod_sh_slider /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.slider.cfg +service insmod_sh_slider /vendor/bin/insmod.sh /vendor/etc/init.insmod.slider.cfg class main user root group root system diff --git a/conf/init.whitefin.rc b/conf/init.whitefin.rc index c030ad7..8894c75 100644 --- a/conf/init.whitefin.rc +++ b/conf/init.whitefin.rc @@ -14,7 +14,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_whitefin -service insmod_sh_whitefin /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.whitefin.cfg +service insmod_sh_whitefin /vendor/bin/insmod.sh /vendor/etc/init.insmod.whitefin.cfg class main user root group root system From e41c2c2816ccc9397c8464ab8366367abd6cdbb4 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 26 Aug 2022 09:54:06 +0800 Subject: [PATCH 022/110] move bt_vendor.conf to gs-common Bug: 242661555 Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test Change-Id: I5ea3ed9ff12a3abc2f982c15392ecd4e8c2a2d5f --- device-oriole.mk | 29 ++++++++++++++--------------- device-raven.mk | 27 ++++++++++++--------------- device-slider.mk | 4 ---- device-whitefin.mk | 4 ---- 4 files changed, 26 insertions(+), 38 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a7ac75f..03e97e6 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -87,6 +87,20 @@ PRODUCT_PACKAGES_DEBUG += \ sar_test \ hci_inject +# userdebug specific +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +# Bluetooth LE Audio Hardware offload +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=true \ + persist.bluetooth.le_audio_test=false +endif + +# Bluetooth HAL +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf + + # WirelessCharger DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml @@ -211,12 +225,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf -PRODUCT_COPY_FILES += \ - device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service @@ -232,15 +240,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 -# userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -# Bluetooth LE Audio Hardware offload -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=true \ - persist.bluetooth.le_audio_test=false -endif - # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true diff --git a/device-raven.mk b/device-raven.mk index b341543..e88672c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -86,12 +86,24 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth_power_limits_raven_eu.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ $(LOCAL_PATH)/bluetooth_power_limits_raven_jp.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv +# Bluetooth HAL +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # Bluetooth Hal Extension test tools PRODUCT_PACKAGES_DEBUG += \ sar_test \ hci_inject +# userdebug specific +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +# Bluetooth LE Audio Hardware offload +PRODUCT_PRODUCT_PROPERTIES += \ + ro.bluetooth.leaudio_offload.supported=true \ + persist.bluetooth.leaudio_offload.disabled=true \ + persist.bluetooth.le_audio_test=false +endif + # WirelessCharger DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml @@ -224,12 +236,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf -PRODUCT_COPY_FILES += \ - device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service @@ -245,15 +251,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # This device is shipped with 31 (Android S) PRODUCT_SHIPPING_API_LEVEL := 31 -# userdebug specific -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -# Bluetooth LE Audio Hardware offload -PRODUCT_PRODUCT_PROPERTIES += \ - ro.bluetooth.leaudio_offload.supported=true \ - persist.bluetooth.leaudio_offload.disabled=true \ - persist.bluetooth.le_audio_test=false -endif - # declare use of spatial audio PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true diff --git a/device-slider.mk b/device-slider.mk index 1709c87..d40732b 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -105,10 +105,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/slider # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service diff --git a/device-whitefin.mk b/device-whitefin.mk index 57cafea..ccf467a 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -84,10 +84,6 @@ PRODUCT_SOONG_NAMESPACES += device/google/raviole/powerstats/whitefin # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts -# Bluetooth HAL -PRODUCT_PACKAGES += \ - bt_vendor.conf - # tetheroffload HAL PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service From 6165da465e1bc54d7c6ed83fd22ccc69438bf201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:56:24 +0000 Subject: [PATCH 023/110] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: Iaf6682c9677353b6caecd0f31effa41abee7bc8a --- device-oriole.mk | 2 ++ device-raven.mk | 2 ++ device-slider.mk | 2 ++ device-whitefin.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 20ec615..e8d8f33 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -41,6 +41,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,oriole) $(call soong_config_set,lyric,tuning_product,oriole) $(call soong_config_set,google3a_config,target_device,oriole) diff --git a/device-raven.mk b/device-raven.mk index 588f964..c5525de 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -46,6 +46,8 @@ endif include hardware/google/pixel/vibrator/cs40l25/device.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,raven) $(call soong_config_set,lyric,tuning_product,raven) $(call soong_config_set,google3a_config,target_device,raven) diff --git a/device-slider.mk b/device-slider.mk index d40732b..6c37cd7 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -29,6 +29,8 @@ include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) diff --git a/device-whitefin.mk b/device-whitefin.mk index ccf467a..6ba5b21 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -29,6 +29,8 @@ include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) From 46792c337351324225fd278fcdffdc5acaa35638 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:57:07 -0700 Subject: [PATCH 024/110] oriole: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: Ied840bbf22a52a96e8d1df58058ff091aad776e5 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index dcb4e39..13aa728 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -217,11 +217,6 @@ 60 - - 34 - 0.3 From ce2cb4d0e5ca39adf75f75c1954d88c9f03f08da Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:58:17 -0700 Subject: [PATCH 025/110] raven: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I4d0be5127c251b0d414fd5defae77609673c03ed --- raven/overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 9a49278..7c7b5b7 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -183,11 +183,6 @@ http://www.gstatic.com/android/sms/G8V0U.xml - - 25 - 0.3 From aec7fae7394cb02117a9c9ee6869c6482df69834 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 7 Oct 2022 17:41:27 -0700 Subject: [PATCH 026/110] Adding irq device map for oriole and raven This mapping is used by the framework for attributing wakeups. Each hardware device that can cause wakeups can be mapped to a list of subsystems that rely on that device for functioning properly. Adding the mapping of rtc clock in these devices to the "Alarm" subsystem, which is the only subsystem currently defined by the framework for wakeup attribution. More mappings can be added as more subsystems are defined. Test: Manually: Build and flash a raven/oriole target and run: adb shell dumpsys batterystats --wakeups The map output should match the xml file. Bug: 249370357 Bug: 195684213 Change-Id: I11b8297ac07dee2bba3715e6047271026093c5c8 --- .../base/core/res/res/xml/irq_device_map.xml | 24 +++++++++++++++++++ .../base/core/res/res/xml/irq_device_map.xml | 24 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml create mode 100644 raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..1499164 --- /dev/null +++ b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,24 @@ + + + + + Alarm + + + diff --git a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml new file mode 100644 index 0000000..1499164 --- /dev/null +++ b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -0,0 +1,24 @@ + + + + + Alarm + + + From f5ed634ec7b667b3adc0fdc16755eca0b2ed76d7 Mon Sep 17 00:00:00 2001 From: chungkai Date: Tue, 12 Jul 2022 09:54:43 +0000 Subject: [PATCH 027/110] Enable load kernel modules in parallel enable load kernel modules in parallel but load some specific modules in sequential Test: reboot more than 5000 times without failure Bug: 229794277 Signed-off-by: chungkai Change-Id: Ic4961389d58b5195d252dff15cbb92bb391caacc --- oriole/BoardConfig.mk | 11 +++++++++++ raven/BoardConfig.mk | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 8360d91..7e95a57 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -13,6 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 +BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 + ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 0247901..e9aaf8f 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -14,6 +14,16 @@ # limitations under the License. # +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + +# The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 +BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 +BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 +BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 + ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu From 7845ccf488250eeb42925f64bcba743098393446 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Fri, 21 Oct 2022 14:39:46 +0800 Subject: [PATCH 028/110] move brcm gps solution to gs-common Bug: 254758553 Test: google map can locate on pixel Change-Id: I0bee1c5b03b58f8fddda21b19817e2430462d14a --- device-oriole.mk | 10 ++++ device-raven.mk | 10 ++++ device-slider.mk | 10 ++++ device-whitefin.mk | 10 ++++ location/gps.xml | 99 ++++++++++++++++++++++++++++++++++++ location/gps.xml.oriole | 99 ++++++++++++++++++++++++++++++++++++ location/gps.xml.raven | 99 ++++++++++++++++++++++++++++++++++++ location/gps_user.xml | 98 +++++++++++++++++++++++++++++++++++ location/gps_user.xml.oriole | 98 +++++++++++++++++++++++++++++++++++ location/gps_user.xml.raven | 98 +++++++++++++++++++++++++++++++++++ 10 files changed, 631 insertions(+) create mode 100644 location/gps.xml create mode 100644 location/gps.xml.oriole create mode 100644 location/gps.xml.raven create mode 100644 location/gps_user.xml create mode 100644 location/gps_user.xml.oriole create mode 100644 location/gps_user.xml.raven diff --git a/device-oriole.mk b/device-oriole.mk index f3cd922..3caae07 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -256,3 +256,13 @@ PRODUCT_COPY_FILES += \ # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + diff --git a/device-raven.mk b/device-raven.mk index b6fd86f..cccf860 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -267,3 +267,13 @@ PRODUCT_COPY_FILES += \ # Enable adpf cpu hint session for SurfaceFlinger PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + diff --git a/device-slider.mk b/device-slider.mk index 6c37cd7..dbbdad4 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -121,3 +121,13 @@ PRODUCT_SHIPPING_API_LEVEL := 31 # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + diff --git a/device-whitefin.mk b/device-whitefin.mk index 6ba5b21..0cbd1a3 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -100,3 +100,13 @@ PRODUCT_SHIPPING_API_LEVEL := 31 # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Location +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml +endif + diff --git a/location/gps.xml b/location/gps.xml new file mode 100644 index 0000000..8fb7c66 --- /dev/null +++ b/location/gps.xml @@ -0,0 +1,99 @@ + + + + + + + + + + diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole new file mode 100644 index 0000000..d85fd16 --- /dev/null +++ b/location/gps.xml.oriole @@ -0,0 +1,99 @@ + + + + + + + + + + diff --git a/location/gps.xml.raven b/location/gps.xml.raven new file mode 100644 index 0000000..a095dbd --- /dev/null +++ b/location/gps.xml.raven @@ -0,0 +1,99 @@ + + + + + + + + + + diff --git a/location/gps_user.xml b/location/gps_user.xml new file mode 100644 index 0000000..5efd542 --- /dev/null +++ b/location/gps_user.xml @@ -0,0 +1,98 @@ + + + + + + + + + + diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole new file mode 100644 index 0000000..2d50372 --- /dev/null +++ b/location/gps_user.xml.oriole @@ -0,0 +1,98 @@ + + + + + + + + + + diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven new file mode 100644 index 0000000..b2fb2bd --- /dev/null +++ b/location/gps_user.xml.raven @@ -0,0 +1,98 @@ + + + + + + + + + + From 501128c9d2c41768a7a813aac4b8bf4124d51296 Mon Sep 17 00:00:00 2001 From: kuanyuhuang Date: Fri, 28 Oct 2022 10:13:40 +0000 Subject: [PATCH 029/110] [resolve conflict] BT: add sysprop to enable OPUS codec am: 932c8178a7 am: 044b8c4e1d Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/20296724 Change-Id: I39f535bb13a9e4c9f48cd6f6db6373ddb9f50f55 Signed-off-by: Automerger Merge Worker --- device-oriole.mk | 1 - device-raven.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a034a01..c8be815 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -269,4 +269,3 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif - diff --git a/device-raven.mk b/device-raven.mk index b965539..d31a888 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -280,4 +280,3 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif - From 33234acb13fa944601d34881ab1e61852df0e6de Mon Sep 17 00:00:00 2001 From: lbill Date: Thu, 3 Nov 2022 18:08:44 +0000 Subject: [PATCH 030/110] Enable fingerprint testing virtual HAL on O6/R4 We set 4 projects for biometrics-jank e2e tests - B3 - O6 - P10 - C10 Test: forest test with atp config \ v2/biometrics/health/microbench/biometrics/biometrics-jank-suite Bug: 228638448 Bug: 236074209 Change-Id: Ie693e90f7a25b521039440df62bdb08577de9181 --- device-oriole.mk | 5 +++++ device-raven.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index c8be815..a368d5a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -269,3 +269,8 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif + +# Biometrics virtual HAL for e2e testing +PRODUCT_PACKAGES_DEBUG += \ + android.hardware.biometrics.fingerprint-service.example + diff --git a/device-raven.mk b/device-raven.mk index d31a888..f7ba03a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -280,3 +280,8 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif + +# Biometrics virtual HAL for e2e testing +PRODUCT_PACKAGES_DEBUG += \ + android.hardware.biometrics.fingerprint-service.example + From 7b2984837db24720a6b03eb5b5124566e78a5e4e Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 7 Nov 2022 11:34:43 +0800 Subject: [PATCH 031/110] create raven touch dump Bug: 256521567 Test: adb bugreport Change-Id: Ifef31f7d4290922d9a24cefd52340bf9f125df56 --- device-raven.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-raven.mk b/device-raven.mk index 647377b..663af4e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -33,6 +33,7 @@ include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/lsi/lsi.mk ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk From ee334baa24503b91d9b9de1dde0c5b36e8126988 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Mon, 21 Nov 2022 09:15:36 +0000 Subject: [PATCH 032/110] Change the default cpuset of camera daemon Changing cpuset itself takes time, so we should reduce the cpuset change as possible. Since all camera streaming mode change to the same cpuset value, we could make it default setting. Bug: 240889279 Test: build pass Change-Id: I147acab52db5cbb99139cc7a677abf602e6ca519 --- powerhint-oriole.json | 93 +++++-------------------------------------- powerhint-raven.json | 93 +++++-------------------------------------- 2 files changed, 18 insertions(+), 168 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 3a61b74..582586c 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -209,8 +209,7 @@ "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ "0-3", - "6-7", - "0-7" + "6-7" ], "ResetOnInit": true }, @@ -219,8 +218,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ "0-3", - "4-5", - "0-7" + "4-5" ], "ResetOnInit": true }, @@ -229,8 +227,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ "0-3", - "4-7", - "0-7" + "4-7" ], "ResetOnInit": true }, @@ -671,18 +668,18 @@ "Duration": 1000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "4-7" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "NPITaskPacking", "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -941,24 +938,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "NPITaskPacking", @@ -1025,24 +1004,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "NPITaskPacking", @@ -1097,24 +1058,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "NPITaskPacking", @@ -1175,24 +1118,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "NPITaskPacking", diff --git a/powerhint-raven.json b/powerhint-raven.json index e174ac5..abb8ead 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -208,8 +208,7 @@ "Path": "/dev/cpuset/camera-daemon-high-group/cpus", "Values": [ "0-3", - "6-7", - "0-7" + "6-7" ], "ResetOnInit": true }, @@ -218,8 +217,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-group/cpus", "Values": [ "0-3", - "4-5", - "0-7" + "4-5" ], "ResetOnInit": true }, @@ -228,8 +226,7 @@ "Path": "/dev/cpuset/camera-daemon-mid-high-group/cpus", "Values": [ "0-3", - "4-7", - "0-7" + "4-7" ], "ResetOnInit": true }, @@ -670,18 +667,18 @@ "Duration": 1000, "Value": "9999999" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CDCpuset", - "Duration": 1000, - "Value": "4-7" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "NPITaskPacking", "Duration": 1000, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CDCpuset", + "Duration": 1000, + "Value": "4-7" + }, { "PowerHint": "CAMERA_LAUNCH_EXTENDED", "Node": "CPUBigClusterMaxFreq", @@ -940,24 +937,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "NPITaskPacking", @@ -1024,24 +1003,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "NPITaskPacking", @@ -1096,24 +1057,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "NPITaskPacking", @@ -1174,24 +1117,6 @@ "Duration": 0, "Value": "1014000" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDHighCpusetCpus", - "Duration": 0, - "Value": "6-7" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidCpusetCpus", - "Duration": 0, - "Value": "4-5" - }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CDMidHighCpusetCpus", - "Duration": 0, - "Value": "4-7" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "NPITaskPacking", From 7127442211c109699120fb2d02a3f6d01042925a Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Mon, 28 Nov 2022 14:12:20 +0800 Subject: [PATCH 033/110] use stm dump from gs-common Bug: 256521567 Test: adb bugreport Change-Id: I690c112df483849f5f464864955af5a6af204531 --- device-oriole.mk | 1 + device-slider.mk | 1 + device-whitefin.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 51a9382..1aa5474 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -34,6 +34,7 @@ include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/stm/stm11.mk ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk diff --git a/device-slider.mk b/device-slider.mk index dbbdad4..60a0729 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -28,6 +28,7 @@ include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/stm/stm11.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) diff --git a/device-whitefin.mk b/device-whitefin.mk index 0cbd1a3..e7111c1 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -28,6 +28,7 @@ include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/touch/stm/stm11.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) From df8201d60dd1541d78939be5aa9e5ce63d47558c Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 30 Nov 2022 09:50:39 +0800 Subject: [PATCH 034/110] correct touch setting Bug: 256521567 Test: build pass Change-Id: I1bef9f975a6f9251e185976958b3da3c47e112c7 --- device-whitefin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-whitefin.mk b/device-whitefin.mk index e7111c1..35ea738 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -28,7 +28,7 @@ include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/stm/stm11.mk +include device/google/gs-common/touch/lsi/lsi.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) From 73f328027981796346e63c8edbf3ed58e3d1544e Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Wed, 14 Sep 2022 12:02:29 +0800 Subject: [PATCH 035/110] Add display shape config for oriole/raven Bug: 236935288 Test: make Change-Id: I00b485477e0c13b778a3b509b78c8c3efb8d611a --- .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ .../frameworks/base/core/res/res/values/config.xml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 06710b2..67405dd 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -327,4 +327,17 @@ Note: This should be only enabled on devices with high confidence on power measurement. --> true + + + M 0 0 L 0 2399.9551 L 0.01171875 2330 C 0.01171875 2336.1175 0.0096285556 2342.2799 0.044921875 2347.9473 C 0.074333947 2353.2002 0.11155831 2357.9933 0.30273438 2362.5195 L 0.30273438 2362.5645 C 0.31743984 2362.9086 0.3319628 2363.2497 0.34960938 2363.5879 C 0.58196092 2368.429 1.0173528 2373.0871 2.3261719 2377.5664 C 2.6526417 2378.6869 3.0343994 2379.7897 3.4785156 2380.8691 C 3.922632 2381.9456 4.3891332 2382.9253 5.0214844 2384.0488 C 6.2861859 2386.2958 7.882405 2388.4107 9.7382812 2390.2695 C 11.5971 2392.1253 13.711934 2393.7216 15.958984 2394.9863 C 16.079572 2395.054 16.199726 2395.1205 16.320312 2395.1855 C 19.876184 2397.1207 23.827035 2398.2369 27.847656 2398.8633 C 29.224122 2399.078 30.608739 2399.2397 32.011719 2399.3691 C 33.461714 2399.4985 34.928774 2399.5862 36.414062 2399.6602 C 37.040534 2399.6902 37.670361 2399.7162 38.308594 2399.7402 C 38.967415 2399.7632 39.630196 2399.7847 40.300781 2399.8027 C 43.07136 2399.8798 45.970553 2399.9183 49.011719 2399.9453 C 50.008778 2399.9543 51.024293 2399.9568 52.056641 2399.9668 C 57.724269 2399.9998 63.882372 2400 70 2400 L 1010 2400 C 1016.1176 2400 1022.2758 2399.9998 1027.9434 2399.9668 C 1028.9758 2399.9568 1029.9913 2399.9543 1030.9883 2399.9453 C 1034.0295 2399.9183 1036.9286 2399.8798 1039.6992 2399.8027 C 1040.3698 2399.7847 1041.0326 2399.7632 1041.6914 2399.7402 C 1042.3297 2399.7162 1042.9594 2399.6902 1043.5859 2399.6602 C 1045.0712 2399.5862 1046.5383 2399.4985 1047.9883 2399.3691 C 1049.3913 2399.2397 1050.7759 2399.078 1052.1523 2398.8633 C 1056.173 2398.2369 1060.1239 2397.1207 1063.6797 2395.1855 C 1063.8003 2395.1205 1063.9204 2395.054 1064.041 2394.9863 C 1066.2881 2393.7216 1068.4029 2392.1253 1070.2617 2390.2695 C 1072.1176 2388.4107 1073.7138 2386.2958 1074.9785 2384.0488 C 1075.6109 2382.9253 1076.0774 2381.9456 1076.5215 2380.8691 C 1076.9656 2379.7897 1077.3474 2378.6869 1077.6738 2377.5664 C 1078.9827 2373.0871 1079.4181 2368.429 1079.6504 2363.5879 C 1079.6684 2363.2497 1079.6823 2362.9086 1079.6973 2362.5645 L 1079.6973 2362.5195 C 1079.8885 2357.9933 1079.9257 2353.2002 1079.9551 2347.9473 C 1079.9901 2342.2799 1079.9883 2336.1175 1079.9883 2330 L 1080 2399.9551 L 1080 0.044921875 L 1079.9883 71 C 1079.9883 64.794962 1079.9911 58.545473 1079.9551 52.796875 C 1079.9253 47.468905 1079.8873 42.606745 1079.6934 38.015625 L 1079.6934 37.970703 C 1079.6784 37.621663 1079.6625 37.274699 1079.6445 36.931641 C 1079.4088 32.021321 1078.9681 27.295335 1077.6406 22.751953 C 1077.3095 21.615355 1076.9211 20.497172 1076.4707 19.402344 C 1076.0202 18.310501 1075.5496 17.317311 1074.9082 16.177734 C 1073.6254 13.898585 1072.0054 11.75451 1070.123 9.8691406 C 1068.2376 7.9867504 1066.0917 6.3667538 1063.8125 5.0839844 C 1063.6902 5.0153714 1063.5696 4.9464892 1063.4473 4.8808594 C 1059.8406 2.9179242 1055.8339 1.7877614 1051.7559 1.1523438 C 1050.3597 0.93457112 1048.9542 0.7699316 1047.5312 0.63867188 C 1046.0607 0.50741114 1044.571 0.41832986 1043.0645 0.34375 C 1042.4291 0.31391006 1041.7919 0.28558871 1041.1445 0.26171875 C 1040.4763 0.23784879 1039.8052 0.21711871 1039.125 0.19921875 C 1036.3148 0.12165291 1033.3718 0.081537446 1030.2871 0.0546875 C 1029.2758 0.045737518 1028.2483 0.039203113 1027.2012 0.033203125 C 1021.4526 -0.0026068034 1015.205 0 1009 0 L 0 0 z M 1009 0 L 1080 0.044921875 L 1080 0 L 1009 0 z M 1080 2399.9551 L 1010 2400 L 1080 2400 L 1080 2399.9551 z M 70 2400 L 0 2399.9551 L 0 2400 L 70 2400 z M 71.074219 0.07421875 C 64.869196 0.07421875 58.623595 0.071623672 52.875 0.10742188 C 51.827904 0.11338786 50.798412 0.11995677 49.787109 0.12890625 C 46.702498 0.15575489 43.761331 0.19782787 40.951172 0.27539062 C 40.270961 0.2932897 39.597922 0.31402528 38.929688 0.33789062 C 38.282338 0.36175598 37.645185 0.38813701 37.009766 0.41796875 C 35.503258 0.49254831 34.013679 0.58163053 32.542969 0.71289062 C 31.119947 0.84415098 29.716443 1.00879 28.320312 1.2265625 C 24.242304 1.8619807 20.235577 2.9921432 16.628906 4.9550781 C 16.506596 5.0207081 16.384028 5.08959 16.261719 5.1582031 C 13.982566 6.4409722 11.836546 8.0609694 9.9511719 9.9433594 C 8.0687825 11.82873 6.4487846 13.972802 5.1660156 16.251953 C 4.5246312 17.39153 4.0539764 18.38472 3.6035156 19.476562 C 3.153055 20.571392 2.7647271 21.691531 2.4335938 22.828125 C 1.1060772 27.371513 0.66535899 32.095538 0.4296875 37.005859 C 0.41178834 37.348927 0.39577534 37.695889 0.38085938 38.044922 L 0.38085938 38.089844 C 0.18695251 42.680964 0.14897249 47.543126 0.11914062 52.871094 C 0.083342432 58.619688 0.0859375 64.869175 0.0859375 71.074219 L 0.07421875 0.11914062 L 71.074219 0.07421875 z diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 81e51c4..1a78f19 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -303,4 +303,17 @@ Note: This should be only enabled on devices with high confidence on power measurement. --> true + + + M 176 0 C 115.02392 1.1656472 102.53447 1.6184269 71.396484 3.3847656 C 55.659057 4.4652262 48.372167 5.3816761 40.939453 7.5957031 C 36.159471 9.0195457 30.970511 11.33647 26.369141 14.238281 C 22.479829 16.691042 19.646362 19.26924 16.513672 22.466797 C 12.640699 26.419964 10.129306 29.745868 8.1074219 34.291016 C 5.3985024 40.380603 4.5627354 44.599726 3.7597656 49.205078 C 1.5206876 62.047086 2.0426694 76.127341 1.3613281 93.833984 C 0.29502583 121.54496 0.79450661 135.72186 0 176 L 0 2944 C 0.79450661 2984.2782 0.29502583 2998.4569 1.3613281 3026.168 C 2.0426694 3043.8746 2.1114381 3057.8378 4.2636719 3070.748 C 4.8913915 3074.5134 6.5432868 3080.1477 9.0664062 3085.1855 C 11.294042 3089.6334 13.056713 3092.9239 16.929688 3096.877 C 20.062376 3100.0744 22.895844 3102.6546 26.785156 3105.1074 C 31.386528 3108.0092 36.774591 3110.4649 41.513672 3112.0195 C 47.497419 3113.9823 55.924021 3115.2717 71.396484 3116.6152 C 102.53447 3118.3815 115.02392 3118.8344 176 3120 L 1264 3120 C 1324.976 3118.8344 1337.4655 3118.3815 1368.6035 3116.6152 C 1384.076 3115.2717 1392.5025 3113.9823 1398.4863 3112.0195 C 1403.2253 3110.4649 1408.6134 3108.0092 1413.2148 3105.1074 C 1417.1041 3102.6546 1419.9376 3100.0744 1423.0703 3096.877 C 1426.9432 3092.9239 1428.704 3089.6334 1430.9316 3085.1855 C 1433.4548 3080.1477 1435.1086 3074.5134 1435.7363 3070.748 C 1437.8886 3057.8378 1437.9574 3043.8746 1438.6387 3026.168 C 1439.705 2998.4569 1439.2055 2984.2782 1440 2944 L 1440 176 C 1439.2055 135.72186 1439.705 121.54496 1438.6387 93.833984 C 1437.9574 76.12734 1438.4793 62.047092 1436.2402 49.205078 C 1435.4373 44.599728 1434.6015 40.380604 1431.8926 34.291016 C 1429.8707 29.745874 1427.3593 26.419959 1423.4863 22.466797 C 1420.3536 19.269233 1417.5202 16.691047 1413.6309 14.238281 C 1409.0295 11.336467 1403.8405 9.0195403 1399.0605 7.5957031 C 1391.628 5.3816775 1384.341 4.4652314 1368.6035 3.3847656 C 1337.4655 1.6184272 1324.976 1.1656476 1264 0 L 176 0 z From 19b9158d3d928b56bcc11c842db37b76181abef3 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 9 Dec 2022 04:27:29 +0000 Subject: [PATCH 036/110] uwb(r4): Add UWB framework overlays rro app Bug: 261908320 Test: Compiles Change-Id: Ia2df1c0f58538b8407f6c3802c17fd093b6450e7 --- device-raven.mk | 3 +++ raven/rro_overlays/UwbOverlay/Android.bp | 11 ++++++++ .../UwbOverlay/AndroidManifest.xml | 27 +++++++++++++++++++ raven/rro_overlays/UwbOverlay/OWNERS | 3 +++ .../UwbOverlay/res/values/config.xml | 20 ++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 raven/rro_overlays/UwbOverlay/Android.bp create mode 100644 raven/rro_overlays/UwbOverlay/AndroidManifest.xml create mode 100644 raven/rro_overlays/UwbOverlay/OWNERS create mode 100644 raven/rro_overlays/UwbOverlay/res/values/config.xml diff --git a/device-raven.mk b/device-raven.mk index c7863f4..6e51fd1 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -77,6 +77,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/raviole/powerhint-raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json +PRODUCT_PACKAGES += \ + UwbOverlayR4 + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true \ diff --git a/raven/rro_overlays/UwbOverlay/Android.bp b/raven/rro_overlays/UwbOverlay/Android.bp new file mode 100644 index 0000000..925ee77 --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/Android.bp @@ -0,0 +1,11 @@ +package { + default_applicable_licenses: ["device_google_raviole_license"], +} + +runtime_resource_overlay { + name: "UwbOverlayR4", + theme: "UwbOverlayR4", + certificate: "platform", + sdk_version: "current", + product_specific: true +} diff --git a/raven/rro_overlays/UwbOverlay/AndroidManifest.xml b/raven/rro_overlays/UwbOverlay/AndroidManifest.xml new file mode 100644 index 0000000..57dfd5b --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/raven/rro_overlays/UwbOverlay/OWNERS b/raven/rro_overlays/UwbOverlay/OWNERS new file mode 100644 index 0000000..2395d7f --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/OWNERS @@ -0,0 +1,3 @@ +# People who can approve changes for submission +include platform/packages/modules/Uwb:/OWNERS +victorliu@google.com diff --git a/raven/rro_overlays/UwbOverlay/res/values/config.xml b/raven/rro_overlays/UwbOverlay/res/values/config.xml new file mode 100644 index 0000000..7a77d32 --- /dev/null +++ b/raven/rro_overlays/UwbOverlay/res/values/config.xml @@ -0,0 +1,20 @@ + + + + From 725a176c609ee1036889e1f05b78a3153a3e11f9 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Wed, 9 Nov 2022 10:55:23 +0000 Subject: [PATCH 037/110] Enable quick start for pixel devices Bug: 246218540 Test: build pass with `m -j` command Change-Id: Id0ef834d1e7fd82a1ce3c88e5300e7eb178fd3f3 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 09cd1ac..b62d4a8 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -275,3 +275,7 @@ endif PRODUCT_PACKAGES_DEBUG += \ android.hardware.biometrics.fingerprint-service.example +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + diff --git a/device-raven.mk b/device-raven.mk index 6e51fd1..797a0ac 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -292,3 +292,7 @@ endif PRODUCT_PACKAGES_DEBUG += \ android.hardware.biometrics.fingerprint-service.example +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + From 116d3c9468a3739723d135e07b67ce10d0058cf2 Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Sat, 10 Dec 2022 14:16:50 +0000 Subject: [PATCH 038/110] WLC: Include the wireless_charger from gs-common Bug: 237600973 Change-Id: Ib484b481f2f6193e14f397e240d6207b21dc7990 Signed-off-by: Ken Yang --- device-oriole.mk | 7 +++---- device-raven.mk | 7 ++++--- device-slider.mk | 6 +++--- device-whitefin.mk | 7 ++++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index d35ed59..b9a1f65 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -36,6 +36,9 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk +# wireless_charger HAL service +include device/google/gs-common/wireless_charger/wireless_charger.mk + ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else @@ -103,10 +106,6 @@ endif PRODUCT_COPY_FILES += \ device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf - -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/oriole_display_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv \ diff --git a/device-raven.mk b/device-raven.mk index a9ec847..5eec93b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -35,6 +35,10 @@ include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk +# wireless_charger HAL service +include device/google/gs-common/wireless_charger/wireless_charger.mk + + ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else @@ -110,9 +114,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # MIPI Coex Configs PRODUCT_COPY_FILES += \ device/google/raviole/radio/raven_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv diff --git a/device-slider.mk b/device-slider.mk index 60a0729..35f828a 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -30,14 +30,14 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk +# wireless_charger HAL service +include device/google/gs-common/wireless_charger/wireless_charger.mk + # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.slider.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.slider.rc diff --git a/device-whitefin.mk b/device-whitefin.mk index 35ea738..7c2a533 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -30,14 +30,15 @@ include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk +# wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder +PRODUCT_PACKAGES += vendor.google.wireless_charger-default +DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs-common/wireless_charger/compatibility_matrix.xml + # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) -# WirelessCharger -DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml - # Init files PRODUCT_COPY_FILES += \ device/google/raviole/conf/init.whitefin.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.whitefin.rc From c6e061bf631677be80448c258016fce8c3e3b317 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Tue, 6 Dec 2022 22:00:30 +0000 Subject: [PATCH 039/110] Disable HWUI adpf by default and enable in device.mk * Make HWUI disabled by default for vendors * Explicitly enable in supported devices * Consolidate flags for HWUI and SF Bug: b/261628396 Test: manual Change-Id: I85443730a1a278975c7204f96d6091bf8e293e41 --- device-oriole.mk | 4 ---- device-raven.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index b9a1f65..39a7a28 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -257,10 +257,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Bluetooth OPUS codec PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true diff --git a/device-raven.mk b/device-raven.mk index 5eec93b..cafe953 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -273,10 +273,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# Enable adpf cpu hint session for SurfaceFlinger -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - debug.sf.enable_adpf_cpu_hint=true - # Display RRS default Config PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120 From feeb17245850f509c163463c2601603e481cabbf Mon Sep 17 00:00:00 2001 From: Luke Chang Date: Tue, 20 Dec 2022 17:12:04 +0000 Subject: [PATCH 040/110] powerhint: add CPU_LOAD_RESET rule Set minimum mif freq for 1st frame to avoid memlat can't reflect in time. Test: Build and check 1st frame boost Bug: 259275437 Bug: 263383561 Change-Id: I9aef96502639eceef83e2040973ec4cb51a3871b Signed-off-by: Luke Chang --- powerhint-oriole.json | 6 ++++++ powerhint-raven.json | 6 ++++++ powerhint-slider.json | 6 ++++++ powerhint-whitefin.json | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 8af3398..e40ce8f 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -611,6 +611,12 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/powerhint-raven.json b/powerhint-raven.json index c7a5be8..12c9005 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -610,6 +610,12 @@ "Duration": 2000, "Value": "9999999" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/powerhint-slider.json b/powerhint-slider.json index af20ff5..661a28f 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -490,6 +490,12 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 60c299f..245cc4e 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -481,6 +481,12 @@ "Duration": 5000, "Value": "0" }, + { + "PowerHint": "CPU_LOAD_RESET", + "Node": "MemFreq", + "Duration": 33, + "Value": "1014000" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", From 8ab4968f7c869c78dc64d48b9c8103e44b5f8109 Mon Sep 17 00:00:00 2001 From: millerliang Date: Wed, 26 Oct 2022 22:35:52 +0800 Subject: [PATCH 041/110] audio:enable mmap and raw on BT AoC can support mmap on BT both playback and recording after gpar/322484. Bug: 232205959 Test: OboeTester Signed-off-by: millerliang Change-Id: I53d70625acb4629954f2bd3041d9d52f4b5c61d1 --- .../config/audio_policy_configuration.xml | 20 +++++++++---------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++----- ...icy_configuration_bluetooth_legacy_hal.xml | 10 +++++----- ...licy_configuration_le_offload_disabled.xml | 16 +++++++-------- audio/oriole/config/mixer_paths.xml | 17 ++++++++++++++++ .../config/audio_policy_configuration.xml | 20 +++++++++---------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++----- ...icy_configuration_bluetooth_legacy_hal.xml | 10 +++++----- ...licy_configuration_le_offload_disabled.xml | 16 +++++++-------- audio/raven/config/mixer_paths.xml | 17 ++++++++++++++++ 10 files changed, 90 insertions(+), 56 deletions(-) diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index c270ed8..f91a44d 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -206,25 +206,25 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -235,9 +235,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index ddf3a1a..bc18a46 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -185,11 +185,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -200,9 +200,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 43c5c12..90e4a16 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml index 1455600..a96e6b3 100644 --- a/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_le_offload_disabled.xml @@ -196,21 +196,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -221,9 +221,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index d877752..ef5d770 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -148,6 +148,7 @@ + @@ -382,6 +383,10 @@ + + + + @@ -396,6 +401,10 @@ + + + + @@ -602,6 +611,10 @@ + + + + @@ -610,6 +623,10 @@ + + + + > diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index c270ed8..f91a44d 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -206,25 +206,25 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -235,9 +235,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index ddf3a1a..bc18a46 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -185,11 +185,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -200,9 +200,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 43c5c12..90e4a16 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -181,11 +181,11 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -196,9 +196,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml index 1455600..a96e6b3 100644 --- a/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_le_offload_disabled.xml @@ -196,21 +196,21 @@ + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,raw,mmap_no_irq_out"/> @@ -221,9 +221,9 @@ + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/> diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index d877752..ef5d770 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -148,6 +148,7 @@ + @@ -382,6 +383,10 @@ + + + + @@ -396,6 +401,10 @@ + + + + @@ -602,6 +611,10 @@ + + + + @@ -610,6 +623,10 @@ + + + + > From f3bb6b9510d985d96d78f7b7bebe5c9614d4543b Mon Sep 17 00:00:00 2001 From: Ken Yang Date: Fri, 6 Jan 2023 18:22:38 +0000 Subject: [PATCH 042/110] WLC: Remove wireless_charger service Bug: 264624634 Bug: 263830018 Change-Id: Ib41df420b9b0143365036aaf54c22b5ea810fea9 Signed-off-by: Ken Yang --- device-oriole.mk | 3 --- device-raven.mk | 3 --- device-slider.mk | 3 --- 3 files changed, 9 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index f9af23a..1c1382f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -36,9 +36,6 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -# wireless_charger HAL service -include device/google/gs-common/wireless_charger/wireless_charger.mk - ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk else diff --git a/device-raven.mk b/device-raven.mk index 0337c93..4020d5f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -35,9 +35,6 @@ include device/google/gs101/telephony/pktrouter.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/lsi/lsi.mk -# wireless_charger HAL service -include device/google/gs-common/wireless_charger/wireless_charger.mk - ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk diff --git a/device-slider.mk b/device-slider.mk index 35f828a..72f5a1d 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -30,9 +30,6 @@ include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/stm/stm11.mk -# wireless_charger HAL service -include device/google/gs-common/wireless_charger/wireless_charger.mk - # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) From 12f1eff9151b635f5b9331c59783155a9923c14b Mon Sep 17 00:00:00 2001 From: Chungkai Mei Date: Thu, 5 Jan 2023 12:43:35 +0000 Subject: [PATCH 043/110] Load vh_sched kernel module in parallel Bug: 237232510 Change-Id: I75453a94a6de7639bc0c6ebbe609a6a1b89c19fd Signed-off-by: Chungkai Mei --- oriole/BoardConfig.mk | 1 - raven/BoardConfig.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 7e95a57..e3d7efc 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -18,7 +18,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index e9aaf8f..2217df1 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -18,7 +18,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential -BOARD_KERNEL_CMDLINE += vh_sched.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_mfc.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 From c9f3506f4999d8251e216d01928350c3ccfd0754 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 20 Sep 2022 16:55:07 +0800 Subject: [PATCH 044/110] thermal: more aggressive CPU throttling policy Bug: 247536326 Test: run burn8, MH, compile package Change-Id: I05c709316544d87abe4fc9be4f9dbcb12971a6a0 --- powerhint-oriole.json | 116 ++-- powerhint-raven.json | 116 ++-- thermal_info_config_oriole.json | 932 +++++++------------------------ thermal_info_config_raven.json | 936 +++++++------------------------- 4 files changed, 530 insertions(+), 1570 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index e40ce8f..6d9cff0 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1351,349 +1351,349 @@ "Value": "400000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatThreads", "Duration": 0, "Value": "6" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3,4,5" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" diff --git a/powerhint-raven.json b/powerhint-raven.json index 12c9005..23dc7cc 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1332,349 +1332,349 @@ "Value": "400000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatThreads", "Duration": 0, "Value": "6" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3,4,5" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_MID_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_BIG_TSKIN_BYPASS", "Duration": 0, "Value": "0" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dControlTempSet", "Duration": 0, "Value": "80000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "BigSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "MidSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "LittleSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "G3dSwitchOnTempSet", "Duration": 0, "Value": "60000" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatCPUSet", "Duration": 0, "Value": "0,1,2,3" diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index d73d66a..55ae506 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -3,135 +3,49 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"], "Multiplier":0.001 }, { "Name":"rf1_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"rf2_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "35.0", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "35.0", "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/usb_pwr_therm2/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -139,42 +53,15 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "32.9", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "32.9", "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/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -185,25 +72,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "gnss_tcxo_therm" - ], - "Coefficient":[ - "0.25", - "0.75" - ], + "Combination":["qi_therm", "gnss_tcxo_therm"], + "Coefficient":["0.25", "0.75"], "Offset":-4500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -212,24 +83,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "quiet_therm" - ], - "Coefficient":[ - "0.25", - "0.75" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["qi_therm", "quiet_therm"], + "Coefficient":["0.25", "0.75"], "Multiplier":0.001 }, { @@ -238,25 +93,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "battery" - ], - "Coefficient":[ - "0.22", - "0.78" - ], + "Combination":["qi_therm", "battery"], + "Coefficient":["0.22", "0.78"], "Offset":-500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -265,25 +104,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "disp_therm" - ], - "Coefficient":[ - "0.16", - "0.84" - ], + "Combination":["usb_pwr_therm2", "disp_therm"], + "Coefficient":["0.16", "0.84"], "Offset":1500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -292,25 +115,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "quiet_therm", - "battery" - ], - "Coefficient":[ - "2.15", - "-1.15" - ], + "Combination":["quiet_therm", "battery"], + "Coefficient":["2.15", "-1.15"], "Offset":-2000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -319,93 +126,153 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-QI-GNSS", - "VIRTUAL-QI-QUIET", - "VIRTUAL-USB2-DISP", - "VIRTUAL-QUIET-BATT" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "43.0", - "45.0", - "46.5", - "52.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.4, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "37.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1500, 750, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07], - "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 0, 8, 10, 10], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066], - "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], - "LimitInfo": [0, 0, 0, 0, 11, 13, 13], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S3M_VDD_CPUCL1", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313], - "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 14, 16, 16], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2M_VDD_CPUCL2", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551], - "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], - "LimitInfo": [0, 0, 0, 0, 10, 11, 11], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + "CdevCeiling": [10, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] } ] }, @@ -416,37 +283,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-QI-GNSS", - "VIRTUAL-QI-BATT", - "VIRTUAL-USB2-DISP", - "VIRTUAL-QUIET-BATT" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "41.0", - "43.0", - "45.0", - "47.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-BATT", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "41.0", "43.0", "45.0", "47.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, @@ -454,7 +294,7 @@ { "CdevRequest": "fcc", "LimitInfo": [0, 2, 3, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -463,7 +303,7 @@ { "CdevRequest": "dc_icl", "LimitInfo": [0, 1, 2, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -472,7 +312,7 @@ { "CdevRequest": "wlc_fcc", "LimitInfo": [0, 2, 2, 4, 5, 5, 5], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -486,37 +326,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-QI-GNSS", - "VIRTUAL-QI-QUIET", - "VIRTUAL-USB2-DISP", - "VIRTUAL-QUIET-BATT" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "54.0", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.9, - 0.0 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-QI-GNSS", "VIRTUAL-QI-QUIET", "VIRTUAL-USB2-DISP", "VIRTUAL-QUIET-BATT"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "54.0", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "Monitor":true, "PollingDelay":300000, @@ -528,24 +341,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "usb_pwr_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "usb_pwr_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -554,24 +351,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "qi_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "qi_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -581,32 +362,15 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "35000", - "2000", - "10000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN", - "NAN" - ], + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["35000", "2000", "10000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", "LimitInfo": [0, 0, 0, 0, 1, 1, 1] } ], - "VrThreshold":"NAN", "Multiplier":1, "PollingDelay":60000, "PassiveDelay":7000 @@ -617,26 +381,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "35000", - "3000", - "12000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["35000", "3000", "12000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "Multiplier":1, "Monitor":true, "PollingDelay":60000, @@ -705,16 +452,6 @@ { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":1, "Monitor":false }, @@ -724,26 +461,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "Multiplier":1, "Monitor":true }, @@ -753,26 +473,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"], "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -780,41 +483,15 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"], "Multiplier":1, "Hidden":true }, { "Name":"batoilo", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -835,25 +512,8 @@ { "Name":"vdroop1", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -874,25 +534,8 @@ { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -913,25 +556,8 @@ { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -952,200 +578,64 @@ { "Name":"ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, @@ -1221,19 +711,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -1243,31 +733,15 @@ }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "VSYS_PWR_MODEM", - "S2M_VDD_CPUCL2", - "S3M_VDD_CPUCL1", - "S4M_VDD_CPUCL0", - "S5M_VDD_INT", - "S1M_VDD_MIF", - "S2S_VDD_G3D" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0" - ], + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":["1.0", "1.0", "1.0", "1.0", "1.0", "1.0", "1.0"], "PowerSampleDelay":14000, "PowerSampleCount":5 } diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index bb7af7b..67a51fe 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -3,119 +3,43 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "60.0" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "60.0"], "Multiplier":0.001 }, { "Name":"rf1_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"rf2_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "32.2", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "32.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/quiet_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -123,42 +47,15 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { "Name":"usb_pwr_therm2", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "40.0", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.9, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], + "HotThreshold":["NAN", "40.0", "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/usb_pwr_therm2/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -166,17 +63,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -185,25 +72,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "neutral_therm", - "qi_therm" - ], - "Coefficient":[ - "0.6", - "0.4" - ], + "Combination":["neutral_therm", "qi_therm"], + "Coefficient":["0.6", "0.4"], "Offset":-3000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -212,25 +83,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "battery" - ], - "Coefficient":[ - "0.05", - "0.95" - ], + "Combination":["usb_pwr_therm2", "battery"], + "Coefficient":["0.05", "0.95"], "Offset":1000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -239,25 +94,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "gnss_tcxo_therm", - "battery" - ], - "Coefficient":[ - "0.50", - "0.50" - ], + "Combination":["gnss_tcxo_therm", "battery"], + "Coefficient":["0.5", "0.5"], "Offset":1500, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -266,25 +105,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "qi_therm", - "disp_therm" - ], - "Coefficient":[ - "0.15", - "0.85" - ], + "Combination":["qi_therm", "disp_therm"], + "Coefficient":["0.15", "0.85"], "Offset":2000, - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":0.001 }, { @@ -293,93 +116,153 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-QI", - "VIRTUAL-USB2-BATT", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-DISP" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39", - "43", - "45", - "46.5", - "52.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.4, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, - "SendPowerHint":true, "Monitor":true, "PollingDelay":300000, "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "tpu_cooling", + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-HINT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "37.0", "43.0", "45.0", "46.5", "52.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "SendPowerHint":true, + "PollingDelay":300000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-SKIN-CPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 1500, 1500, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 1500, 750, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 20, 0, "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 10, 0, "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, 0, "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 3500, 1800, "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 2500, 1500, "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 9500, 3000, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 2, 0, "NAN", "NAN", "NAN"] + "K_Po":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 400, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 10000, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] }, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "CdevWeightForPID": [0.07, 0.07, 0.07, 0.07, 0.07, 0.07, 0.07], - "CdevCeiling": [3, 3, 6, 7, 8, 10, 10], - "LimitInfo": [0, 0, 0, 0, 8, 10, 10], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S4M_VDD_CPUCL0", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "CdevWeightForPID": [0.066, 0.066, 0.066, 0.066, 0.066, 0.066, 0.066], - "CdevCeiling": [7, 7, 8, 9, 11, 13, 13], - "LimitInfo": [0, 0, 0, 0, 11, 13, 13], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S3M_VDD_CPUCL1", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] }, { "CdevRequest": "thermal-cpufreq-2", - "CdevWeightForPID": [0.313, 0.313, 0.313, 0.313, 0.313, 0.313, 0.313], - "CdevCeiling": [11, 11, 14, 14, 14, 16, 16], - "LimitInfo": [0, 0, 0, 0, 14, 16, 16], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2M_VDD_CPUCL2", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] + } + ] + }, + { + "Name":"VIRTUAL-SKIN-CPU-GPU", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", "NAN", 700, "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", "NAN", 2, "NAN", "NAN", "NAN"] + }, + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S4M_VDD_CPUCL0", + "CdevCeiling": [8, 8, 8, 8, 8, 10, 10], + "LimitInfo": [0, 0, 0, 0, 8, 10, 10] + }, + { + "CdevRequest": "thermal-cpufreq-1", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S3M_VDD_CPUCL1", + "CdevCeiling": [11, 11, 11, 11, 11, 13, 13], + "LimitInfo": [0, 0, 0, 0, 11, 13, 13] + }, + { + "CdevRequest": "thermal-cpufreq-2", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S2M_VDD_CPUCL2", + "CdevCeiling": [14, 14, 14, 14, 14, 16, 16], + "LimitInfo": [0, 0, 0, 0, 14, 16, 16] }, { "CdevRequest": "thermal-gpufreq-0", - "CdevWeightForPID": [0.551, 0.551, 0.551, 0.551, 0.551, 0.551, 0.551], - "CdevCeiling": [7, 7, 8, 9, 10, 11, 11], - "LimitInfo": [0, 0, 0, 0, 10, 11, 11], + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, "BindedPowerRail": "S2S_VDD_G3D", - "PowerThreshold": [200, 200, 200, 200, 50, 0, 0], - "ReleaseLogic": "DECREASE" - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + "CdevCeiling": [10, 10, 10, 10, 10, 11, 11], + "LimitInfo": [0, 0, 0, 0, 10, 11, 11] } ] }, @@ -390,37 +273,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-QI", - "VIRTUAL-USB2-BATT", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-DISP" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "39.0", - "41.0", - "43.0", - "45.0", - "47.0", - "55.0" - ], - "HotHysteresis":[ - 0.0, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9, - 1.9 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "39.0", "41.0", "43.0", "45.0", "47.0", "55.0"], + "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, @@ -428,7 +284,7 @@ { "CdevRequest": "fcc", "LimitInfo": [0, 2, 3, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -437,7 +293,7 @@ { "CdevRequest": "dc_icl", "LimitInfo": [0, 1, 2, 3, 4, 4, 4], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -446,7 +302,7 @@ { "CdevRequest": "wlc_fcc", "LimitInfo": [0, 3, 3, 4, 5, 5, 5], - "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "BindedPowerRail": "PARTIAL_SYSTEM_POWER", "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5], "ReleaseLogic": "RELEASE_TO_FLOOR", @@ -460,37 +316,10 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":[ - "VIRTUAL-NEUTRAL-QI", - "VIRTUAL-USB2-BATT", - "VIRTUAL-GNSS-BATT", - "VIRTUAL-QI-DISP" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "54.0", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.9, - 0.0 - ], - "VrThreshold":"NAN", + "Combination":["VIRTUAL-NEUTRAL-QI", "VIRTUAL-USB2-BATT", "VIRTUAL-GNSS-BATT", "VIRTUAL-QI-DISP"], + "Coefficient":["1.0", "1.0", "1.0", "1.0"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "54.0", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "Monitor":true, "PollingDelay":300000, @@ -502,24 +331,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "usb_pwr_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "usb_pwr_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -528,24 +341,8 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "usb_pwr_therm2", - "qi_therm" - ], - "Coefficient":[ - "1.0", - "-1.0" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "qi_therm"], + "Coefficient":["1.0", "-1.0"], "Multiplier":0.001 }, { @@ -555,32 +352,15 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "40000", - "4500", - "9000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN", - "NAN" - ], + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["40000", "4500", "9000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", "LimitInfo": [0, 0, 0, 0, 1, 1, 1] } ], - "VrThreshold":"NAN", "Multiplier":1, "PollingDelay":60000, "PassiveDelay":7000 @@ -591,26 +371,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "usb_pwr_therm2", - "Combination":[ - "usb_pwr_therm2", - "USB2-MINUS-USB", - "USB2-MINUS-QI" - ], - "Coefficient":[ - "40000", - "5000", - "12000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "3.0", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["usb_pwr_therm2", "USB2-MINUS-USB", "USB2-MINUS-QI"], + "Coefficient":["40000", "5000", "12000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"], "Multiplier":1, "Monitor":true, "PollingDelay":60000, @@ -679,16 +442,6 @@ { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", "Multiplier":1, "Monitor":false }, @@ -698,26 +451,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "Multiplier":1, "Monitor":true }, @@ -727,26 +463,9 @@ "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", "TriggerSensor": "vdroop1", - "Combination":[ - "battery", - "battery_cycle", - "vdroop1" - ], - "Coefficient":[ - "-10000", - "400", - "1000" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "Combination":["battery", "battery_cycle", "vdroop1"], + "Coefficient":["-10000", "400", "1000"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"], "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -754,41 +473,15 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"], "Multiplier":1, "Hidden":true }, { "Name":"batoilo", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 5000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ @@ -804,36 +497,19 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 6, 6, 6] } - ] + ] }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] }, { "CdevRequest": "thermal-gpufreq-0", @@ -843,36 +519,19 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 3, 3, 3] } - ] + ] }, { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1200, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] }, { "CdevRequest": "thermal-gpufreq-0", @@ -882,36 +541,19 @@ "CdevRequest": "tpu_cooling", "LimitInfo": [0, 0, 0, 0, 6, 6, 6] } - ] + ] }, { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1100, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Monitor":true, "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] + "LimitInfo": [0, 0, 0, 0, 7, 7, 7] }, { "CdevRequest": "thermal-gpufreq-0", @@ -926,200 +568,64 @@ { "Name":"ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_cpu1", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 8500, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 8500, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 9000, - "NAN", - "NAN" - ], - "HotHysteresis":[ - 0.0, - 0.0, - 0.0, - 0.0, - 100, - 0.0, - 0.0 - ], - "VrThreshold":"NAN", + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 9000, "NAN", "NAN"], + "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "Hidden":true }, @@ -1144,29 +650,25 @@ "Name":"thermal-cpufreq-0", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"], - "PowerRail":"S4M_VDD_CPUCL0" + "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"] }, { "Name":"thermal-cpufreq-1", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"], - "PowerRail":"S3M_VDD_CPUCL1" + "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"] }, { "Name":"thermal-cpufreq-2", "Type":"CPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"], - "PowerRail":"S2M_VDD_CPUCL2" + "State2Power":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"] }, { "Name":"thermal-gpufreq-0", "Type":"GPU", "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":["4371", "3543", "3085", "2293", "1927", "1707", "1394", "1171", "967", "768", "592", "433"], - "PowerRail":"S2S_VDD_G3D" + "State2Power":["4371", "3543", "3085", "2293", "1927", "1707", "1394", "1171", "967", "768", "592", "433"] }, { "Name":"fcc", @@ -1199,19 +701,19 @@ }, { "Name":"S2M_VDD_CPUCL2", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S3M_VDD_CPUCL1", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S4M_VDD_CPUCL0", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { "Name":"S5M_VDD_INT" @@ -1221,31 +723,15 @@ }, { "Name":"S2S_VDD_G3D", - "PowerSampleDelay":14000, - "PowerSampleCount":5 + "PowerSampleDelay":7000, + "PowerSampleCount":1 }, { - "Name":"POWER_FOR_CHARGING_THROTTLING", + "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":[ - "VSYS_PWR_MODEM", - "S2M_VDD_CPUCL2", - "S3M_VDD_CPUCL1", - "S4M_VDD_CPUCL0", - "S5M_VDD_INT", - "S1M_VDD_MIF", - "S2S_VDD_G3D" - ], - "Coefficient":[ - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0", - "1.0" - ], + "Combination":["VSYS_PWR_MODEM", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S1M_VDD_MIF", "S2S_VDD_G3D"], + "Coefficient":["1.0", "1.0", "1.0", "1.0", "1.0", "1.0", "1.0"], "PowerSampleDelay":14000, "PowerSampleCount":5 } From cf4031e5453df92aeb4a812d5400aff652e98f38 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Thu, 5 Jan 2023 05:17:04 +0000 Subject: [PATCH 045/110] Enable WM Extensions on Pixel 6 Bug: 266196089 Change-Id: Ie4ec9c0217e28599af64a9ea9055a9d2af53943c --- device-oriole.mk | 2 ++ device-raven.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index eb377bb..7a83bdc 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -275,3 +275,5 @@ PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-raven.mk b/device-raven.mk index 2e685de..c1be72e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -294,3 +294,5 @@ PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From b4869962677862d61babccaf4d5a9ca19a0b585f Mon Sep 17 00:00:00 2001 From: George Date: Wed, 1 Feb 2023 18:00:29 +0800 Subject: [PATCH 046/110] [NFC] Set tag_intent_app_pref_supported Bug: 244272155 Test: atest android.permission.cts.NfcPermissionTest Test: atest NfcFeatureFlagTest Change-Id: Id0df7652660c6e4677d8997d10e2ca3360a9c9fc --- oriole/overlay/packages/apps/Nfc/res/values/config.xml | 1 + raven/overlay/packages/apps/Nfc/res/values/config.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/oriole/overlay/packages/apps/Nfc/res/values/config.xml b/oriole/overlay/packages/apps/Nfc/res/values/config.xml index 67075fd..fa19b4d 100644 --- a/oriole/overlay/packages/apps/Nfc/res/values/config.xml +++ b/oriole/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,5 @@ GB7N6 GR1YH + true diff --git a/raven/overlay/packages/apps/Nfc/res/values/config.xml b/raven/overlay/packages/apps/Nfc/res/values/config.xml index 2e8c8ca..47f360e 100644 --- a/raven/overlay/packages/apps/Nfc/res/values/config.xml +++ b/raven/overlay/packages/apps/Nfc/res/values/config.xml @@ -21,4 +21,5 @@ GF5KQ GLU0G + true From 45a3d0666d59754855885980028da44e0e71d85a Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 18 Jan 2023 18:25:05 -0800 Subject: [PATCH 047/110] Add wakeup reason mapping for the wifi subsystem Test: Manually: Build and flash a raven/oriole target and run: adb shell dumpsys batterystats --wakeups Bug: 265742148 Change-Id: I918fb6e071b6dda9250a0bde242b8b132592a53d --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 1499164..35de830 100644 --- a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -20,5 +20,8 @@ Alarm + + Wifi + diff --git a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 1499164..35de830 100644 --- a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -20,5 +20,8 @@ Alarm + + Wifi + From e1757908eb3d784bce9c540ccb277934c1917459 Mon Sep 17 00:00:00 2001 From: Jeff Pu Date: Thu, 2 Mar 2023 21:38:26 +0000 Subject: [PATCH 048/110] Remove fingerprint virtual hal from individual pixel device mk files since it is included in common one Bug: 270940857 Test: manual build Change-Id: Iccf66aa3cc42e57a62a79cbe31f7f1ca5ee807c1 --- device-oriole.mk | 4 ---- device-raven.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2ec79bb..863da0f 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -272,10 +272,6 @@ else device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Biometrics virtual HAL for e2e testing -PRODUCT_PACKAGES_DEBUG += \ - android.hardware.biometrics.fingerprint-service.example - # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ diff --git a/device-raven.mk b/device-raven.mk index 29bd3c1..e8d5952 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,10 +291,6 @@ else device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Biometrics virtual HAL for e2e testing -PRODUCT_PACKAGES_DEBUG += \ - android.hardware.biometrics.fingerprint-service.example - # Setup Wizard device-specific settings PRODUCT_PRODUCT_PROPERTIES += \ setupwizard.feature.enable_quick_start_flow_for_debug=true \ From 3a5e088ed24c843c664bca8cd94f76fa1d948555 Mon Sep 17 00:00:00 2001 From: George Chang Date: Thu, 9 Mar 2023 09:03:45 +0000 Subject: [PATCH 049/110] [NFC] Add antenna position coordinates Bug: 272406680 Test: manual Change-Id: I181bccd705a12c336b4d38d1c623cbcb8ea176fe --- oriole/overlay/packages/apps/Nfc/res/values/config.xml | 10 ++++++++++ raven/overlay/packages/apps/Nfc/res/values/config.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/oriole/overlay/packages/apps/Nfc/res/values/config.xml b/oriole/overlay/packages/apps/Nfc/res/values/config.xml index fa19b4d..d1f5832 100644 --- a/oriole/overlay/packages/apps/Nfc/res/values/config.xml +++ b/oriole/overlay/packages/apps/Nfc/res/values/config.xml @@ -22,4 +22,14 @@ GR1YH true + + 72 + 157 + false + + 36 + + + 106 + diff --git a/raven/overlay/packages/apps/Nfc/res/values/config.xml b/raven/overlay/packages/apps/Nfc/res/values/config.xml index 47f360e..e17a0a2 100644 --- a/raven/overlay/packages/apps/Nfc/res/values/config.xml +++ b/raven/overlay/packages/apps/Nfc/res/values/config.xml @@ -22,4 +22,14 @@ GLU0G true + + 72 + 167 + false + + 36 + + + 106 + From 7099d947935479e310170cd0c5a37823d4e14e39 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 22 Mar 2023 18:20:49 +0000 Subject: [PATCH 050/110] Remove unused dimen auth_ripple_alpha_in_duration Bug: 274785453 Test: device builds Change-Id: Ic6686d9508b6082e704caf1e360ae6d4bb8d72e7 --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 --- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 2e0c18b..fa178a8 100644 --- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -50,9 +50,6 @@ 54px - - 0 - 16px diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 6d0894d..bc7aab2 100644 --- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -59,8 +59,5 @@ 68px - - - 0 From 96b853c5f139fb59111319c8ae5b8ccf899c0671 Mon Sep 17 00:00:00 2001 From: chengfeitao Date: Sat, 11 Mar 2023 00:18:16 +0000 Subject: [PATCH 051/110] Force slowJpegMode on certain camera1 apps Turn off the large JPEG stream on camera1 apps that experience high power consumption during video call Bug: 254350466 Test: Manual testing with Messenger app video call Change-Id: Ic695299a03fe442e36a35b0770b855ac989c0923 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++ .../overlay/frameworks/base/core/res/res/values/config.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 67405dd..af79ebd 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -340,4 +340,10 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> M 0 0 L 0 2399.9551 L 0.01171875 2330 C 0.01171875 2336.1175 0.0096285556 2342.2799 0.044921875 2347.9473 C 0.074333947 2353.2002 0.11155831 2357.9933 0.30273438 2362.5195 L 0.30273438 2362.5645 C 0.31743984 2362.9086 0.3319628 2363.2497 0.34960938 2363.5879 C 0.58196092 2368.429 1.0173528 2373.0871 2.3261719 2377.5664 C 2.6526417 2378.6869 3.0343994 2379.7897 3.4785156 2380.8691 C 3.922632 2381.9456 4.3891332 2382.9253 5.0214844 2384.0488 C 6.2861859 2386.2958 7.882405 2388.4107 9.7382812 2390.2695 C 11.5971 2392.1253 13.711934 2393.7216 15.958984 2394.9863 C 16.079572 2395.054 16.199726 2395.1205 16.320312 2395.1855 C 19.876184 2397.1207 23.827035 2398.2369 27.847656 2398.8633 C 29.224122 2399.078 30.608739 2399.2397 32.011719 2399.3691 C 33.461714 2399.4985 34.928774 2399.5862 36.414062 2399.6602 C 37.040534 2399.6902 37.670361 2399.7162 38.308594 2399.7402 C 38.967415 2399.7632 39.630196 2399.7847 40.300781 2399.8027 C 43.07136 2399.8798 45.970553 2399.9183 49.011719 2399.9453 C 50.008778 2399.9543 51.024293 2399.9568 52.056641 2399.9668 C 57.724269 2399.9998 63.882372 2400 70 2400 L 1010 2400 C 1016.1176 2400 1022.2758 2399.9998 1027.9434 2399.9668 C 1028.9758 2399.9568 1029.9913 2399.9543 1030.9883 2399.9453 C 1034.0295 2399.9183 1036.9286 2399.8798 1039.6992 2399.8027 C 1040.3698 2399.7847 1041.0326 2399.7632 1041.6914 2399.7402 C 1042.3297 2399.7162 1042.9594 2399.6902 1043.5859 2399.6602 C 1045.0712 2399.5862 1046.5383 2399.4985 1047.9883 2399.3691 C 1049.3913 2399.2397 1050.7759 2399.078 1052.1523 2398.8633 C 1056.173 2398.2369 1060.1239 2397.1207 1063.6797 2395.1855 C 1063.8003 2395.1205 1063.9204 2395.054 1064.041 2394.9863 C 1066.2881 2393.7216 1068.4029 2392.1253 1070.2617 2390.2695 C 1072.1176 2388.4107 1073.7138 2386.2958 1074.9785 2384.0488 C 1075.6109 2382.9253 1076.0774 2381.9456 1076.5215 2380.8691 C 1076.9656 2379.7897 1077.3474 2378.6869 1077.6738 2377.5664 C 1078.9827 2373.0871 1079.4181 2368.429 1079.6504 2363.5879 C 1079.6684 2363.2497 1079.6823 2362.9086 1079.6973 2362.5645 L 1079.6973 2362.5195 C 1079.8885 2357.9933 1079.9257 2353.2002 1079.9551 2347.9473 C 1079.9901 2342.2799 1079.9883 2336.1175 1079.9883 2330 L 1080 2399.9551 L 1080 0.044921875 L 1079.9883 71 C 1079.9883 64.794962 1079.9911 58.545473 1079.9551 52.796875 C 1079.9253 47.468905 1079.8873 42.606745 1079.6934 38.015625 L 1079.6934 37.970703 C 1079.6784 37.621663 1079.6625 37.274699 1079.6445 36.931641 C 1079.4088 32.021321 1078.9681 27.295335 1077.6406 22.751953 C 1077.3095 21.615355 1076.9211 20.497172 1076.4707 19.402344 C 1076.0202 18.310501 1075.5496 17.317311 1074.9082 16.177734 C 1073.6254 13.898585 1072.0054 11.75451 1070.123 9.8691406 C 1068.2376 7.9867504 1066.0917 6.3667538 1063.8125 5.0839844 C 1063.6902 5.0153714 1063.5696 4.9464892 1063.4473 4.8808594 C 1059.8406 2.9179242 1055.8339 1.7877614 1051.7559 1.1523438 C 1050.3597 0.93457112 1048.9542 0.7699316 1047.5312 0.63867188 C 1046.0607 0.50741114 1044.571 0.41832986 1043.0645 0.34375 C 1042.4291 0.31391006 1041.7919 0.28558871 1041.1445 0.26171875 C 1040.4763 0.23784879 1039.8052 0.21711871 1039.125 0.19921875 C 1036.3148 0.12165291 1033.3718 0.081537446 1030.2871 0.0546875 C 1029.2758 0.045737518 1028.2483 0.039203113 1027.2012 0.033203125 C 1021.4526 -0.0026068034 1015.205 0 1009 0 L 0 0 z M 1009 0 L 1080 0.044921875 L 1080 0 L 1009 0 z M 1080 2399.9551 L 1010 2400 L 1080 2400 L 1080 2399.9551 z M 70 2400 L 0 2399.9551 L 0 2400 L 70 2400 z M 71.074219 0.07421875 C 64.869196 0.07421875 58.623595 0.071623672 52.875 0.10742188 C 51.827904 0.11338786 50.798412 0.11995677 49.787109 0.12890625 C 46.702498 0.15575489 43.761331 0.19782787 40.951172 0.27539062 C 40.270961 0.2932897 39.597922 0.31402528 38.929688 0.33789062 C 38.282338 0.36175598 37.645185 0.38813701 37.009766 0.41796875 C 35.503258 0.49254831 34.013679 0.58163053 32.542969 0.71289062 C 31.119947 0.84415098 29.716443 1.00879 28.320312 1.2265625 C 24.242304 1.8619807 20.235577 2.9921432 16.628906 4.9550781 C 16.506596 5.0207081 16.384028 5.08959 16.261719 5.1582031 C 13.982566 6.4409722 11.836546 8.0609694 9.9511719 9.9433594 C 8.0687825 11.82873 6.4487846 13.972802 5.1660156 16.251953 C 4.5246312 17.39153 4.0539764 18.38472 3.6035156 19.476562 C 3.153055 20.571392 2.7647271 21.691531 2.4335938 22.828125 C 1.1060772 27.371513 0.66535899 32.095538 0.4296875 37.005859 C 0.41178834 37.348927 0.39577534 37.695889 0.38085938 38.044922 L 0.38085938 38.089844 C 0.18695251 42.680964 0.14897249 47.543126 0.11914062 52.871094 C 0.083342432 58.619688 0.0859375 64.869175 0.0859375 71.074219 L 0.07421875 0.11914062 L 71.074219 0.07421875 z + + + + com.facebook.orca + com.skype.raider + diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 1a78f19..f167354 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -316,4 +316,10 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> M 176 0 C 115.02392 1.1656472 102.53447 1.6184269 71.396484 3.3847656 C 55.659057 4.4652262 48.372167 5.3816761 40.939453 7.5957031 C 36.159471 9.0195457 30.970511 11.33647 26.369141 14.238281 C 22.479829 16.691042 19.646362 19.26924 16.513672 22.466797 C 12.640699 26.419964 10.129306 29.745868 8.1074219 34.291016 C 5.3985024 40.380603 4.5627354 44.599726 3.7597656 49.205078 C 1.5206876 62.047086 2.0426694 76.127341 1.3613281 93.833984 C 0.29502583 121.54496 0.79450661 135.72186 0 176 L 0 2944 C 0.79450661 2984.2782 0.29502583 2998.4569 1.3613281 3026.168 C 2.0426694 3043.8746 2.1114381 3057.8378 4.2636719 3070.748 C 4.8913915 3074.5134 6.5432868 3080.1477 9.0664062 3085.1855 C 11.294042 3089.6334 13.056713 3092.9239 16.929688 3096.877 C 20.062376 3100.0744 22.895844 3102.6546 26.785156 3105.1074 C 31.386528 3108.0092 36.774591 3110.4649 41.513672 3112.0195 C 47.497419 3113.9823 55.924021 3115.2717 71.396484 3116.6152 C 102.53447 3118.3815 115.02392 3118.8344 176 3120 L 1264 3120 C 1324.976 3118.8344 1337.4655 3118.3815 1368.6035 3116.6152 C 1384.076 3115.2717 1392.5025 3113.9823 1398.4863 3112.0195 C 1403.2253 3110.4649 1408.6134 3108.0092 1413.2148 3105.1074 C 1417.1041 3102.6546 1419.9376 3100.0744 1423.0703 3096.877 C 1426.9432 3092.9239 1428.704 3089.6334 1430.9316 3085.1855 C 1433.4548 3080.1477 1435.1086 3074.5134 1435.7363 3070.748 C 1437.8886 3057.8378 1437.9574 3043.8746 1438.6387 3026.168 C 1439.705 2998.4569 1439.2055 2984.2782 1440 2944 L 1440 176 C 1439.2055 135.72186 1439.705 121.54496 1438.6387 93.833984 C 1437.9574 76.12734 1438.4793 62.047092 1436.2402 49.205078 C 1435.4373 44.599728 1434.6015 40.380604 1431.8926 34.291016 C 1429.8707 29.745874 1427.3593 26.419959 1423.4863 22.466797 C 1420.3536 19.269233 1417.5202 16.691047 1413.6309 14.238281 C 1409.0295 11.336467 1403.8405 9.0195403 1399.0605 7.5957031 C 1391.628 5.3816775 1384.341 4.4652314 1368.6035 3.3847656 C 1337.4655 1.6184272 1324.976 1.1656476 1264 0 L 176 0 z + + + + com.facebook.orca + com.skype.raider + From c64d94bb944e57144f7515bc744bcf39fa6a5c43 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 7 Apr 2023 15:30:09 -0700 Subject: [PATCH 052/110] Adding irq mapping for sound_trigger wakeups Test: Manually, on a raven or oriole, inspect the output of `dumpsys batterystats --wakeups` Bug: 267717665 Change-Id: I92fce56d81a5915184b2c83d3b9c93af54d10af4 --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 35de830..cc046b2 100644 --- a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,5 +23,8 @@ Wifi + + Sound_trigger + diff --git a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index 35de830..cc046b2 100644 --- a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,5 +23,8 @@ Wifi + + Sound_trigger + From d04f044fb889e29d038b458fcea5818251004401 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Thu, 13 Apr 2023 09:55:49 +0000 Subject: [PATCH 053/110] [Quickstart] Turn off QS on legacy Pixels Bug: 277898824 Test: manually test Change-Id: I5c6cbc9274c12ceadb4bafb88f3d52f0089255c9 --- device-oriole.mk | 4 ---- device-raven.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a8e538c..8c19639 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -272,9 +272,5 @@ else device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-raven.mk b/device-raven.mk index 5325d5c..a3067f7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,9 +291,5 @@ else device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 2e8d17501d7e3ce89f472465a6f80e69a15a1b04 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Fri, 14 Apr 2023 01:13:36 +0000 Subject: [PATCH 054/110] Revert "[Quickstart] Turn off QS on legacy Pixels" Revert submission 22606975-turn off qs Reason for revert: confirm with team that this CL submit too early and need to rollback then submit again at 4/19. Reverted changes: /q/submissionid:22606975-turn+off+qs Change-Id: I3dbb1177e4bd39919774729a4c7dec27e2c78085 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 8c19639..a8e538c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -272,5 +272,9 @@ else device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-raven.mk b/device-raven.mk index a3067f7..5325d5c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,5 +291,9 @@ else device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif +# Setup Wizard device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + setupwizard.feature.enable_quick_start_flow_for_debug=true \ + # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 13b09767ddd2b859d0fb943fae82a874234f8dd0 Mon Sep 17 00:00:00 2001 From: Cyril Lee Date: Tue, 18 Apr 2023 09:30:46 +0000 Subject: [PATCH 055/110] Revert^2 "[Quickstart] Turn off QS on legacy Pixels" 2e8d17501d7e3ce89f472465a6f80e69a15a1b04 Change-Id: Iacd65f93f75f8f139952f13aa2d9c98061abfe69 --- device-oriole.mk | 4 ---- device-raven.mk | 4 ---- 2 files changed, 8 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a8e538c..8c19639 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -272,9 +272,5 @@ else device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) diff --git a/device-raven.mk b/device-raven.mk index 5325d5c..a3067f7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -291,9 +291,5 @@ else device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -# Setup Wizard device-specific settings -PRODUCT_PRODUCT_PROPERTIES += \ - setupwizard.feature.enable_quick_start_flow_for_debug=true \ - # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) From 166b0791d3b659f77708e48f3adb4498f0fa5b4d Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Fri, 14 Apr 2023 17:32:13 -0700 Subject: [PATCH 056/110] Add couple of mappings for wakeup reasons Adding mappings for sensor and cellular data wakeup reasons. Test: Manually inspect the output of `adb shell dumpsys batterystats --wakeups` Bug: 276498460 Bug: 275436924 Change-Id: Ide367e74e7d8eb48ca940feb3a8e7dc9c1665600 --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 6 ++++++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index cc046b2..79347af 100644 --- a/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/oriole/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,8 +23,14 @@ Wifi + + Cellular_data + Sound_trigger + + Sensor + diff --git a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index cc046b2..79347af 100644 --- a/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/raven/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -23,8 +23,14 @@ Wifi + + Cellular_data + Sound_trigger + + Sensor + From e2a450a661f97c08060682d2cbdb29abf0e39cd1 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Wed, 12 Apr 2023 05:03:05 +0000 Subject: [PATCH 057/110] Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Test: Build, perf metrics Change-Id: I3310b63f655c3b859ab294b9174eb1be12cb6392 --- device-oriole.mk | 3 +++ device-raven.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 8c19639..f3d0f79 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -274,3 +274,6 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.sys.fflag.override.settings_support_large_screen=false diff --git a/device-raven.mk b/device-raven.mk index a3067f7..49fe1bc 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -293,3 +293,6 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.sys.fflag.override.settings_support_large_screen=false From c8b10c579fa28c7591669886815d73b0da4cbd45 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Mon, 24 Apr 2023 18:18:28 +0000 Subject: [PATCH 058/110] Revert "Disable Settings large-screen optimization" This reverts commit e2a450a661f97c08060682d2cbdb29abf0e39cd1. Reason for revert: b/279461170 Change-Id: I7ff5931635e2fec0517cb6511870e57b701bd107 --- device-oriole.mk | 3 --- device-raven.mk | 3 --- 2 files changed, 6 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index f3d0f79..8c19639 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -274,6 +274,3 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.sys.fflag.override.settings_support_large_screen=false diff --git a/device-raven.mk b/device-raven.mk index 49fe1bc..a3067f7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -293,6 +293,3 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.sys.fflag.override.settings_support_large_screen=false From ad1a91f7c3013c497cfab2a877ef590317b786ef Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 20 Apr 2023 18:43:34 +0800 Subject: [PATCH 059/110] Add device mk OWNERS Bug: 278167548 Change-Id: I8b4a4dfe6501b406e3cdaea375527106aff589ae --- OWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OWNERS b/OWNERS index 5aee848..61b3e45 100644 --- a/OWNERS +++ b/OWNERS @@ -1 +1,4 @@ per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com + +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS From 83650f79c424a0e4e0176a1d78929020db6fb291 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Thu, 6 Apr 2023 17:16:55 +0000 Subject: [PATCH 060/110] powerhint.json: Update uclamp_min hint to account for margin Upstream has fixed relationship between uclamp_min and margin which means uclamp_min value between 80-100% of capacity of the CPU is a valid value and will not cause upmigration. To keep the current hints in powerhint.json the same, we must update uclamp_min to be capacity_orig_of(medium_cpu) + 1. This change is dependent on uclamp vs fits margin in GKI, vendor modules. And an improvement in sched_pixel to ignore the 25% boost if the only reason to request the frequency is uclamp_min. To cater for the later - we multiply each uclamp_min value with 1.25 - except ones that look intentionally set around capacity boundaries. Bug: 261695590 Test: UiBench Signed-off-by: Qais Yousef Change-Id: Ic5d7efed94a7c744132af1092b1438409d94ed9d --- powerhint-oriole.json | 40 +++++++++++++-------------- powerhint-raven.json | 40 +++++++++++++-------------- powerhint-slider.json | 60 ++++++++++++++++++++--------------------- powerhint-whitefin.json | 60 ++++++++++++++++++++--------------------- 4 files changed, 100 insertions(+), 100 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6d9cff0..9ec6a0e 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -134,7 +134,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -143,7 +143,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -152,8 +152,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -538,13 +538,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1762,7 +1762,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "ML_ACC", @@ -1784,8 +1784,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1808,8 +1808,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1832,8 +1832,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1859,9 +1859,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1883,9 +1883,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1907,7 +1907,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-raven.json b/powerhint-raven.json index 23dc7cc..46970f3 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -133,7 +133,7 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1" ], "ResetOnInit": true @@ -142,7 +142,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -151,8 +151,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -537,13 +537,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1743,7 +1743,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "ML_ACC", @@ -1765,8 +1765,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1789,8 +1789,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1813,8 +1813,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1840,9 +1840,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1864,9 +1864,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1888,7 +1888,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-slider.json b/powerhint-slider.json index 661a28f..52c8cb3 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -142,9 +142,9 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1", - "55" + "69" ], "ResetOnInit": true }, @@ -152,7 +152,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,9 +161,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "161", - "85", - "39" + "202", + "107", + "49" ], "ResetOnInit": true }, @@ -171,8 +171,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -417,7 +417,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -429,7 +429,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -440,7 +440,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -464,13 +464,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1202,13 +1202,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "229" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "160" }, { "PowerHint": "REFRESH_90FPS", @@ -1219,7 +1219,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "69" }, { "PowerHint": "REFRESH_60FPS", @@ -1354,7 +1354,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", @@ -1382,8 +1382,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1406,8 +1406,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1430,8 +1430,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1457,9 +1457,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1481,9 +1481,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1505,7 +1505,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 245cc4e..fa470a9 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -142,9 +142,9 @@ "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ - "553", + "692", "1", - "55" + "69" ], "ResetOnInit": true }, @@ -152,7 +152,7 @@ "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/fg_uclamp_min", "Values": [ - "161", + "202", "0" ], "ResetOnInit": true @@ -161,9 +161,9 @@ "Name": "SFUClampBoost", "Path": "/proc/vendor_sched/sf_uclamp_min", "Values": [ - "161", - "85", - "39" + "202", + "107", + "49" ], "ResetOnInit": true }, @@ -171,8 +171,8 @@ "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", "Values": [ - "180", - "512" + "225", + "640" ], "DefaultIndex": 0, "ResetOnInit": true @@ -408,7 +408,7 @@ "PowerHint": "INTERACTION", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -420,7 +420,7 @@ "PowerHint": "LAUNCH_120FPS", "Node": "SFUClampBoost", "Duration": 1000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -431,7 +431,7 @@ "PowerHint": "LAUNCH", "Node": "SFUClampBoost", "Duration": 5000, - "Value": "85" + "Value": "107" }, { "PowerHint": "LAUNCH", @@ -455,13 +455,13 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "553" + "Value": "692" }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", "Duration": 5000, - "Value": "161" + "Value": "202" }, { "PowerHint": "LAUNCH", @@ -1187,13 +1187,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "183" + "Value": "229" }, { "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "128" + "Value": "160" }, { "PowerHint": "REFRESH_90FPS", @@ -1204,7 +1204,7 @@ "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "69" }, { "PowerHint": "REFRESH_60FPS", @@ -1333,7 +1333,7 @@ "PowerHint": "ML_ACC", "Node": "MLUclampBoost", "Duration": 2000, - "Value": "512" + "Value": "640" } ], "AdpfConfig": [ @@ -1349,8 +1349,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 185, - "UclampMin_High": 384, + "UclampMin_Init": 232, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1373,8 +1373,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1397,8 +1397,8 @@ "PID_Do": 500.0, "PID_Du": 0.0, "UclampMin_On": true, - "UclampMin_Init": 129, - "UclampMin_High": 384, + "UclampMin_Init": 162, + "UclampMin_High": 480, "UclampMin_Low": 2, "SamplingWindow_P": 1, "SamplingWindow_I": 0, @@ -1424,9 +1424,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 157, - "UclampMin_Low": 157, + "UclampMin_Init": 250, + "UclampMin_High": 197, + "UclampMin_Low": 197, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1448,9 +1448,9 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, - "UclampMin_High": 42, - "UclampMin_Low": 42, + "UclampMin_Init": 250, + "UclampMin_High": 53, + "UclampMin_Low": 53, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -1472,7 +1472,7 @@ "SamplingWindow_I": 1, "SamplingWindow_D": 1, "UclampMin_On": true, - "UclampMin_Init": 200, + "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, "ReportingRateLimitNs": 1, From fa0cfc4c0726252c14c0cc924944c9147b9e7cc8 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Wed, 26 Apr 2023 16:09:43 +0800 Subject: [PATCH 061/110] Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Bug: 279461170 Test: Build, perf metrics Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests Change-Id: Ibc5bc00ea8f5d97a1cb01a7ca8a7bfd72457fe19 --- device-oriole.mk | 5 +++++ device-raven.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 8c19639..f01655c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -274,3 +274,8 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + diff --git a/device-raven.mk b/device-raven.mk index a3067f7..a926be3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -293,3 +293,8 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + From 4057b417e80f10060a634a18e4c11b206f1f01eb Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Wed, 3 May 2023 16:05:25 +0000 Subject: [PATCH 062/110] Revert "Disable Settings large-screen optimization" Revert submission 22926596-disable_large_screen_opt Reason for revert: b/280606740 Reverted changes: /q/submissionid:22926596-disable_large_screen_opt Change-Id: I146686206097b72a57bf2ab67a8c11e0edf252d0 --- device-oriole.mk | 5 ----- device-raven.mk | 5 ----- 2 files changed, 10 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index f01655c..8c19639 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -274,8 +274,3 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false - diff --git a/device-raven.mk b/device-raven.mk index a926be3..a3067f7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -293,8 +293,3 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false - From 3682850995331a120fd6d52144b61fa01b555871 Mon Sep 17 00:00:00 2001 From: sashwinbalaji Date: Tue, 21 Feb 2023 09:41:40 +0800 Subject: [PATCH 063/110] thermal: Update config for stats Bug: 259903201 Test: local build and verify stats Change-Id: I1248d875ae445c1ce903eda5fc19072e5a4e1f2f --- thermal_info_config_oriole.json | 42 ++++++++++++++++++++++++++++++++- thermal_info_config_raven.json | 38 ++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 55ae506..1ec4b90 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -745,5 +745,45 @@ "PowerSampleDelay":14000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-QI-GNSS", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-QUIET", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB2-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QUIET-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 67a51fe..139bc22 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -735,5 +735,41 @@ "PowerSampleDelay":14000, "PowerSampleCount":5 } - ] + ], + "Stats": { + "Sensors": { + "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], + "RecordWithThreshold": [ + { + "Name": "VIRTUAL-NEUTRAL-QI", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB2-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-GNSS-BATT", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-QI-DISP", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-USB-THROTTLING", + "Thresholds": [3.0] + } + ] + }, + "CoolingDevices": { + "RecordVotePerSensor": { + "DefaultThresholdEnableAll": true + } + } + } } From 96397240973793f2dde0842140d1bd5c3831afd0 Mon Sep 17 00:00:00 2001 From: chengfeitao Date: Wed, 26 Apr 2023 18:32:52 +0000 Subject: [PATCH 064/110] Replace slowJepg build time overlay with runtime overlay Use runtime resource overlay instead of build time config overlay so that P21 and later devices are covered automatically Bug: 274172776 Test: Manual testing with Messenger app video call Change-Id: I56f1ab98c09120460af68a5c44c6a243d8d70690 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 6 ------ .../overlay/frameworks/base/core/res/res/values/config.xml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index af79ebd..67405dd 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -340,10 +340,4 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> M 0 0 L 0 2399.9551 L 0.01171875 2330 C 0.01171875 2336.1175 0.0096285556 2342.2799 0.044921875 2347.9473 C 0.074333947 2353.2002 0.11155831 2357.9933 0.30273438 2362.5195 L 0.30273438 2362.5645 C 0.31743984 2362.9086 0.3319628 2363.2497 0.34960938 2363.5879 C 0.58196092 2368.429 1.0173528 2373.0871 2.3261719 2377.5664 C 2.6526417 2378.6869 3.0343994 2379.7897 3.4785156 2380.8691 C 3.922632 2381.9456 4.3891332 2382.9253 5.0214844 2384.0488 C 6.2861859 2386.2958 7.882405 2388.4107 9.7382812 2390.2695 C 11.5971 2392.1253 13.711934 2393.7216 15.958984 2394.9863 C 16.079572 2395.054 16.199726 2395.1205 16.320312 2395.1855 C 19.876184 2397.1207 23.827035 2398.2369 27.847656 2398.8633 C 29.224122 2399.078 30.608739 2399.2397 32.011719 2399.3691 C 33.461714 2399.4985 34.928774 2399.5862 36.414062 2399.6602 C 37.040534 2399.6902 37.670361 2399.7162 38.308594 2399.7402 C 38.967415 2399.7632 39.630196 2399.7847 40.300781 2399.8027 C 43.07136 2399.8798 45.970553 2399.9183 49.011719 2399.9453 C 50.008778 2399.9543 51.024293 2399.9568 52.056641 2399.9668 C 57.724269 2399.9998 63.882372 2400 70 2400 L 1010 2400 C 1016.1176 2400 1022.2758 2399.9998 1027.9434 2399.9668 C 1028.9758 2399.9568 1029.9913 2399.9543 1030.9883 2399.9453 C 1034.0295 2399.9183 1036.9286 2399.8798 1039.6992 2399.8027 C 1040.3698 2399.7847 1041.0326 2399.7632 1041.6914 2399.7402 C 1042.3297 2399.7162 1042.9594 2399.6902 1043.5859 2399.6602 C 1045.0712 2399.5862 1046.5383 2399.4985 1047.9883 2399.3691 C 1049.3913 2399.2397 1050.7759 2399.078 1052.1523 2398.8633 C 1056.173 2398.2369 1060.1239 2397.1207 1063.6797 2395.1855 C 1063.8003 2395.1205 1063.9204 2395.054 1064.041 2394.9863 C 1066.2881 2393.7216 1068.4029 2392.1253 1070.2617 2390.2695 C 1072.1176 2388.4107 1073.7138 2386.2958 1074.9785 2384.0488 C 1075.6109 2382.9253 1076.0774 2381.9456 1076.5215 2380.8691 C 1076.9656 2379.7897 1077.3474 2378.6869 1077.6738 2377.5664 C 1078.9827 2373.0871 1079.4181 2368.429 1079.6504 2363.5879 C 1079.6684 2363.2497 1079.6823 2362.9086 1079.6973 2362.5645 L 1079.6973 2362.5195 C 1079.8885 2357.9933 1079.9257 2353.2002 1079.9551 2347.9473 C 1079.9901 2342.2799 1079.9883 2336.1175 1079.9883 2330 L 1080 2399.9551 L 1080 0.044921875 L 1079.9883 71 C 1079.9883 64.794962 1079.9911 58.545473 1079.9551 52.796875 C 1079.9253 47.468905 1079.8873 42.606745 1079.6934 38.015625 L 1079.6934 37.970703 C 1079.6784 37.621663 1079.6625 37.274699 1079.6445 36.931641 C 1079.4088 32.021321 1078.9681 27.295335 1077.6406 22.751953 C 1077.3095 21.615355 1076.9211 20.497172 1076.4707 19.402344 C 1076.0202 18.310501 1075.5496 17.317311 1074.9082 16.177734 C 1073.6254 13.898585 1072.0054 11.75451 1070.123 9.8691406 C 1068.2376 7.9867504 1066.0917 6.3667538 1063.8125 5.0839844 C 1063.6902 5.0153714 1063.5696 4.9464892 1063.4473 4.8808594 C 1059.8406 2.9179242 1055.8339 1.7877614 1051.7559 1.1523438 C 1050.3597 0.93457112 1048.9542 0.7699316 1047.5312 0.63867188 C 1046.0607 0.50741114 1044.571 0.41832986 1043.0645 0.34375 C 1042.4291 0.31391006 1041.7919 0.28558871 1041.1445 0.26171875 C 1040.4763 0.23784879 1039.8052 0.21711871 1039.125 0.19921875 C 1036.3148 0.12165291 1033.3718 0.081537446 1030.2871 0.0546875 C 1029.2758 0.045737518 1028.2483 0.039203113 1027.2012 0.033203125 C 1021.4526 -0.0026068034 1015.205 0 1009 0 L 0 0 z M 1009 0 L 1080 0.044921875 L 1080 0 L 1009 0 z M 1080 2399.9551 L 1010 2400 L 1080 2400 L 1080 2399.9551 z M 70 2400 L 0 2399.9551 L 0 2400 L 70 2400 z M 71.074219 0.07421875 C 64.869196 0.07421875 58.623595 0.071623672 52.875 0.10742188 C 51.827904 0.11338786 50.798412 0.11995677 49.787109 0.12890625 C 46.702498 0.15575489 43.761331 0.19782787 40.951172 0.27539062 C 40.270961 0.2932897 39.597922 0.31402528 38.929688 0.33789062 C 38.282338 0.36175598 37.645185 0.38813701 37.009766 0.41796875 C 35.503258 0.49254831 34.013679 0.58163053 32.542969 0.71289062 C 31.119947 0.84415098 29.716443 1.00879 28.320312 1.2265625 C 24.242304 1.8619807 20.235577 2.9921432 16.628906 4.9550781 C 16.506596 5.0207081 16.384028 5.08959 16.261719 5.1582031 C 13.982566 6.4409722 11.836546 8.0609694 9.9511719 9.9433594 C 8.0687825 11.82873 6.4487846 13.972802 5.1660156 16.251953 C 4.5246312 17.39153 4.0539764 18.38472 3.6035156 19.476562 C 3.153055 20.571392 2.7647271 21.691531 2.4335938 22.828125 C 1.1060772 27.371513 0.66535899 32.095538 0.4296875 37.005859 C 0.41178834 37.348927 0.39577534 37.695889 0.38085938 38.044922 L 0.38085938 38.089844 C 0.18695251 42.680964 0.14897249 47.543126 0.11914062 52.871094 C 0.083342432 58.619688 0.0859375 64.869175 0.0859375 71.074219 L 0.07421875 0.11914062 L 71.074219 0.07421875 z - - - - com.facebook.orca - com.skype.raider - diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index f167354..1a78f19 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -316,10 +316,4 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> M 176 0 C 115.02392 1.1656472 102.53447 1.6184269 71.396484 3.3847656 C 55.659057 4.4652262 48.372167 5.3816761 40.939453 7.5957031 C 36.159471 9.0195457 30.970511 11.33647 26.369141 14.238281 C 22.479829 16.691042 19.646362 19.26924 16.513672 22.466797 C 12.640699 26.419964 10.129306 29.745868 8.1074219 34.291016 C 5.3985024 40.380603 4.5627354 44.599726 3.7597656 49.205078 C 1.5206876 62.047086 2.0426694 76.127341 1.3613281 93.833984 C 0.29502583 121.54496 0.79450661 135.72186 0 176 L 0 2944 C 0.79450661 2984.2782 0.29502583 2998.4569 1.3613281 3026.168 C 2.0426694 3043.8746 2.1114381 3057.8378 4.2636719 3070.748 C 4.8913915 3074.5134 6.5432868 3080.1477 9.0664062 3085.1855 C 11.294042 3089.6334 13.056713 3092.9239 16.929688 3096.877 C 20.062376 3100.0744 22.895844 3102.6546 26.785156 3105.1074 C 31.386528 3108.0092 36.774591 3110.4649 41.513672 3112.0195 C 47.497419 3113.9823 55.924021 3115.2717 71.396484 3116.6152 C 102.53447 3118.3815 115.02392 3118.8344 176 3120 L 1264 3120 C 1324.976 3118.8344 1337.4655 3118.3815 1368.6035 3116.6152 C 1384.076 3115.2717 1392.5025 3113.9823 1398.4863 3112.0195 C 1403.2253 3110.4649 1408.6134 3108.0092 1413.2148 3105.1074 C 1417.1041 3102.6546 1419.9376 3100.0744 1423.0703 3096.877 C 1426.9432 3092.9239 1428.704 3089.6334 1430.9316 3085.1855 C 1433.4548 3080.1477 1435.1086 3074.5134 1435.7363 3070.748 C 1437.8886 3057.8378 1437.9574 3043.8746 1438.6387 3026.168 C 1439.705 2998.4569 1439.2055 2984.2782 1440 2944 L 1440 176 C 1439.2055 135.72186 1439.705 121.54496 1438.6387 93.833984 C 1437.9574 76.12734 1438.4793 62.047092 1436.2402 49.205078 C 1435.4373 44.599728 1434.6015 40.380604 1431.8926 34.291016 C 1429.8707 29.745874 1427.3593 26.419959 1423.4863 22.466797 C 1420.3536 19.269233 1417.5202 16.691047 1413.6309 14.238281 C 1409.0295 11.336467 1403.8405 9.0195403 1399.0605 7.5957031 C 1391.628 5.3816775 1384.341 4.4652314 1368.6035 3.3847656 C 1337.4655 1.6184272 1324.976 1.1656476 1264 0 L 176 0 z - - - - com.facebook.orca - com.skype.raider - From 270bec00cced9ce6656641877eb3b8caa1fb3921 Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Thu, 4 May 2023 18:30:48 +0000 Subject: [PATCH 065/110] Revert^2 Disable Settings large-screen optimization Disable the optimization that is automatically enabled when including Window Extensions through Activity Embedding. The optimization causes to launch an additional trampoline activity for deep links, even when the screen size is smaller than required by Activity Embedding rules. Bug: 267725145 Bug: 279461170 fixes: 280606740 Test: Build, perf metrics Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests Test: atest SettingsMultiPaneDeepLinkTest.java Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD on cheetah/oriole/panther/raven in udc-dev/master branch Change-Id: Ie5535003bf4325854dc723b2bfe4cd4670a5e8ac --- device-oriole.mk | 5 +++++ device-raven.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 8c19639..f01655c 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -274,3 +274,8 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + diff --git a/device-raven.mk b/device-raven.mk index a3067f7..a926be3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -293,3 +293,8 @@ endif # Window Extensions $(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + From e81ae9f5e14ae9f3d87ac9bfa2456d69edf86d92 Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Tue, 9 May 2023 05:00:11 +0000 Subject: [PATCH 066/110] Disable WM Extensions on Pixel 6 Bug: 266196089 Test: Build Change-Id: Id317b1626a522f6b7b8a4926c4bdf21ed67bd765 --- device-oriole.mk | 8 -------- device-raven.mk | 8 -------- 2 files changed, 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index f01655c..e7d8fd7 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -271,11 +271,3 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif - -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false - diff --git a/device-raven.mk b/device-raven.mk index a926be3..fffcbfc 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -290,11 +290,3 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif - -# Window Extensions -$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk) - -# Disable Settings large-screen optimization enabled by Window Extensions -PRODUCT_SYSTEM_PROPERTIES += \ - persist.settings.large_screen_opt.enabled=false - From 74fa55641033609e470079dcd67282dcb8243129 Mon Sep 17 00:00:00 2001 From: Kenzi Mudge Date: Tue, 9 May 2023 09:41:20 -0400 Subject: [PATCH 067/110] Enable UWB filter engine Updated overlay file to configure and enable the UWB filter engine on Raven. Bug: b/237098661 Test: make, flash, manual test Change-Id: I421b1b7335d9a403d0cfed5486457c2dfb5fa051 --- raven/rro_overlays/UwbOverlay/res/values/config.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/raven/rro_overlays/UwbOverlay/res/values/config.xml b/raven/rro_overlays/UwbOverlay/res/values/config.xml index 7a77d32..672ee1d 100644 --- a/raven/rro_overlays/UwbOverlay/res/values/config.xml +++ b/raven/rro_overlays/UwbOverlay/res/values/config.xml @@ -17,4 +17,15 @@ */ --> + + true + + + true + + + true From 1472d6336516d4bede91efd57757138bda207b2e Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Tue, 11 Apr 2023 11:38:00 +0800 Subject: [PATCH 068/110] uwb: update uwb calibration for CCC antenna config Bug: 249170179 Test: build pass Change-Id: I47a22f315b9ad3bf94706ef6547e022a3dd84cff Signed-off-by: Rex Lin --- uwb/UWB-calibration-ce.conf | 16 +++++----------- uwb/UWB-calibration-default.conf | 16 +++++----------- uwb/UWB-calibration-fcc.conf | 16 +++++----------- uwb/UWB-calibration-jp.conf | 16 +++++----------- uwb/UWB-calibration-restricted.conf | 16 +++++----------- uwb/UWB-calibration-tw.conf | 16 +++++----------- uwb/UWB-calibration.conf | 18 ++++++------------ 7 files changed, 36 insertions(+), 78 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 12b7f47..8514ffa 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x4B4B234B ant0.ch5.prf16.pg_count=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 25b1bb1..7f02b49 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 25b1bb1..7f02b49 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 9dfc069..6eba206 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x01 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 @@ -110,6 +103,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x01 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 681a5f3..f492db3 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0xffff +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 7bd68dc..c709cec 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 47d917c..5972577 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,17 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 @@ -109,6 +102,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 @@ -139,4 +133,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 -alternate_pulse_shape=0x01 +alternate_pulse_shape=0x00 From 1499e8335eb3026a19517e8638e4c58cbacb9a37 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 10 May 2023 10:45:59 +0000 Subject: [PATCH 069/110] The dvfs headroom was split into its own knob. Update to use it. util_threshold only controls migration margin now. dvfs headroom has its own new knob. Bug: 261705301 Signed-off-by: Qais Yousef Change-Id: Ieee72bbec5e9dd1cceff02ea82c73ccf85fe9358 --- powerhint-oriole.json | 16 ++++++++++++++++ powerhint-raven.json | 16 ++++++++++++++++ powerhint-slider.json | 16 ++++++++++++++++ powerhint-whitefin.json | 16 ++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 9ec6a0e..1069ca1 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -130,6 +130,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", @@ -947,6 +957,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", diff --git a/powerhint-raven.json b/powerhint-raven.json index 46970f3..b068218 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -129,6 +129,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "TAUClampBoost", "Path": "/proc/vendor_sched/ta_uclamp_min", @@ -946,6 +956,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", diff --git a/powerhint-slider.json b/powerhint-slider.json index 52c8cb3..bd5ab4c 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -129,6 +129,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -838,6 +848,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index fa470a9..cc335bc 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -129,6 +129,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -829,6 +839,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", From a203d4cfbfa73fda7e14f2869da3d6e76338b352 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Sat, 13 May 2023 22:36:19 +0000 Subject: [PATCH 070/110] Update raviole SVN to 57 Bug: 282371465 Change-Id: Idd5c7d8e8446219b728c87314272f81a676bdd12 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index af84ea1..a42a89e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=56 + ro.vendor.build.svn=57 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 394a99e..bb620e9 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=56 + ro.vendor.build.svn=57 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 0337a84b9f87bb784dee8bc49c9bff6bff03a82a Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Mon, 15 May 2023 02:29:10 +0000 Subject: [PATCH 071/110] raviole: remove customizedMaxCachedProcesses With project Snowbird in U, the MaxCachedProcesses is 1024 by default Bug: 278086134 Test: Build Change-Id: I9672bc93d6212bee842c7a86a351d4e286eeda67 --- oriole/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- raven/overlay/frameworks/base/core/res/res/values/config.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index 67405dd..c280a88 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -224,9 +224,6 @@ non-zero amplitudes, to bring the vibrator amplitude down to zero using this timing. --> 50 - - 64 - 2 3 diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 1a78f19..c8d8730 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -200,9 +200,6 @@ false - - 64 - 2 3 From bfef288348535eb042263b06817908fb48b15d26 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Tue, 9 May 2023 16:13:11 +0800 Subject: [PATCH 072/110] gps: Enable Vzw SUPL OTDOA Bug: 278507661 Bug: 282650841 Test: OTDOA pass Change-Id: I751d7520534f6ad46bb4b1a0ebbcd987178405dd --- location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.xml | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 6 files changed, 6 insertions(+) diff --git a/location/gps.xml b/location/gps.xml index 8fb7c66..7c53415 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index d85fd16..cd149a7 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index a095dbd..3c6dbc6 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -35,6 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 5efd542..baf0ee5 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index 2d50372..558799d 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index b2fb2bd..0861857 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -34,6 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From 6fa07a41412f94d376a684285dc799083f60bdbb Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Wed, 17 May 2023 08:12:36 +0000 Subject: [PATCH 073/110] gps: include gps/brcm/cbd_gps.mk - include cbd_gps for slider and whitefin Bug: 282877296 Test: verify in-market device and dev board at b/282877296 Change-Id: Ibc6969ff70aa51a5c07f8621a39023d1f6f0228d --- device-slider.mk | 1 + device-whitefin.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/device-slider.mk b/device-slider.mk index 72f5a1d..5cbab35 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -28,6 +28,7 @@ include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/stm/stm11.mk # go/lyric-soong-variables diff --git a/device-whitefin.mk b/device-whitefin.mk index 7c2a533..0c366c8 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -28,6 +28,7 @@ include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs-common/bcmbt/bluetooth.mk +include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/lsi/lsi.mk # wireless_charger HAL service needs to be included specially due to no raviole-sepolicy folder From efa80f56b39248025afa654f24802aaa3fe57847 Mon Sep 17 00:00:00 2001 From: Jiaming Liu Date: Fri, 19 May 2023 07:25:24 +0000 Subject: [PATCH 074/110] Add back the flag to disable Settings large-screen optimization Add back the persist.settings.large_screen_opt.enabled=false flag so that Settings app does not need to instantiate WM jetpack classes when checking availability of large-screen optimization. Previously removed in ag/23102094. Bug: 281921771 Test: ABTD performance test in b/281921771 Merged-In: I9fdca6644ee7302f52fe3b850a357bae76dbacf3 Change-Id: I38a3af2b7b9f4690c51599f54fca472d65c88dcc --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index daa870f..8b04d14 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -271,3 +271,7 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false diff --git a/device-raven.mk b/device-raven.mk index 77e6b08..550a8b3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -290,3 +290,7 @@ else PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false From e608188e6ec4508351b6c01286a331f864680611 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 23 May 2023 20:30:55 +0000 Subject: [PATCH 075/110] Update oriole SVN to 58 Bug: 282371465 Change-Id: I3993a9e2b8f034ef16cbec3bca24724067799e05 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index a42a89e..0c8e3f8 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=57 + ro.vendor.build.svn=58 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index bb620e9..d0dc3b5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=57 + ro.vendor.build.svn=58 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 7a7ed15217130893226f6e79e7f6b1773dca8818 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Fri, 26 May 2023 19:19:06 +0000 Subject: [PATCH 076/110] Update raviole SVN to 59 Bug: 282371465 Change-Id: I311ee673d6f6cf0a0b41fea3356e5d95a8cb3261 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0c8e3f8..1dafde6 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index d0dc3b5..65043a5 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=58 + ro.vendor.build.svn=59 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From a27a8cab631ae180076305e893b63c031ba8fd31 Mon Sep 17 00:00:00 2001 From: Jeffrey Carlyle Date: Fri, 17 Feb 2023 15:01:11 -0800 Subject: [PATCH 077/110] dck: add SE capability property Bug: 285390995 Test: boot cheetah; check logs to see that SE property is used Change-Id: I0e103c4bf621d662b6f0df78756cd78a442c19c4 Signed-off-by: Jeffrey Carlyle --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index c5b1b0e..3245889 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -211,7 +211,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=2 + ro.gms.dck.eligible_wcc=2 \ + ro.gms.dck.se_capability=1 # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts diff --git a/device-raven.mk b/device-raven.mk index cffa228..b3b8bb2 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -221,7 +221,8 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ - ro.gms.dck.eligible_wcc=3 + ro.gms.dck.eligible_wcc=3 \ + ro.gms.dck.se_capability=1 # SKU specific RROs PRODUCT_PACKAGES += \ From 47719a3b6214d8bdfb4321a748cb42d5192ce15d Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Thu, 1 Jun 2023 20:49:39 +0000 Subject: [PATCH 078/110] Remove rt_uclamp_min and sf_uclamp_min rt_uclamp_min and sf_uclamp_min have been made redundant in Pixel by ADPF for sf, so we are just going to remove them outright rather than worrying about overriding them later Bug: 285248880 Test: manual Change-Id: I6b26c9e95066b689517352edd9c707cd12afdf67 --- conf/init.raviole.rc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 908b6cd..a09cbae 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -66,11 +66,3 @@ on property:persist.vendor.se.ese2.mode=ctsmode on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 - -# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints -on property:sys.boot_completed=1 - trigger override-sf-uclamp - -on override-sf-uclamp - write /proc/vendor_sched/rt_uclamp_min 0 - write /proc/vendor_sched/sf_uclamp_min 0 From 8c949a472fca9b225d79e3f0ffd5e0baeddddce4 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sun, 4 Jun 2023 01:45:12 +0000 Subject: [PATCH 079/110] Update raviole SVN to 60 Bug: 285692955 Change-Id: Ib10cde22f8b753b597cc18138e41111854c95c77 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 1dafde6..ec3ce90 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=60 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 65043a5..5c02fae 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=59 + ro.vendor.build.svn=60 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8e5c7f3dd3322269e3eceb12c6b731d979c7062f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sun, 4 Jun 2023 01:51:23 +0000 Subject: [PATCH 080/110] Update raviole SVN to 61 Bug: 285692955 Change-Id: I639b7cee071877f744eae2e36db07e25031a7345 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index ec3ce90..2c33ab4 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -171,7 +171,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=60 + ro.vendor.build.svn=61 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 5c02fae..cc20373 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -180,7 +180,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=60 + ro.vendor.build.svn=61 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 03f3dc0c29ca55397e6573165ae5f6ccffc0ef9b Mon Sep 17 00:00:00 2001 From: paulsu Date: Thu, 8 Jun 2023 10:13:40 +0000 Subject: [PATCH 081/110] Create group throttle powerhint Test: Local test Bug: 280258727 Change-Id: Idf307a30a26129835057dc4e57eadf505b260d85 Signed-off-by: paulsu --- powerhint-oriole.json | 50 +++++++++++++++++++++++++++++++++++++++++++ powerhint-raven.json | 50 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 1069ca1..b8f0a52 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -487,6 +487,26 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "UgBgGroupThrottle", + "Path": "/proc/vendor_sched/ug_bg_group_throttle", + "Values": [ + "512", + "308" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -1432,6 +1452,12 @@ "Duration": 0, "Value": "0,1,2,3,4,5" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", @@ -1498,6 +1524,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", @@ -1564,6 +1596,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", @@ -1630,6 +1668,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", @@ -1714,6 +1758,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", diff --git a/powerhint-raven.json b/powerhint-raven.json index b068218..b71165f 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -486,6 +486,26 @@ "0,1,2,3,4,5,6,7" ], "Type": "Property" + }, + { + "Name": "Dex2oatGroup", + "Path": "/proc/vendor_sched/dex2oat_ug", + "Values": [ + "1", + "0" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, + { + "Name": "UgBgGroupThrottle", + "Path": "/proc/vendor_sched/ug_bg_group_throttle", + "Values": [ + "512", + "308" + ], + "DefaultIndex": 0, + "ResetOnInit": true } ], "Actions": [ @@ -1413,6 +1433,12 @@ "Duration": 0, "Value": "0,1,2,3,4,5" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "PMU_POLL", @@ -1479,6 +1505,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", "Node": "PMU_POLL", @@ -1545,6 +1577,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "PMU_POLL", @@ -1611,6 +1649,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "PMU_POLL", @@ -1695,6 +1739,12 @@ "Duration": 0, "Value": "0,1,2,3" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", + "Node": "Dex2oatGroup", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", From 2fccecff0f373966f4c52680f24cf8e77a825c1c Mon Sep 17 00:00:00 2001 From: paulsu Date: Wed, 14 Jun 2023 05:22:04 +0000 Subject: [PATCH 082/110] Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default Bug: 280258727 Test: Found regression in b/286002292, local test. Change-Id: I7628d4dd8f115926f2c33efa252b8256ec628f7a Signed-off-by: paulsu --- powerhint-oriole.json | 10 ---------- powerhint-raven.json | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index b8f0a52..16a368f 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -497,16 +497,6 @@ ], "DefaultIndex": 0, "ResetOnInit": true - }, - { - "Name": "UgBgGroupThrottle", - "Path": "/proc/vendor_sched/ug_bg_group_throttle", - "Values": [ - "512", - "308" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ diff --git a/powerhint-raven.json b/powerhint-raven.json index b71165f..b0b22d8 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -496,16 +496,6 @@ ], "DefaultIndex": 0, "ResetOnInit": true - }, - { - "Name": "UgBgGroupThrottle", - "Path": "/proc/vendor_sched/ug_bg_group_throttle", - "Values": [ - "512", - "308" - ], - "DefaultIndex": 0, - "ResetOnInit": true } ], "Actions": [ From ed5126c902cd181ec372cfb795cf4e944407a544 Mon Sep 17 00:00:00 2001 From: Hasan Awais Date: Wed, 21 Jun 2023 16:52:05 +0000 Subject: [PATCH 083/110] uwb: update calibration for range bias Bug: 287082706 Test: build pass Signed-off-by: Hasan Awais (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:87fb539007e07e853a80e4ef4a498068096ce074) Merged-In: Icc7ed7860b6c5e31486ad09b91a9ae0344c5b5d4 Change-Id: Icc7ed7860b6c5e31486ad09b91a9ae0344c5b5d4 --- uwb/UWB-calibration-ce.conf | 6 +++--- uwb/UWB-calibration-default.conf | 6 +++--- uwb/UWB-calibration-fcc.conf | 6 +++--- uwb/UWB-calibration-jp.conf | 6 +++--- uwb/UWB-calibration-restricted.conf | 6 +++--- uwb/UWB-calibration-tw.conf | 6 +++--- uwb/UWB-calibration.conf | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 8514ffa..569b0a9 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x4B4B234B ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x4B4B234B ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x53532B53 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x53532B53 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 7f02b49..0e5b153 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 7f02b49..0e5b153 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 6eba206..550519d 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x20 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x20 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index f492db3..46aba9a 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index c709cec..a5e88b1 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x47472347 ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x47472347 ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x34 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 5972577..b4047cd 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -9,7 +9,7 @@ ant0.ch5.prf16.ant_delay=16414 ant0.ch5.prf16.tx_power=0x47472347 ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.ant_delay=16437 ant0.ch5.prf64.tx_power=0x47472347 ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -17,7 +17,7 @@ ant0.ch9.prf16.ant_delay=16426 ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x20 -ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.ant_delay=16440 ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x20 @@ -36,7 +36,7 @@ ant1.ch9.prf16.ant_delay=16429 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.ant_delay=16459 ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0 From 261cabfc4620c8b961d9e4bfef8f36c5699fd34f Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Mon, 26 Jun 2023 01:16:41 +0000 Subject: [PATCH 084/110] Update raviole SVN to 62 Bug: 285692955 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96e7f36feb7e5f14894b06adb9c930a7994c24e7) Merged-In: I844fd9fe96b066891d999977e213409bec1ab378 Change-Id: I844fd9fe96b066891d999977e213409bec1ab378 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index d230c70..915b748 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=61 + ro.vendor.build.svn=62 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 97d6638..243929c 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=61 + ro.vendor.build.svn=62 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From cbef55c5cab716c6b931cc88cf203ef64b125ceb Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:56:22 +0000 Subject: [PATCH 085/110] Update oriole SVN to 63 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:adafd7172e9ecc0506a3b7ad05633e9896a08d2c) Merged-In: I3b1c01cf8262a7a83ed57c2ee01ae632889b8a6f Change-Id: I3b1c01cf8262a7a83ed57c2ee01ae632889b8a6f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 915b748..d8f40b2 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c4b8a73b4da68f06e9aee455f53c301fb10554a6 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:56:42 +0000 Subject: [PATCH 086/110] Update raven SVN to 63 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b2ac29db3d6bde4fba7493337fa63e1fdebe98c) Merged-In: Ib25450b4fe20540b7be29b24a4f7e8ac2918afed Change-Id: Ib25450b4fe20540b7be29b24a4f7e8ac2918afed --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 243929c..fd3e9ed 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=62 + ro.vendor.build.svn=63 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 82b34e12f63ed589ffc80f1147524f77c0c8f1e5 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:35 +0000 Subject: [PATCH 087/110] Update raven SVN to 64 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:896aa10a3f25fc3bc81f1f4dd0256105ca13761d) Merged-In: I810a986d63c1290e982a818d8c3333ec154f132f Change-Id: I810a986d63c1290e982a818d8c3333ec154f132f --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index fd3e9ed..8e751cb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=64 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 7b7d998d3aa311df0a930cf605a3ce2811d7f975 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:18 +0000 Subject: [PATCH 088/110] Update oriole SVN to 64 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75fc391675423c6c536ed9f7f3a609ba277ba0d5) Merged-In: I3d4b6b88f7f11c09cf6b3b0a44e58b71512b670f Change-Id: I3d4b6b88f7f11c09cf6b3b0a44e58b71512b670f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d8f40b2..0851fae 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=64 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 0d1142b912cffa2683fe6f8b4d5afe8b8d0b36be Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:35 +0000 Subject: [PATCH 089/110] Update raven SVN to 64 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:896aa10a3f25fc3bc81f1f4dd0256105ca13761d) Merged-In: I810a986d63c1290e982a818d8c3333ec154f132f Change-Id: I810a986d63c1290e982a818d8c3333ec154f132f --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index fd3e9ed..8e751cb 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=64 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 9e3454bee06acf1b891cdbd3052f5546ad86f51f Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 17:39:18 +0000 Subject: [PATCH 090/110] Update oriole SVN to 64 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75fc391675423c6c536ed9f7f3a609ba277ba0d5) Merged-In: I3d4b6b88f7f11c09cf6b3b0a44e58b71512b670f Change-Id: I3d4b6b88f7f11c09cf6b3b0a44e58b71512b670f --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d8f40b2..0851fae 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=63 + ro.vendor.build.svn=64 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 6f1ec7c8f915e2f7f5fcb7f6ffcd96001460975d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 19:40:13 +0000 Subject: [PATCH 091/110] Update raven SVN to 65 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4f2338232d71451bcf11d061cc81a06fdc42dccf) Merged-In: I93ad1006560c9d24ddd05cf84a296fb45c55ca36 Change-Id: I93ad1006560c9d24ddd05cf84a296fb45c55ca36 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 8e751cb..ca8b29e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=64 + ro.vendor.build.svn=65 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 796207b60549c3d4b864ece471c5ce62a50c26aa Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 19:39:51 +0000 Subject: [PATCH 092/110] Update oriole SVN to 65 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1cb7eab005ed824768a5d5cf2a64d131e8ca421f) Merged-In: Ie153885b359f046a62b0504de6370c977be0c660 Change-Id: Ie153885b359f046a62b0504de6370c977be0c660 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 0851fae..d84bd18 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=64 + ro.vendor.build.svn=65 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c6f175b5fc8498082055f0821db4058a71e579bf Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:28 +0000 Subject: [PATCH 093/110] Update oriole SVN to 66 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:51a53388f65718adf04c966e6d198806e6ee7c16) Merged-In: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 Change-Id: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d84bd18..d539149 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From cc68ab6da03844267c658d1be1892f9492a06510 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:40 +0000 Subject: [PATCH 094/110] Update raven SVN to 66 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:45ec5947addac69fe8107de50f73bddd4e9812c4) Merged-In: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 Change-Id: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index ca8b29e..1bee402 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 0b99c85169c24ce6e37a10e024710e5b59ca0ca1 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:28 +0000 Subject: [PATCH 095/110] Update oriole SVN to 66 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:51a53388f65718adf04c966e6d198806e6ee7c16) Merged-In: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 Change-Id: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d84bd18..d539149 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 7602d45ae96eafcd5ee6ec4faca378cd361be3d1 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:40 +0000 Subject: [PATCH 096/110] Update raven SVN to 66 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:45ec5947addac69fe8107de50f73bddd4e9812c4) Merged-In: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 Change-Id: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index ca8b29e..1bee402 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 99b5280cf5f5841510353aae338d7c8fe9a967d1 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:28 +0000 Subject: [PATCH 097/110] Update oriole SVN to 66 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:51a53388f65718adf04c966e6d198806e6ee7c16) Merged-In: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 Change-Id: I3d98813e9b236d583bc1bedeca1d5d0b26485c38 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d84bd18..d539149 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 585c714cf0321373097e0d3f21a4840e7d42e9b4 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 11 Aug 2023 21:00:40 +0000 Subject: [PATCH 098/110] Update raven SVN to 66 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:45ec5947addac69fe8107de50f73bddd4e9812c4) Merged-In: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 Change-Id: I49b714ba9f9d0e6d4f7fbe17e3a21f0b5a9e41d1 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index ca8b29e..1bee402 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=65 + ro.vendor.build.svn=66 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 469922edf5a4633ebdd84c8a5a7646ae519bb858 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:10:31 +0000 Subject: [PATCH 099/110] Update oriole SVN to 67 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3a7ba8ef0ea1b082bb8fad963b04f5d74f6e721) Merged-In: I9f4ee890043fd750b1ce98057194214a15d90a70 Change-Id: I9f4ee890043fd750b1ce98057194214a15d90a70 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index d539149..2184715 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=66 + ro.vendor.build.svn=67 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8b34cd2c23192c5cc08671f2e5e7c4cfbaf0affa Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Tue, 15 Aug 2023 00:10:44 +0000 Subject: [PATCH 100/110] Update raven SVN to 67 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9250af82dcd3f05e0c23220bd94013c72c178bb) Merged-In: Ica94551823469915b4630d90c1c571a5fc5638fb Change-Id: Ica94551823469915b4630d90c1c571a5fc5638fb --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 1bee402..c0f34d3 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=66 + ro.vendor.build.svn=67 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c9b70e35664a4e5fb1d9c98cd4f92edd7cf792a0 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Thu, 27 Jul 2023 13:46:23 +0800 Subject: [PATCH 101/110] gps: Disable Vzw SUPL OTDOA Bug: 293213801 Test: OTDOA disabled (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f0888f94c6fc74c7fdabbfe0b1fc0fba9b9a90bf) Merged-In: I1bc0f8e69e00c4c963d54c82181ba7839755e84e Change-Id: I1bc0f8e69e00c4c963d54c82181ba7839755e84e --- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/location/gps.xml b/location/gps.xml index 7c53415..fb1c305 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index cd149a7..fc42089 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 3c6dbc6..555e9ba 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index baf0ee5..0584d48 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index 558799d..9abad36 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index 0861857..9ef4706 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="true" + SuplOtdoaCapable2="false" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" From fab6942368d864bd92341b9fe57f1b1123c066fe Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:42 +0000 Subject: [PATCH 102/110] Update raven SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58d7ffaeeb22c8f074d2dd6318fcbd3158e5a3f0) Merged-In: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 Change-Id: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c0f34d3..cddf95e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4d6bdda1cd18df90cf8b9510eaaf33d8ab34ec3c Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:21 +0000 Subject: [PATCH 103/110] Update oriole SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f47de1ea25ab72a9dd50e13ff8217faab831d42) Merged-In: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 Change-Id: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2184715..1393bc0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8818ce47654a0fa8e20f439f32778a11a37faf5b Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:42 +0000 Subject: [PATCH 104/110] Update raven SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58d7ffaeeb22c8f074d2dd6318fcbd3158e5a3f0) Merged-In: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 Change-Id: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c0f34d3..cddf95e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 3b58a31c1119b1fd75865de5987aa2bd3d97d40d Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:21 +0000 Subject: [PATCH 105/110] Update oriole SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f47de1ea25ab72a9dd50e13ff8217faab831d42) Merged-In: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 Change-Id: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2184715..1393bc0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 5f649c76a0776ecfb6e3ad883cfca78a3316b892 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:42 +0000 Subject: [PATCH 106/110] Update raven SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58d7ffaeeb22c8f074d2dd6318fcbd3158e5a3f0) Merged-In: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 Change-Id: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c0f34d3..cddf95e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 275d5052d8aed2fb3f2dc1bbc5fb3a5d01e4a233 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:21 +0000 Subject: [PATCH 107/110] Update oriole SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f47de1ea25ab72a9dd50e13ff8217faab831d42) Merged-In: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 Change-Id: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2184715..1393bc0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 4793fddc60bdf47d23db94cbe0fd204bd89fcb6a Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:42 +0000 Subject: [PATCH 108/110] Update raven SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58d7ffaeeb22c8f074d2dd6318fcbd3158e5a3f0) Merged-In: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 Change-Id: I860de9766063f9674a6b4a9fd2d2deeea3e1b8f0 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c0f34d3..cddf95e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 72fd8871aa292a74e9127a0f2a99fc174280650b Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Wed, 16 Aug 2023 05:38:21 +0000 Subject: [PATCH 109/110] Update oriole SVN to 68 Bug: 295937899 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0f47de1ea25ab72a9dd50e13ff8217faab831d42) Merged-In: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 Change-Id: I073e25b8e4db19f9680e4ef7cda6baa7c265b925 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2184715..1393bc0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -182,7 +182,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=67 + ro.vendor.build.svn=68 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 3aae814a0eb814bec184a752f6eec3387b58c4bd Mon Sep 17 00:00:00 2001 From: Xin Li Date: Fri, 8 Sep 2023 11:30:44 -0700 Subject: [PATCH 110/110] Set the blew prebuilt apps to PRESIGNED Keep PixelQualifiedNetworksService platfrom key Other apps are no need to re-sign Bug: 290766628 Change-Id: I7bb05c1f0057a15ff76b14af6a7d6390cf5f1fb0 --- self-extractors_oriole/google_devices/staging/Android.mk | 4 ++-- self-extractors_raven/google_devices/staging/Android.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk index 5ae0f03..835f6e8 100644 --- a/self-extractors_oriole/google_devices/staging/Android.mk +++ b/self-extractors_oriole/google_devices/staging/Android.mk @@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -74,7 +74,7 @@ LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_CERTIFICATE := platform LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice +LOCAL_LICENSE_CONDITIONS := PRESIGNED LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE include $(BUILD_PREBUILT) diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk index f3ad011..d4e1289 100644 --- a/self-extractors_raven/google_devices/staging/Android.mk +++ b/self-extractors_raven/google_devices/staging/Android.mk @@ -56,7 +56,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -72,7 +72,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE @@ -88,7 +88,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := qorvo LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE