Snap for 9075788 from 84b74fe406
to udc-release
Change-Id: I06734dd6c95c54ca53709c6c4f2dbda0b7a82d45
This commit is contained in:
commit
ea6f12c6f4
4 changed files with 75 additions and 38 deletions
|
@ -188,9 +188,9 @@
|
|||
<string name="config_dozeUdfpsLongPressSensorType" translatable="false">com.google.sensor.long_press</string>
|
||||
|
||||
<!-- MMS user agent string -->
|
||||
<string name="config_mms_user_agent" translatable="false">gb7n6</string>
|
||||
<string name="config_mms_user_agent" translatable="false">g9fpl</string>
|
||||
<!-- MMS user agent profile url -->
|
||||
<string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/GB7N6.xml</string>
|
||||
<string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G9FPL.xml</string>
|
||||
|
||||
<!-- Type of the quick pickup sensor. Empty if quick pickup is not supported. -->
|
||||
<string name="config_quickPickupSensorType" translatable="false">com.google.sensor.quick_pickup</string>
|
||||
|
|
|
@ -89,5 +89,48 @@
|
|||
<string translatable="false" name="config_cameraProtectionExcludedPackages">com.google.android.as</string>
|
||||
|
||||
<bool name="config_enableDisplayCutoutProtection">true</bool>
|
||||
|
||||
<!-- Type of a sensor that provides a low-power estimate of the desired display
|
||||
brightness, suitable to listen to while the device is asleep (e.g. during
|
||||
always-on display) -->
|
||||
<string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
|
||||
|
||||
<!-- Doze: can we assume the pickup sensor includes a proximity check? -->
|
||||
<bool name="doze_pickup_performs_proximity_check">true</bool>
|
||||
|
||||
<!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
|
||||
<bool name="doze_double_tap_reports_touch_coordinates">true</bool>
|
||||
|
||||
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
|
||||
to brightness values; -1 means keeping the current brightness. -->
|
||||
<integer-array name="config_doze_brightness_sensor_to_brightness">
|
||||
<item>-1</item> <!-- 0: OFF -->
|
||||
<item>3</item> <!-- 1: NIGHT -->
|
||||
<item>3</item> <!-- 2: LOW -->
|
||||
<item>13</item> <!-- 3: HIGH -->
|
||||
<item>13</item> <!-- 4: SUN -->
|
||||
</integer-array>
|
||||
|
||||
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
|
||||
to an opacity value for a black scrim that is overlaid in AOD1.
|
||||
Valid range is from 0 (transparent) to 255 (opaque).
|
||||
-1 means keeping the current opacity. -->
|
||||
<integer-array name="config_doze_brightness_sensor_to_scrim_opacity">
|
||||
<item>-1</item> <!-- 0: OFF -->
|
||||
<item>133</item> <!-- 1: NIGHT -->
|
||||
<item>0</item> <!-- 2: LOW -->
|
||||
<item>0</item> <!-- 3: HIGH -->
|
||||
<item>0</item> <!-- 4: SUN -->
|
||||
</integer-array>
|
||||
|
||||
<!-- Doze: Name of a sensor per posture state that provides a low-power estimate of the desired
|
||||
display brightness, suitable to listen to while the device is asleep (e.g. during
|
||||
always-on display) -->
|
||||
<string-array name="doze_brightness_sensor_name_posture_mapping" translatable="false">
|
||||
<item></item> <!-- UNKNOWN -->
|
||||
<item>Binned Brightness 1 (wake-up)</item> <!-- CLOSED -->
|
||||
<item>Binned Brightness 0 (wake-up)</item> <!-- HALF_OPENED -->
|
||||
<item>Binned Brightness 0 (wake-up)</item> <!-- OPENED -->
|
||||
</string-array>
|
||||
</resources>
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -34,36 +34,42 @@ using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider;
|
|||
using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
|
||||
|
||||
void addDisplay(std::shared_ptr<PowerStats> p) {
|
||||
// Add display residency stats
|
||||
std::vector<std::string> states = {
|
||||
// Add display residency stats for inner display
|
||||
std::vector<std::string> 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<DisplayStateResidencyDataProvider>(
|
||||
"Display",
|
||||
"Inner Display",
|
||||
"/sys/class/backlight/panel0-backlight/state",
|
||||
states));
|
||||
inner_states));
|
||||
|
||||
// Add display residency stats for outer display
|
||||
std::vector<std::string> 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<DisplayStateResidencyDataProvider>(
|
||||
"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<PowerStats> p) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue