am 7c46e438: Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev

* commit '7c46e4380e6c50c30aad80807f87af25f000c7ff': Fix the dock-insertion Dream entry codepath.
2012-08-09 08:19:41 -07:00
parent 8909d0582f 7c46e4380e
commit 9a67ad9f4c
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();
                    }
                }