Merge "Fix DreamBackend to reflect purely the WhenToDream setting." into tm-dev am: 485b25212b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084865 Change-Id: Ib95962edc00d2b7ca5033445ae95bb199beb7695
This commit is contained in:
@@ -248,9 +248,6 @@ public class DreamBackend {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public @WhenToDream int getWhenToDreamSetting() {
|
public @WhenToDream int getWhenToDreamSetting() {
|
||||||
if (!isEnabled()) {
|
|
||||||
return NEVER;
|
|
||||||
}
|
|
||||||
return isActivatedOnDock() && isActivatedOnSleep() ? EITHER
|
return isActivatedOnDock() && isActivatedOnSleep() ? EITHER
|
||||||
: isActivatedOnDock() ? WHILE_DOCKED
|
: isActivatedOnDock() ? WHILE_DOCKED
|
||||||
: isActivatedOnSleep() ? WHILE_CHARGING
|
: isActivatedOnSleep() ? WHILE_CHARGING
|
||||||
|
|||||||
Reference in New Issue
Block a user