summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandra Gherghina <alexgherghina@google.com>2014-07-24 12:21:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-23 19:22:09 +0000
commit377b8df3ed89f2e61b6755aee8136754a2edf9c5 (patch)
tree57965158d91d104a612d2ba4a98d1dd75561d300
parent76f5c3bc722b7450870c586bffef1688e96607b7 (diff)
parente82d0f2f8e3a1360c837438a35a03ce7e34db758 (diff)
downloadpackages_apps_Settings-377b8df3ed89f2e61b6755aee8136754a2edf9c5.zip
packages_apps_Settings-377b8df3ed89f2e61b6755aee8136754a2edf9c5.tar.gz
packages_apps_Settings-377b8df3ed89f2e61b6755aee8136754a2edf9c5.tar.bz2
Merge "Checks if the right user has a restriction" into lmp-dev
-rw-r--r--src/com/android/settings/accounts/AccountSyncSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 7bfb6ea..fd35c2e 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -239,7 +239,7 @@ public class AccountSyncSettings extends AccountPreferenceBase {
getString(R.string.sync_menu_sync_cancel))
.setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
- if (!um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+ if (!um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle)) {
MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
getString(R.string.remove_account_label))
.setIcon(R.drawable.ic_menu_delete_holo_dark);