Merge "Crash when powering off."

2010-08-23 13:24:19 -07:00
parent 6864b3e2f4 8534a8e438
commit 1ffd753ee0
1 changed files with 4 additions and 0 deletions
--- a/core/java/com/android/internal/app/ShutdownThread.java
+++ b/core/java/com/android/internal/app/ShutdownThread.java
@@ -133,6 +133,10 @@ public final class ShutdownThread extends Thread {

    private static void beginShutdownSequence(Context context) {
        synchronized (sIsStartedGuard) {
+            if (sIsStarted) {
+                Log.d(TAG, "Shutdown sequence already running, returning.");
+                return;
+            }
            sIsStarted = true;
        }