From 7e50b12fde200c0ebb5e4a19ffe840e0d0f0682d Mon Sep 17 00:00:00 2001
From: Alexandra Gherghina <alexgherghina@google.com>
Date: Mon, 5 Jan 2015 09:58:14 +0000
Subject: [PATCH] Remove call to deprecated getBackgroundDataSetting()

It seems that the setting is now enforced at the network level (see
NetworkPolicyManagerService).

Bug: 15848128
Change-Id: Ie7d178bab8ebb133f78cb5356ee1c27fbe61ba05
---
 .../android/settings/accounts/AccountSyncSettings.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 858880be97d..382fa3329f4 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);
         }