summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/power/PowerManagerService.java
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-08-09 00:05:36 -0400
committerDaniel Sandler <dsandler@android.com>2012-08-09 11:11:33 -0400
commit015b9f45d4cfa1e9764d7fbd6142ee612b2ea628 (patch)
tree0f0cb8bd2437675dface7b994af0fe11951f1a83 /services/java/com/android/server/power/PowerManagerService.java
parenta1300467332e3189e1b7c02af03fd66aac8e79e9 (diff)
downloadframeworks_base-015b9f45d4cfa1e9764d7fbd6142ee612b2ea628.zip
frameworks_base-015b9f45d4cfa1e9764d7fbd6142ee612b2ea628.tar.gz
frameworks_base-015b9f45d4cfa1e9764d7fbd6142ee612b2ea628.tar.bz2
Fix the dock-insertion Dream entry codepath.
Bug: 6956040 Change-Id: I663e13f8a28db13b94d0f5aa4dbcf0cd64ef22fe
Diffstat (limited to 'services/java/com/android/server/power/PowerManagerService.java')
-rw-r--r--services/java/com/android/server/power/PowerManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java
index cb6db3c..1a5f233 100644
--- a/services/java/com/android/server/power/PowerManagerService.java
+++ b/services/java/com/android/server/power/PowerManagerService.java
@@ -426,7 +426,7 @@ public class PowerManagerService extends IPowerManager.Stub
}
// stop the screensaver if we're now unplugged
- if (mPolicy != null) {
+ if (mPolicy != null && wasPowered) {
mPolicy.stopScreenSaver();
}
}