From 84a893467307eb3178b99a7926dea9c8e21579f1 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 1 Mar 2010 21:28:58 -0500 Subject: [PATCH] Don't poke user activity when unplugging unless screen is already on. Change-Id: I5a5f233541e13b3a916ad0d8b3bf8d6fb49ab7fd BUG: 1317687 Signed-off-by: Mike Lockwood --- services/java/com/android/server/PowerManagerService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index d3efa1222dabc..11b966ee87ef3 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -349,10 +349,14 @@ class PowerManagerService extends IPowerManager.Stub // treat plugging and unplugging the devices as a user activity. // users find it disconcerting when they unplug the device // and it shuts off right away. + // to avoid turning on the screen when unplugging, we only trigger + // user activity when screen was already on. // temporarily set mUserActivityAllowed to true so this will work // even when the keyguard is on. synchronized (mLocks) { - forceUserActivityLocked(); + if (!wasPowered || (mPowerState & SCREEN_ON_BIT) != 0) { + forceUserActivityLocked(); + } } } }