drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I7b8b6cfb into eclair

Browse Source 
* changes:
  Do not force screen on when undocking from the desk dock.
This commit is contained in:
Android (Google) Code Review
2009-11-11 15:36:18 -08:00
parent 4cb6fc7ed2 1d06992536
commit f1f26bbb2a
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/DockObserver.java
View File

@ -111,8 +111,17 @@ class DockObserver extends UEventObserver {
try { try {
int newState = Integer.parseInt(event.get("SWITCH_STATE")); int newState = Integer.parseInt(event.get("SWITCH_STATE"));
if (newState != mDockState) { if (newState != mDockState) {
int oldState = mDockState;
mDockState = newState; mDockState = newState;
if (mSystemReady) { if (mSystemReady) {
// 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 (oldState != Intent.EXTRA_DOCK_STATE_DESK ||
newState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(),
false, true);
}
update(); update();
} }
} }
@ -166,7 +175,6 @@ class DockObserver extends UEventObserver {
return; return;
} }
// Pack up the values and broadcast them to everyone // Pack up the values and broadcast them to everyone
mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(), false, true);
Intent intent = new Intent(Intent.ACTION_DOCK_EVENT); Intent intent = new Intent(Intent.ACTION_DOCK_EVENT);
intent.putExtra(Intent.EXTRA_DOCK_STATE, mDockState); intent.putExtra(Intent.EXTRA_DOCK_STATE, mDockState);