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

Commit 394eacf3 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Use current user for lockdown setting" into pi-dev am: 2b9d205f 

am: 23d242fb

Change-Id: I90030c8f0ce9c6e27bd0c857602df50eb478c7aa
parents 4d30c269 23d242fb

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

+2 −2
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            } else if (GLOBAL_ACTION_KEY_SETTINGS.equals(actionKey)) {

                mItems.add(getSettingsAction());

            } else if (GLOBAL_ACTION_KEY_LOCKDOWN.equals(actionKey)) {

                if (Settings.Secure.getInt(mContext.getContentResolver(),

                            Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0) != 0

                if (Settings.Secure.getIntForUser(mContext.getContentResolver(),

                            Settings.Secure.LOCKDOWN_IN_POWER_MENU, 0, getCurrentUser().id) != 0

                        && shouldDisplayLockdown()) {

                    mItems.add(getLockdownAction());

                    mHasLockdownButton = true;