Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev

Browse Source 
am: 3ad6233685

Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a
This commit is contained in:
Jason Monk
2017-06-28 18:13:35 +00:00
committed by android-build-merger
parent eba86e5147 3ad6233685
commit d16a69069a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

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

2
services/core/java/com/android/server/statusbar/StatusBarManagerService.java
View File

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