Merge "Use current user for lockdown setting" into pi-dev (2b9d205f) · Commits · e / os / android_frameworks_base

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;