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

Commit d16a6906 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

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

am: 3ad62336

Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a
parents eba86e51 3ad62336

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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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);