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

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

Merge "Update PowerManager to allow dreaming when postured" into main

parents 3232c75c ff441823

core/java/android/os/PowerManagerInternal.java

+6 −0
Original line number Diff line number Diff line
@@ -351,4 +351,10 @@ public abstract class PowerManagerInternal { 
     * return false if ambient display is not available.

     */

    public abstract boolean isAmbientDisplaySuppressed();



    /**

     * Notifies PowerManager that the device has entered a postured state (stationary + upright).

     * This may affect dream eligibility.

     */

    public abstract void setDevicePostured(boolean isPostured);

}

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

+46 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static android.os.PowerManagerInternal.WAKEFULNESS_DOZING; 
import static android.os.PowerManagerInternal.WAKEFULNESS_DREAMING;

import static android.os.PowerManagerInternal.isInteractive;

import static android.os.PowerManagerInternal.wakefulnessToString;

import static android.service.dreams.Flags.allowDreamWhenPostured;



import static com.android.internal.util.LatencyTracker.ACTION_TURN_ON_SCREEN;

import static com.android.server.deviceidle.Flags.disableWakelocksInLightIdle;
@@ -216,6 +217,8 @@ public final class PowerManagerService extends SystemService 
    private static final int DIRTY_ATTENTIVE = 1 << 14;

    // Dirty bit: display group wakefulness has changed

    private static final int DIRTY_DISPLAY_GROUP_WAKEFULNESS = 1 << 16;

    // Dirty bit: device postured state has changed

    private static final int DIRTY_POSTURED_STATE = 1 << 17;



    // Summarizes the state of all active wakelocks.

    static final int WAKE_LOCK_CPU = 1 << 0;
@@ -500,6 +503,11 @@ public final class PowerManagerService extends SystemService 
    // The current dock state.

    private int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED;



    /**

     * Whether the device is upright and stationary.

     */

    private boolean mDevicePostured;



    // True to decouple auto-suspend mode from the display state.

    private boolean mDecoupleHalAutoSuspendModeFromDisplayConfig;
@@ -530,6 +538,9 @@ public final class PowerManagerService extends SystemService 
    // Default value for dreams activate-on-dock

    private boolean mDreamsActivatedOnDockByDefaultConfig;



    /** Default value for whether dreams are activated when postured (stationary + upright) */

    private boolean mDreamsActivatedWhilePosturedByDefaultConfig;



    // True if dreams can run while not plugged in.

    private boolean mDreamsEnabledOnBatteryConfig;
@@ -558,6 +569,9 @@ public final class PowerManagerService extends SystemService 
    // True if dreams should be activated on dock.

    private boolean mDreamsActivateOnDockSetting;



    /** Whether dreams should be activated when device is postured (stationary and upright) */

    private boolean mDreamsActivateWhilePosturedSetting;



    // True if doze should not be started until after the screen off transition.

    private boolean mDozeAfterScreenOff;
@@ -1471,6 +1485,9 @@ public final class PowerManagerService extends SystemService 
        resolver.registerContentObserver(Settings.Secure.getUriFor(

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK),

                false, mSettingsObserver, UserHandle.USER_ALL);

        resolver.registerContentObserver(Settings.Secure.getUriFor(

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_POSTURED),

                false, mSettingsObserver, UserHandle.USER_ALL);

        resolver.registerContentObserver(Settings.System.getUriFor(

                Settings.System.SCREEN_OFF_TIMEOUT),

                false, mSettingsObserver, UserHandle.USER_ALL);
@@ -1549,6 +1566,8 @@ public final class PowerManagerService extends SystemService 
                com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);

        mDreamsActivatedOnDockByDefaultConfig = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);

        mDreamsActivatedWhilePosturedByDefaultConfig = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsActivatedOnPosturedByDefault);

        mDreamsEnabledOnBatteryConfig = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsEnabledOnBattery);

        mDreamsBatteryLevelMinimumWhenPoweredConfig = resources.getInteger(
@@ -1589,6 +1608,10 @@ public final class PowerManagerService extends SystemService 
                Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK,

                mDreamsActivatedOnDockByDefaultConfig ? 1 : 0,

                UserHandle.USER_CURRENT) != 0);

        mDreamsActivateWhilePosturedSetting = (Settings.Secure.getIntForUser(resolver,

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_POSTURED,

                mDreamsActivatedWhilePosturedByDefaultConfig ? 1 : 0,

                UserHandle.USER_CURRENT) != 0);

        mScreenOffTimeoutSetting = Settings.System.getIntForUser(resolver,

                Settings.System.SCREEN_OFF_TIMEOUT, DEFAULT_SCREEN_OFF_TIMEOUT,

                UserHandle.USER_CURRENT);
@@ -3336,7 +3359,7 @@ public final class PowerManagerService extends SystemService 
        if ((dirty & (DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY | DIRTY_BOOT_COMPLETED

                | DIRTY_WAKEFULNESS | DIRTY_STAY_ON | DIRTY_PROXIMITY_POSITIVE

                | DIRTY_DOCK_STATE | DIRTY_ATTENTIVE | DIRTY_SETTINGS

                | DIRTY_SCREEN_BRIGHTNESS_BOOST)) == 0) {

                | DIRTY_SCREEN_BRIGHTNESS_BOOST | DIRTY_POSTURED_STATE)) == 0) {

            return changed;

        }

        final long time = mClock.uptimeMillis();
