diff options
| author | Alexandra Gherghina <alexgherghina@google.com> | 2015-01-05 09:58:14 +0000 |
|---|---|---|
| committer | Alexandra Gherghina <alexgherghina@google.com> | 2015-01-06 11:01:50 +0000 |
| commit | 7e50b12fde200c0ebb5e4a19ffe840e0d0f0682d (patch) | |
| tree | 3fa8944d68065d18ab48f77c5c874867936f3ca4 /src/com/android/settings/accounts | |
| parent | c8c82f002d8ed828186393023cbea163cd0914ea (diff) | |
| download | packages_apps_Settings-7e50b12fde200c0ebb5e4a19ffe840e0d0f0682d.zip packages_apps_Settings-7e50b12fde200c0ebb5e4a19ffe840e0d0f0682d.tar.gz packages_apps_Settings-7e50b12fde200c0ebb5e4a19ffe840e0d0f0682d.tar.bz2 | |
Remove call to deprecated getBackgroundDataSetting()
It seems that the setting is now enforced at the network level (see
NetworkPolicyManagerService).
Bug: 15848128
Change-Id: Ie7d178bab8ebb133f78cb5356ee1c27fbe61ba05
Diffstat (limited to 'src/com/android/settings/accounts')
| -rw-r--r-- | src/com/android/settings/accounts/AccountSyncSettings.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 858880b..382fa33 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -34,7 +34,6 @@ import android.content.SyncAdapterType; import android.content.SyncInfo; import android.content.SyncStatusInfo; import android.content.pm.ProviderInfo; -import android.net.ConnectivityManager; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -440,12 +439,8 @@ public class AccountSyncSettings extends AccountPreferenceBase { !initialSync); syncPref.setFailed(lastSyncFailed); - ConnectivityManager connManager = - (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); - final boolean masterSyncAutomatically = - ContentResolver.getMasterSyncAutomaticallyAsUser(userId); - final boolean backgroundDataEnabled = connManager.getBackgroundDataSetting(); - final boolean oneTimeSyncMode = !masterSyncAutomatically || !backgroundDataEnabled; + final boolean oneTimeSyncMode = !ContentResolver.getMasterSyncAutomaticallyAsUser( + userId); syncPref.setOneTimeSyncMode(oneTimeSyncMode); syncPref.setChecked(oneTimeSyncMode || syncEnabled); } |