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

Commit 78da7afa authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "framework: Prevent the reboot option from popping up when it's not... 

Merge "framework: Prevent the reboot option from popping up when it's not supposed to." into gingerbread
parents 5d1f40e1 c61b11cb

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

+7 −2
Original line number Diff line number Diff line
@@ -121,7 +121,12 @@ public final class ShutdownThread extends Thread { 
                                beginShutdownSequence(context);

                            }

                        })

                        .setNegativeButton(com.android.internal.R.string.no, null)

                        .setNegativeButton(com.android.internal.R.string.yes, new DialogInterface.OnClickListener() {

                            public void onClick(DialogInterface dialog, int which) {

                                mReboot = false;

                                dialog.cancel();

                            }

                        })

                        .create();

            } else {

                dialog = new AlertDialog.Builder(context)