| commit | d795827c31a7a8d10fd512476f058e4ac6846ced | [log] [tgz] |
|---|---|---|
| author | Alex Chau <alexchau@google.com> | Fri Dec 08 11:30:52 2017 +0000 |
| committer | Alex Chau <alexchau@google.com> | Fri Dec 08 11:32:23 2017 +0000 |
| tree | 037e843dba25ad616d04b9eff0d96b4fbfe11f8a | |
| parent | a044c1d27e9380d649b6b9dadfb582136be5fa79 [diff] [blame] |
API Review: Drop "Button" in is/setLogoutEnabled method Bug: 70336452 Test: Logout button can still be controlled Change-Id: I2ac24c4dec1ce90a77037a6415b4a6f77e959965
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java index 3b54e11..5c8c3f3 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
@@ -333,7 +333,7 @@ } else if (GLOBAL_ACTION_KEY_RESTART.equals(actionKey)) { mItems.add(new RestartAction()); } else if (GLOBAL_ACTION_KEY_LOGOUT.equals(actionKey)) { - if (mDevicePolicyManager.isLogoutButtonEnabled() + if (mDevicePolicyManager.isLogoutEnabled() && getCurrentUser().id != UserHandle.USER_SYSTEM) { mItems.add(new LogoutAction()); mHasLogoutButton = true;