DockObserver wakes the display when broadcasting a change
- normal display timeout applies after wake
Signed-off-by: Ken Schultz <kschultz@motorola.com>
diff --git a/services/java/com/android/server/DockObserver.java b/services/java/com/android/server/DockObserver.java
index 7385359..30c25e0 100644
--- a/services/java/com/android/server/DockObserver.java
+++ b/services/java/com/android/server/DockObserver.java
@@ -20,6 +20,7 @@
import android.content.Intent;
import android.os.Handler;
import android.os.Message;
+import android.os.SystemClock;
import android.os.UEventObserver;
import android.util.Log;
@@ -41,8 +42,11 @@
private final Context mContext;
- public DockObserver(Context context) {
+ private PowerManagerService mPowerManager;
+
+ public DockObserver(Context context, PowerManagerService pm) {
mContext = context;
+ mPowerManager = pm;
init(); // set initial status
startObserving(DOCK_UEVENT_MATCH);
}
@@ -103,6 +107,7 @@
synchronized (this) {
Log.d(TAG, "Broadcasting dock state " + mDockState);
// Pack up the values and broadcast them to everyone
+ mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(), false, true);
Intent intent = new Intent(Intent.ACTION_DOCK_EVENT);
intent.putExtra(Intent.EXTRA_DOCK_STATE, mDockState);
mContext.sendStickyBroadcast(intent);
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 7c2a7ac..b3b50e5 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -330,7 +330,7 @@
try {
Log.i(TAG, "Dock Observer");
// Listen for dock station changes
- dock = new DockObserver(context);
+ dock = new DockObserver(context, power);
} catch (Throwable e) {
Log.e(TAG, "Failure starting DockObserver", e);
}