Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid starting multiple threads in ShutdownThread" into gingerbread

Browse Source
This commit is contained in:
Mike Lockwood
2010-07-26 08:11:54 -07:00
committed by Android (Google) Code Review
parent 739bf285be d67b236497
commit 70736a6d92
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ShutdownThread.java
View File

@@ -84,7 +84,7 @@ public final class ShutdownThread extends Thread {
public static void shutdown(final Context context, boolean confirm) { public static void shutdown(final Context context, boolean confirm) {
// ensure that only one thread is trying to power down. // ensure that only one thread is trying to power down.
// any additional calls are just returned // any additional calls are just returned
synchronized (sIsStartedGuard){ synchronized (sIsStartedGuard) {
if (sIsStarted) { if (sIsStarted) {
Log.d(TAG, "Request to shutdown already running, returning."); Log.d(TAG, "Request to shutdown already running, returning.");
return; return;
@@ -133,6 +133,10 @@ public final class ShutdownThread extends Thread {
private static void beginShutdownSequence(Context context) { private static void beginShutdownSequence(Context context) {
synchronized (sIsStartedGuard) { synchronized (sIsStartedGuard) {
if (sIsStarted) {
Log.d(TAG, "Request to shutdown already running, returning.");
return;
}
sIsStarted = true; sIsStarted = true;
} }