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

Commit 098e58da authored by Mike Lockwood's avatar Mike Lockwood
Browse files

Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 



This avoids problems if the time is reset while shutting down.

Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 3c78a1b5

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

+4 −4
Original line number Diff line number Diff line
@@ -199,10 +199,10 @@ public final class ShutdownThread extends Thread { 
        mContext.sendOrderedBroadcast(new Intent(Intent.ACTION_SHUTDOWN), null,

                br, mHandler, 0, null, null);

        

        final long endTime = System.currentTimeMillis() + MAX_BROADCAST_TIME;

        final long endTime = SystemClock.elapsedRealtime() + MAX_BROADCAST_TIME;

        synchronized (mActionDoneSync) {

            while (!mActionDone) {

                long delay = endTime - System.currentTimeMillis();

                long delay = endTime - SystemClock.elapsedRealtime();

                if (delay <= 0) {

                    Log.w(TAG, "Shutdown broadcast timed out");

                    break;
@@ -297,7 +297,7 @@ public final class ShutdownThread extends Thread { 
        Log.i(TAG, "Shutting down MountService");

        // Set initial variables and time out time.

        mActionDone = false;

        final long endShutTime = System.currentTimeMillis() + MAX_SHUTDOWN_WAIT_TIME;

        final long endShutTime = SystemClock.elapsedRealtime() + MAX_SHUTDOWN_WAIT_TIME;

        synchronized (mActionDoneSync) {

            try {

                if (mount != null) {
@@ -309,7 +309,7 @@ public final class ShutdownThread extends Thread { 
                Log.e(TAG, "Exception during MountService shutdown", e);

            }

            while (!mActionDone) {

                long delay = endShutTime - System.currentTimeMillis();

                long delay = endShutTime - SystemClock.elapsedRealtime();

                if (delay <= 0) {

                    Log.w(TAG, "Shutdown wait timed out");

                    break;