diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-11-08 17:22:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 17:22:06 -0800 |
| commit | bc0b010ecc7254b0e2c7a0268e5242557579b471 (patch) | |
| tree | 53d3cac867bbd5735b6f2dc7e8f228192bb5bc4d /services | |
| parent | 393e2c1f7aad37e7851643df22e4810996c26d1f (diff) | |
| parent | 1a693182669133c57eda91a4e465e6cd55718f63 (diff) | |
| download | frameworks_base-bc0b010ecc7254b0e2c7a0268e5242557579b471.zip frameworks_base-bc0b010ecc7254b0e2c7a0268e5242557579b471.tar.gz frameworks_base-bc0b010ecc7254b0e2c7a0268e5242557579b471.tar.bz2 | |
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
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); |