Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev am: 3ad6233685

am: d16a69069a

Change-Id: I9c49b78fe8ac16bf56c88cd373e8ff51f9581e59

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

@@ -339,6 +339,7 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, DialogIn
                     long id) {
                 final Action action = mAdapter.getItem(position);
                 if (action instanceof LongPressAction) {
+                    mDialog.dismiss();
                     return ((LongPressAction) action).onLongPress();
                 }
                 return false;

services/core/java/com/android/server/statusbar/StatusBarManagerService.java

@@ -795,7 +795,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
             mHandler.post(() -> {
                 // ShutdownThread displays UI, so give it a UI context.
                 if (safeMode) {
-                    ShutdownThread.rebootSafeMode(getUiContext(), false);
+                    ShutdownThread.rebootSafeMode(getUiContext(), true);
                 } else {
                     ShutdownThread.reboot(getUiContext(),
                             PowerManager.SHUTDOWN_USER_REQUESTED, false);