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

Commit 365ce56b authored by Eddie Ringle's avatar Eddie Ringle
Browse files

Fix Reboot dialog to set mReboot to false upon cancellation. 

Originally brought up here:
https://github.com/CyanogenMod/android_frameworks_base/commit/c61b11cb36800fe1b2dcaba120c356aecd5ee103#commitcomment-242278



Change-Id: Ibaac881c2c32c488ee65307a046c9f7841441e40
Signed-off-by: default avatarEddie Ringle <eddie.ringle@gmail.com>
parent 833984d5

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

+19 −14
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public final class ShutdownThread extends Thread { 
    private static Object sIsStartedGuard = new Object();

    private static boolean sIsStarted = false;



    private static boolean mReboot;

    private boolean mReboot;

    private static String mRebootReason;



    // Provides shutdown assurance in case the system_server is killed
@@ -127,6 +127,11 @@ public final class ShutdownThread extends Thread { 
                                dialog.cancel();

                            }

                        })

                        .setOnCancelListener(new DialogInterface.OnCancelListener() {

                            public void onCancel(DialogInterface dialog) {

                                mReboot = false;

                            }

                        })

                        .create();

            } else {

                dialog = new AlertDialog.Builder(context)