diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2014-07-01 15:24:45 +0100 |
|---|---|---|
| committer | Alexandra Gherghina <alexgherghina@google.com> | 2014-07-01 16:03:06 +0100 |
| commit | 024ba5e4d9d97afe01677de46a00b8574de509d5 (patch) | |
| tree | 5590d059d0fe1ab8628e8ade631ecfd9cb889539 /src/com/android/settings/accounts | |
| parent | 1eb3f316bd20c5d3e816876229c05bcf9f0c712c (diff) | |
| download | packages_apps_Settings-024ba5e4d9d97afe01677de46a00b8574de509d5.tar.gz packages_apps_Settings-024ba5e4d9d97afe01677de46a00b8574de509d5.tar.bz2 packages_apps_Settings-024ba5e4d9d97afe01677de46a00b8574de509d5.zip | |
Adds missing per-user calls for displaying and syncing accounts
Bug: 15466880
Change-Id: Ifa96af782adc8485f925dc45d5c71b1c28a075d2
Diffstat (limited to 'src/com/android/settings/accounts')
| -rw-r--r-- | src/com/android/settings/accounts/AccountSyncSettings.java | 8 | ||||
| -rw-r--r-- | src/com/android/settings/accounts/AuthenticatorHelper.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index a9e43c731..77b1124f7 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -284,7 +284,9 @@ public class AccountSyncSettings extends AccountPreferenceBase { SyncStateCheckBoxPreference syncPref = (SyncStateCheckBoxPreference) preference; String authority = syncPref.getAuthority(); Account account = syncPref.getAccount(); - boolean syncAutomatically = ContentResolver.getSyncAutomatically(account, authority); + final int userId = mUserHandle.getIdentifier(); + boolean syncAutomatically = ContentResolver.getSyncAutomaticallyAsUser(account, + authority, userId); if (syncPref.isOneTimeSyncMode()) { requestOrCancelSync(account, authority, true); } else { @@ -292,11 +294,11 @@ public class AccountSyncSettings extends AccountPreferenceBase { boolean oldSyncState = syncAutomatically; if (syncOn != oldSyncState) { // if we're enabling sync, this will request a sync as well - ContentResolver.setSyncAutomatically(account, authority, syncOn); + ContentResolver.setSyncAutomaticallyAsUser(account, authority, syncOn, userId); // if the master sync switch is off, the request above will // get dropped. when the user clicks on this toggle, // we want to force the sync, however. - if (!ContentResolver.getMasterSyncAutomatically() || !syncOn) { + if (!ContentResolver.getMasterSyncAutomaticallyAsUser(userId) || !syncOn) { requestOrCancelSync(account, authority, syncOn); } } diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java index 0ecf43826..1d7947915 100644 --- a/src/com/android/settings/accounts/AuthenticatorHelper.java +++ b/src/com/android/settings/accounts/AuthenticatorHelper.java @@ -174,7 +174,7 @@ final public class AuthenticatorHelper extends BroadcastReceiver { // See http://b/15819268 updateAuthDescriptions(mContext); if (accounts == null) { - accounts = AccountManager.get(mContext).getAccounts(); + accounts = AccountManager.get(mContext).getAccountsAsUser(mUserHandle.getIdentifier()); } mEnabledAccountTypes.clear(); mAccTypeIconCache.clear(); |