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

Commit 56bc6d0a authored by Ivan Podogov's avatar Ivan Podogov
Browse files

Avoid changing display power state on draw wake lock 

When Sidekick is controlling the display, any draw wake lock can cause a
sequence of endDisplayControl/setDisplayPowerState/beginDisplayControl
twice, because of DOZE_SUSPEND -> DOZE -> DOZE_SUSPEND transitions.
We can avoid that by telling power manager that display is controlled by
Sidekick, and draw wake locks shouldn't change the display power state.

Bug: 70574675
Test: build, flash Sardine, run Stopwatch, observe logcat
Change-Id: Ie4dac76606e45f0d3b62bc5890841f4f24d454d7
parent be1033fd

core/java/android/os/PowerManagerInternal.java

+8 −0
Original line number Diff line number Diff line
@@ -141,6 +141,14 @@ public abstract class PowerManagerInternal { 
    public abstract void setDozeOverrideFromDreamManager(

            int screenState, int screenBrightness);



    /**

     * Used by sidekick manager to tell the power manager if it shouldn't change the display state

     * when a draw wake lock is acquired. Some processes may grab such a wake lock to do some work

     * in a powered-up state, but we shouldn't give up sidekick control over the display until this

     * override is lifted.

     */

    public abstract void setDrawWakeLockOverrideFromSidekick(boolean keepState);



    public abstract PowerSaveState getLowPowerState(int serviceType);



    public abstract void registerLowPowerModeObserver(LowPowerModeListener listener);

core/proto/android/server/powermanagerservice.proto

+2 −0
Original line number Diff line number Diff line
@@ -315,4 +315,6 @@ message PowerServiceSettingsAndConfigurationDumpProto { 
    optional bool is_double_tap_wake_enabled = 37;

    // True if we are currently in VR Mode.

    optional bool is_vr_mode_enabled = 38;

    // True if Sidekick is controlling the display and we shouldn't change its power mode.

    optional bool draw_wake_lock_override_from_sidekick = 39;

}

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

+25 −1
Original line number Diff line number Diff line
@@ -488,6 +488,9 @@ public final class PowerManagerService extends SystemService 
    // The screen brightness to use while dozing.

    private int mDozeScreenBrightnessOverrideFromDreamManager = PowerManager.BRIGHTNESS_DEFAULT;



    // Keep display state when dozing.

    private boolean mDrawWakeLockOverrideFromSidekick;



    // Time when we last logged a warning about calling userActivity() without permission.

    private long mLastWarningAboutUserActivityPermission = Long.MIN_VALUE;
@@ -2424,7 +2427,8 @@ public final class PowerManagerService extends SystemService 


            if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DOZE) {

                mDisplayPowerRequest.dozeScreenState = mDozeScreenStateOverrideFromDreamManager;

                if ((mWakeLockSummary & WAKE_LOCK_DRAW) != 0) {

                if ((mWakeLockSummary & WAKE_LOCK_DRAW) != 0

                        && !mDrawWakeLockOverrideFromSidekick) {

                    if (mDisplayPowerRequest.dozeScreenState == Display.STATE_DOZE_SUSPEND) {

                        mDisplayPowerRequest.dozeScreenState = Display.STATE_DOZE;

                    }
@@ -3176,6 +3180,16 @@ public final class PowerManagerService extends SystemService 
        }

    }



    private void setDrawWakeLockOverrideFromSidekickInternal(boolean keepState) {

        synchronized (mLock) {

            if (mDrawWakeLockOverrideFromSidekick != keepState) {

                mDrawWakeLockOverrideFromSidekick = keepState;

                mDirty |= DIRTY_SETTINGS;

                updatePowerStateLocked();

            }

        }

    }



    @VisibleForTesting

    void setVrModeEnabled(boolean enabled) {

        mIsVrModeEnabled = enabled;
@@ -3381,6 +3395,7 @@ public final class PowerManagerService extends SystemService 
                    + mUserInactiveOverrideFromWindowManager);

            pw.println("  mDozeScreenStateOverrideFromDreamManager="

                    + mDozeScreenStateOverrideFromDreamManager);

            pw.println("  mDrawWakeLockOverrideFromSidekick=" + mDrawWakeLockOverrideFromSidekick);

            pw.println("  mDozeScreenBrightnessOverrideFromDreamManager="

                    + mDozeScreenBrightnessOverrideFromDreamManager);

            pw.println("  mScreenBrightnessSettingMinimum=" + mScreenBrightnessSettingMinimum);
@@ -3715,6 +3730,10 @@ public final class PowerManagerService extends SystemService 
                    PowerServiceSettingsAndConfigurationDumpProto

                            .DOZE_SCREEN_STATE_OVERRIDE_FROM_DREAM_MANAGER,

                    mDozeScreenStateOverrideFromDreamManager);

            proto.write(

                    PowerServiceSettingsAndConfigurationDumpProto

                            .DRAW_WAKE_LOCK_OVERRIDE_FROM_SIDEKICK,

                    mDrawWakeLockOverrideFromSidekick);

            proto.write(

                    PowerServiceSettingsAndConfigurationDumpProto

                            .DOZED_SCREEN_BRIGHTNESS_OVERRIDE_FROM_DREAM_MANAGER,
@@ -4702,6 +4721,11 @@ public final class PowerManagerService extends SystemService 
            setUserActivityTimeoutOverrideFromWindowManagerInternal(timeoutMillis);

        }



        @Override

        public void setDrawWakeLockOverrideFromSidekick(boolean keepState) {

            setDrawWakeLockOverrideFromSidekickInternal(keepState);

        }



        @Override

        public void setMaximumScreenOffTimeoutFromDeviceAdmin(@UserIdInt int userId, long timeMs) {

            setMaximumScreenOffTimeoutFromDeviceAdminInternal(userId, timeMs);