@@ -3375,7 +3398,8 @@ public final class PowerManagerService extends SystemService 
    private boolean shouldNapAtBedTimeLocked() {

        return mDreamsActivateOnSleepSetting

                || (mDreamsActivateOnDockSetting

                        && mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED);

                        && mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED)

                || (mDreamsActivateWhilePosturedSetting && mDevicePostured);

    }



    /**
@@ -4489,6 +4513,17 @@ public final class PowerManagerService extends SystemService 
        }

    }



    private void setDevicePosturedInternal(boolean isPostured) {

        if (!allowDreamWhenPostured()) {

            return;

        }

        synchronized (mLock) {

            mDevicePostured = isPostured;

            mDirty |= DIRTY_POSTURED_STATE;

            updatePowerStateLocked();

        }

    }



    private void setUserActivityTimeoutOverrideFromWindowManagerInternal(long timeoutMillis) {

        synchronized (mLock) {

            if (mUserActivityTimeoutOverrideFromWindowManager != timeoutMillis) {
@@ -4794,6 +4829,8 @@ public final class PowerManagerService extends SystemService 
                    + mDreamsActivatedOnSleepByDefaultConfig);

            pw.println("  mDreamsActivatedOnDockByDefaultConfig="

                    + mDreamsActivatedOnDockByDefaultConfig);

            pw.println("  mDreamsActivatedWhilePosturedByDefaultConfig="

                    + mDreamsActivatedWhilePosturedByDefaultConfig);

            pw.println("  mDreamsEnabledOnBatteryConfig="

                    + mDreamsEnabledOnBatteryConfig);

            pw.println("  mDreamsBatteryLevelMinimumWhenPoweredConfig="
@@ -4805,6 +4842,8 @@ public final class PowerManagerService extends SystemService 
            pw.println("  mDreamsEnabledSetting=" + mDreamsEnabledSetting);

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

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

            pw.println("  mDreamsActivateWhilePosturedSetting="

                    + mDreamsActivateWhilePosturedSetting);

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

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

            pw.println("  mMinimumScreenOffTimeoutConfig=" + mMinimumScreenOffTimeoutConfig);
@@ -7388,6 +7427,11 @@ public final class PowerManagerService extends SystemService 
        public boolean isAmbientDisplaySuppressed() {

            return mAmbientDisplaySuppressionController.isSuppressed();

        }



        @Override

        public void setDevicePostured(boolean isPostured) {

            setDevicePosturedInternal(isPostured);

        }

    }



    /**

services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java

+51 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.os.PowerManagerInternal.WAKEFULNESS_ASLEEP; 
import static android.os.PowerManagerInternal.WAKEFULNESS_AWAKE;

import static android.os.PowerManagerInternal.WAKEFULNESS_DOZING;

import static android.os.PowerManagerInternal.WAKEFULNESS_DREAMING;

import static android.service.dreams.Flags.FLAG_ALLOW_DREAM_WHEN_POSTURED;



import static com.android.server.deviceidle.Flags.FLAG_DISABLE_WAKELOCKS_IN_LIGHT_IDLE;
@@ -81,8 +82,8 @@ import android.os.BatterySaverPolicyConfig; 
import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.IWakeLockCallback;

import android.os.IScreenTimeoutPolicyListener;

import android.os.IWakeLockCallback;

import android.os.Looper;

import android.os.PowerManager;

import android.os.PowerManagerInternal;
@@ -120,8 +121,8 @@ import com.android.server.power.PowerManagerService.WakeLock; 
import com.android.server.power.batterysaver.BatterySaverController;

import com.android.server.power.batterysaver.BatterySaverPolicy;

import com.android.server.power.batterysaver.BatterySaverStateMachine;

import com.android.server.power.feature.flags.Flags;

import com.android.server.power.feature.PowerManagerFlags;

import com.android.server.power.feature.flags.Flags;

import com.android.server.testutils.OffsettableClock;



import com.google.testing.junit.testparameterinjector.TestParameter;
@@ -279,6 +280,8 @@ public class PowerManagerServiceTest { 
                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 0);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_POSTURED, 0);



        mClock = new OffsettableClock.Stopped();

        mTestLooper = new TestLooper(mClock::now);
@@ -1215,6 +1218,52 @@ public class PowerManagerServiceTest { 
        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DREAMING);

    }



    @EnableFlags(FLAG_ALLOW_DREAM_WHEN_POSTURED)

    @Test

    public void testDreamActivateWhilePosturedEnabled_postured_afterTimeout_goesToDreaming() {

        when(mBatteryManagerInternalMock.isPowered(anyInt())).thenReturn(true);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_POSTURED, 1);



        doAnswer(inv -> {

            when(mDreamManagerInternalMock.isDreaming()).thenReturn(true);

            return null;

        }).when(mDreamManagerInternalMock).startDream(anyBoolean(), anyString());



        setMinimumScreenOffTimeoutConfig(5);

        createService();

        startSystem();

        mService.getLocalServiceInstance().setDevicePostured(true);



        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE);



        advanceTime(15000);

        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DREAMING);

    }



    @EnableFlags(FLAG_ALLOW_DREAM_WHEN_POSTURED)

    @Test

    public void testDreamActivateWhilePosturedEnabled_notPostured_afterTimeout_goesToDozing() {

        when(mBatteryManagerInternalMock.isPowered(anyInt())).thenReturn(true);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_POSTURED, 1);



        doAnswer(inv -> {

            when(mDreamManagerInternalMock.isDreaming()).thenReturn(true);

            return null;

        }).when(mDreamManagerInternalMock).startDream(anyBoolean(), anyString());



        setMinimumScreenOffTimeoutConfig(5);

        createService();

        startSystem();

        mService.getLocalServiceInstance().setDevicePostured(false);



        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE);



        advanceTime(15000);

        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DOZING);

    }



    @EnableFlags(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER)

    @SuppressWarnings("GuardedBy")

    @Test