diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-11-16 04:09:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-11-16 04:09:38 +0000 |
| commit | f86b4b49740401c1e9be777df39ef243a3ff08df (patch) | |
| tree | 6b9ea893e329b00d9fe53b73e985a9cf473a41b7 /core/java | |
| parent | fc080b570b41df2cd5df40b3bf63bced7f1b9f48 (diff) | |
| parent | 4f7ca41f6f2d9b2fc8a306e4a28da25ecfbec8d9 (diff) | |
Merge "Go to sleep on fold for foldable devices."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/display/DisplayManagerInternal.java | 7 | ||||
| -rw-r--r-- | core/java/android/os/PowerManager.java | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/core/java/android/hardware/display/DisplayManagerInternal.java b/core/java/android/hardware/display/DisplayManagerInternal.java index 5bb51c19342d..fd34fa4c9c7f 100644 --- a/core/java/android/hardware/display/DisplayManagerInternal.java +++ b/core/java/android/hardware/display/DisplayManagerInternal.java @@ -372,6 +372,13 @@ public abstract class DisplayManagerInternal { public abstract Point getDisplaySurfaceDefaultSize(int displayId); /** + * Receives early interactivity changes from power manager. + * + * @param interactive The interactive state that the device is moving into. + */ + public abstract void onEarlyInteractivityChange(boolean interactive); + + /** * Describes the requested power state of the display. * * This object is intended to describe the general characteristics of the diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 753f3498a209..74fffd0ae10d 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -440,9 +440,15 @@ public final class PowerManager { public static final int GO_TO_SLEEP_REASON_DISPLAY_GROUPS_TURNED_OFF = 12; /** + * Go to sleep reason code: A foldable device has been folded. * @hide */ - public static final int GO_TO_SLEEP_REASON_MAX = GO_TO_SLEEP_REASON_DISPLAY_GROUPS_TURNED_OFF; + public static final int GO_TO_SLEEP_REASON_DEVICE_FOLD = 13; + + /** + * @hide + */ + public static final int GO_TO_SLEEP_REASON_MAX = GO_TO_SLEEP_REASON_DEVICE_FOLD; /** * @hide @@ -461,6 +467,7 @@ public final class PowerManager { case GO_TO_SLEEP_REASON_INATTENTIVE: return "inattentive"; case GO_TO_SLEEP_REASON_DISPLAY_GROUP_REMOVED: return "display_group_removed"; case GO_TO_SLEEP_REASON_DISPLAY_GROUPS_TURNED_OFF: return "display_groups_turned_off"; + case GO_TO_SLEEP_REASON_DEVICE_FOLD: return "device_folded"; default: return Integer.toString(sleepReason); } } @@ -568,7 +575,8 @@ public final class PowerManager { GO_TO_SLEEP_REASON_ACCESSIBILITY, GO_TO_SLEEP_REASON_FORCE_SUSPEND, GO_TO_SLEEP_REASON_INATTENTIVE, - GO_TO_SLEEP_REASON_QUIESCENT + GO_TO_SLEEP_REASON_QUIESCENT, + GO_TO_SLEEP_REASON_DEVICE_FOLD }) @Retention(RetentionPolicy.SOURCE) public @interface GoToSleepReason{} |