Snap for 11314147 from 006ee1ee66 to 24Q2-release

Change-Id: I1b80ebc1756d46316ab391530dd3f4858c081d54
This commit is contained in:
Android Build Coastguard Worker 2024-01-16 00:03:43 +00:00
commit f8d0ad625d
4 changed files with 18 additions and 2 deletions

View file

@ -842,6 +842,14 @@
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-headset">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> usb">
<ctl name="USB_RX Mixer IMSV" value="1" />
</path>

View file

@ -842,6 +842,14 @@
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-headset">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> usb">
<ctl name="USB_RX Mixer IMSV" value="1" />
</path>

View file

@ -35,7 +35,7 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats
struct stat buffer;
if (stat("/sys/class/backlight/panel0-backlight/time_in_state", &buffer)) {
if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state doesn't exist
std::vector<std::string> states = {
"Off",

View file

@ -35,7 +35,7 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
void addDisplay(std::shared_ptr<PowerStats> p) {
// Add display residency stats
struct stat buffer;
if (stat("/sys/class/backlight/panel0-backlight/time_in_state", &buffer)) {
if (stat("/sys/class/drm/card0/device/primary-panel/time_in_state", &buffer)) {
// time_in_state doesn't exist
std::vector<std::string> states = {
"Off",