diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-11-08 14:44:16 -0800 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-11-08 14:45:59 -0800 |
| commit | 1a693182669133c57eda91a4e465e6cd55718f63 (patch) | |
| tree | 9461677f1e612c38e87d2fa2eb61cd410a23469a /services | |
| parent | 650a3e8894c6d26b258d26bdec856fde7aba43d6 (diff) | |
| download | frameworks_base-1a693182669133c57eda91a4e465e6cd55718f63.zip frameworks_base-1a693182669133c57eda91a4e465e6cd55718f63.tar.gz frameworks_base-1a693182669133c57eda91a4e465e6cd55718f63.tar.bz2 | |
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug: 5569662
Change-Id: Ib8cb9fb68a1a2d3520f34f7fbf6f002dfb91809d
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/DockObserver.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/java/com/android/server/DockObserver.java b/services/java/com/android/server/DockObserver.java index dea9007..64789d3 100644 --- a/services/java/com/android/server/DockObserver.java +++ b/services/java/com/android/server/DockObserver.java @@ -82,7 +82,9 @@ class DockObserver extends UEventObserver { // Don't force screen on when undocking from the desk dock. // The change in power state will do this anyway. // FIXME - we should be configurable. - if (mPreviousDockState != Intent.EXTRA_DOCK_STATE_DESK || + if ((mPreviousDockState != Intent.EXTRA_DOCK_STATE_DESK + && mPreviousDockState != Intent.EXTRA_DOCK_STATE_LE_DESK + && mPreviousDockState != Intent.EXTRA_DOCK_STATE_HE_DESK) || mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) { mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(), false, true); |