Enable "Reboot to safe mode" confirmation on GlobalActions

Android N or prior GlobalActions showed "Reboot to safe mode",
when user do long-press of "power off" button on GlobalActions.

Currently, no confirmation dialog is shown. It's not user friendly.
This commit make it enable again.

 - Also dismiss global actions on long press.

Test: manual
Bug: 37333890
Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf
This commit is contained in:
Shunta Sato
2017-04-14 16:01:54 +09:00
committed by Jason Monk
parent e060044217
commit bdb0e494b6
2 changed files with 2 additions and 1 deletions

View File

@@ -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;

View File

@@ -783,7 +783,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);