| commit | d16a69069ada754a29bb91989a5d88ae236041e9 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jun 28 18:13:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 28 18:13:35 2017 +0000 |
| tree | 68f4866bb7d72259b96f1d939f0834c2c5b3c905 | |
| parent | eba86e51474e9d75fc21dc7e75d663a53dd5094c [diff] | |
| parent | 3ad62336852606f205bb345e3ef5e32e54a91e9d [diff] |
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev am: 3ad6233685 Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 80a6418..1a8a474 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -339,6 +339,7 @@ long id) { final Action action = mAdapter.getItem(position); if (action instanceof LongPressAction) { + mDialog.dismiss(); return ((LongPressAction) action).onLongPress(); } return false;
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java index 32871bb..984b40f 100644 --- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java +++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -783,7 +783,7 @@ 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);