Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02623128 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp 

Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
parents 360ab1df 1ffd753e

core/java/com/android/internal/app/ShutdownThread.java

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public final class ShutdownThread extends Thread { 
    private static void beginShutdownSequence(Context context) {

        synchronized (sIsStartedGuard) {

            if (sIsStarted) {

                Log.d(TAG, "Request to shutdown already running, returning.");

                Log.d(TAG, "Shutdown sequence already running, returning.");

                return;

            }

            sIsStarted = true;