From 40fbaa1786f7c63a22451146a6f8e2fcdfaeeb53 Mon Sep 17 00:00:00 2001 From: Gil Date: Tue, 30 Aug 2022 19:03:41 +0800 Subject: [PATCH 1/5] config: update autobrightness table Bug: 234327304 Test: adb shell dumpsys display Change-Id: I77583b834fc5e861ce4b5db6e1962677f41d68a8 Signed-off-by: Gil --- .../base/core/res/res/values/config.xml | 52 +++++++++++-------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml index c10d1cd..6f7bcda 100644 --- a/felix/overlay/frameworks/base/core/res/res/values/config.xml +++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml @@ -115,6 +115,7 @@ 4 8 12 + 15 20 33 55 @@ -125,9 +126,11 @@ 665 1097 1808 - 2981 - 5000 + 3000 + 6000 + 9000 10000 + 14000 20000 @@ -145,27 +148,30 @@ array. The brightness values must be non-negative and non-decreasing. This must be overridden in platform specific overlays --> - 5.139055 - 9.962018965 - 18.34822964 - 21.55068128 - 24.0167788 - 30.62162162 - 35.09486396 - 41.2249643 - 47.6760716 - 55.73002427 - 66.24126116 - 79.67614115 - 98.04727274 - 125.1221991 - 161.6875093 - 208.4885553 - 264.8221315 - 327.8974352 - 401.1676739 - 750.0 - 900.0 + 5.139055 + 9.962018965 + 18.34822964 + 21.55068128 + 24.0167788 + 32.5 + 46 + 53.26923077 + 54.61538462 + 58.11538462 + 62.1394 + 67.13133333 + 79.67614115 + 98.04727274 + 125.1221991 + 161.6875093 + 208.4885553 + 264.8221315 + 328.5869521 + 627.4315413 + 826.8584866 + 867.0494638 + 901.4496943 + 1100.0 + com.google.sensor.binned_brightness + + + true + + + true + + + + -1 + 3 + 3 + 13 + 13 + + + + + -1 + 133 + 0 + 0 + 0 + + + + + + Binned Brightness 1 (wake-up) + Binned Brightness 0 (wake-up) + Binned Brightness 0 (wake-up) + From 18f271ab61a7c9677e17b72c7c1be816bd68b263 Mon Sep 17 00:00:00 2001 From: Gary Jian Date: Wed, 14 Sep 2022 11:41:51 +0800 Subject: [PATCH 3/5] Correct MMS UA, UAProf for F10 Bug: 239520846 Test: make Change-Id: Id42f8cffef9997e79ce602e32440fb07fc65338b --- felix/overlay/frameworks/base/core/res/res/values/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/felix/overlay/frameworks/base/core/res/res/values/config.xml b/felix/overlay/frameworks/base/core/res/res/values/config.xml index d0178aa..d52aeb9 100644 --- a/felix/overlay/frameworks/base/core/res/res/values/config.xml +++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml @@ -180,9 +180,9 @@ com.google.sensor.long_press - gb7n6 + g9fpl - http://www.gstatic.com/android/sms/GB7N6.xml + http://www.gstatic.com/android/sms/G9FPL.xml com.google.sensor.quick_pickup From f60da16f48411e945facafeed8806a0c9f650d1b Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 15 Sep 2022 22:19:30 +0800 Subject: [PATCH 4/5] Remove frequency boost of big cores for FACE_UNLOCK Bug: 245619770 Test: build Change-Id: I248dda87480b9b6ee082abd3500eabc986182632 --- powerhint.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/powerhint.json b/powerhint.json index b62f2e8..bf0b0f4 100644 --- a/powerhint.json +++ b/powerhint.json @@ -1840,18 +1840,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", From eb0c0f817300bcc3ef793651f380b9b0f4f1f014 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 15 Sep 2022 16:17:17 +0800 Subject: [PATCH 5/5] powerstats: update display state residency and energy consumer Bug: 232051653 Bug: 232051289 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I1392ca757575b3f79735b7c4b3d84a00e925c06a Signed-off-by: Darren Hsu --- powerstats/felix/service.cpp | 54 ++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/powerstats/felix/service.cpp b/powerstats/felix/service.cpp index a7b0824..d20effd 100644 --- a/powerstats/felix/service.cpp +++ b/powerstats/felix/service.cpp @@ -34,36 +34,42 @@ using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; void addDisplay(std::shared_ptr p) { - // Add display residency stats - std::vector states = { + // Add display residency stats for inner display + std::vector inner_states = { "Off", - "LP: 1440x3120@1", - "LP: 1440x3120@10", - "LP: 1440x3120@30", - "On: 1440x3120@60", - "On: 1440x3120@90", - "On: 1440x3120@120", - "HBM: 1440x3120@60", - "HBM: 1440x3120@90", - "HBM: 1440x3120@120"}; + "LP: 1840x2208@30", + "On: 1840x2208@10", + "On: 1840x2208@60", + "On: 1840x2208@120", + "HBM: 1840x2208@60", + "HBM: 1840x2208@120"}; p->addStateResidencyDataProvider(std::make_unique( - "Display", + "Inner Display", "/sys/class/backlight/panel0-backlight/state", - states)); + inner_states)); + + // Add display residency stats for outer display + std::vector outer_states = { + "Off", + "LP: 1080x2092@30", + "On: 1080x2092@10", + "On: 1080x2092@60", + "On: 1080x2092@120", + "HBM: 1080x2092@60", + "HBM: 1080x2092@120"}; + + p->addStateResidencyDataProvider(std::make_unique( + "Outer Display", + "/sys/class/backlight/panel1-backlight/state", + outer_states)); // Add display energy consumer - p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndEntityConsumer( - p, EnergyConsumerType::DISPLAY, "display", {"PPVAR_VSYS_PWR_DISP"}, "Display", - {{"LP: 1440x3120@1", 1}, - {"LP: 1440x3120@10", 2}, - {"LP: 1440x3120@30", 3}, - {"On: 1440x3120@60", 4}, - {"On: 1440x3120@90", 5}, - {"On: 1440x3120@120", 6}, - {"HBM: 1440x3120@60", 7}, - {"HBM: 1440x3120@90", 8}, - {"HBM: 1440x3120@120", 9}})); + p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterConsumer( + p, + EnergyConsumerType::DISPLAY, + "Display", + {"VSYS_PWR_DISPLAY"}));// VSYS_PWR_DISPLAY = inner + outer } void addUwb(std::shared_ptr p) {