Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev

2012-08-09 08:17:14 -07:00
parent 634471edc4 015b9f45d4
commit 7c46e4380e
1 changed files with 1 additions and 1 deletions
--- 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();
                    }
                }