Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keep dreaming when undocked when configured to." into tm-qpr-dev am: 01f14d6873

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20141168

Change-Id: Id0f6ef1f2db7c0e31ae5369afc21e98e3f6b6f3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2022-10-17 16:10:46 +00:00
committed by Automerger Merge Worker
parent 3c15a2eb83 01f14d6873
commit 319c0b832c
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -467,6 +467,9 @@ public final class PowerManagerService extends SystemService
// True if the device should wake up when plugged or unplugged.
private boolean mWakeUpWhenPluggedOrUnpluggedConfig;
// True if the device should keep dreaming when undocked.
private boolean mKeepDreamingWhenUndockingConfig;
// True if the device should wake up when plugged or unplugged in theater mode.
private boolean mWakeUpWhenPluggedOrUnpluggedInTheaterModeConfig;
@@ -1374,6 +1377,8 @@ public final class PowerManagerService extends SystemService
com.android.internal.R.bool.config_powerDecoupleInteractiveModeFromDisplay);
mWakeUpWhenPluggedOrUnpluggedConfig = resources.getBoolean(
com.android.internal.R.bool.config_unplugTurnsOnScreen);
mKeepDreamingWhenUndockingConfig = resources.getBoolean(
com.android.internal.R.bool.config_keepDreamingWhenUndocking);
mWakeUpWhenPluggedOrUnpluggedInTheaterModeConfig = resources.getBoolean(
com.android.internal.R.bool.config_allowTheaterModeWakeFromUnplug);
mSuspendWhenScreenOffDueToProximityConfig = resources.getBoolean(
@@ -2487,6 +2492,14 @@ public final class PowerManagerService extends SystemService
return false;
}
// Don't wake when undocking while dreaming if configured not to.
if (mKeepDreamingWhenUndockingConfig
&& getGlobalWakefulnessLocked() == WAKEFULNESS_DREAMING
&& wasPowered && !mIsPowered
&& oldPlugType == BatteryManager.BATTERY_PLUGGED_DOCK) {
return false;
}
// Don't wake when undocked from wireless charger.
// See WirelessChargerDetector for justification.
if (wasPowered && !mIsPowered
@@ -4408,6 +4421,8 @@ public final class PowerManagerService extends SystemService
+ mWakeUpWhenPluggedOrUnpluggedInTheaterModeConfig);
pw.println(" mTheaterModeEnabled="
+ mTheaterModeEnabled);
pw.println(" mKeepDreamingWhenUndockingConfig="
+ mKeepDreamingWhenUndockingConfig);
pw.println(" mSuspendWhenScreenOffDueToProximityConfig="
+ mSuspendWhenScreenOffDueToProximityConfig);
pw.println(" mDreamsSupportedConfig=" + mDreamsSupportedConfig);

25
services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
View File

@@ -612,6 +612,31 @@ public class PowerManagerServiceTest {
assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE);
}
/**
* Tests that dreaming continues when undocking and configured to do so.
*/
@Test
public void testWakefulnessDream_shouldKeepDreamingWhenUndocked() {
createService();
startSystem();
when(mResourcesSpy.getBoolean(
com.android.internal.R.bool.config_keepDreamingWhenUndocking))
.thenReturn(true);
mService.readConfigurationLocked();
when(mBatteryManagerInternalMock.getPlugType())
.thenReturn(BatteryManager.BATTERY_PLUGGED_DOCK);
setPluggedIn(true);
forceAwake(); // Needs to be awake first before it can dream.
forceDream();
when(mBatteryManagerInternalMock.getPlugType()).thenReturn(0);
setPluggedIn(false);
assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DREAMING);
}
@Test
public void testWakefulnessDoze_goToSleep() {
createService();