diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-23 13:24:19 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-08-23 13:24:19 -0700 |
| commit | 1ffd753ee0cc373965dcc0fe6ef9affdd15035a1 (patch) | |
| tree | e6d40f4e5b1c02b277c3ea79a493e4416315b695 | |
| parent | 6864b3e2f4e67be847b2ae054f2f9c388f115722 (diff) | |
| parent | 8534a8e438ff35511051cf74f8f73d52c8b3b1f4 (diff) | |
| download | frameworks_base-1ffd753ee0cc373965dcc0fe6ef9affdd15035a1.zip frameworks_base-1ffd753ee0cc373965dcc0fe6ef9affdd15035a1.tar.gz frameworks_base-1ffd753ee0cc373965dcc0fe6ef9affdd15035a1.tar.bz2 | |
Merge "Crash when powering off."
| -rw-r--r-- | core/java/com/android/internal/app/ShutdownThread.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ShutdownThread.java b/core/java/com/android/internal/app/ShutdownThread.java index a96253b..e35edc3 100644 --- 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; } |