Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c91b6e61 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix AOD issues with virtual device power states." into main

parents 4f668f25 f0a9d58f

core/java/android/companion/virtual/flags/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -129,6 +129,16 @@ flag { 
    }

}



flag {

    name: "virtual_power_group_sleep_no_doze"

    namespace: "virtual_devices"

    description: "Sleep non-default power groups directly, skipping doze"

    bug: "416220040"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "vdm_settings"

    namespace: "virtual_devices"

services/core/java/com/android/server/power/PowerManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -2269,6 +2269,11 @@ public final class PowerManagerService extends SystemService 
    @GuardedBy("mLock")

    private boolean dozePowerGroupLocked(final PowerGroup powerGroup, long eventTime,

            @GoToSleepReason int reason, int uid) {

        if (powerGroup.getGroupId() != Display.DEFAULT_DISPLAY_GROUP

                && android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()) {

            return sleepPowerGroupLocked(powerGroup, eventTime, reason, uid);

        }



        if (DEBUG_SPEW) {

            Slog.d(TAG, "dozePowerGroup: eventTime=" + eventTime

                    + ", groupId=" + powerGroup.getGroupId()