From c67cf56735bc92a2fbc66b93c1c7cefa54752223 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 25 Sep 2012 15:03:20 -0700 Subject: [PATCH] Update references to migrated global settings. Fixed one setting that was migrated but not marked deprecated. Removed a hidden setting that is no longer used by the new power manager service. Bug: 7231172 Change-Id: I332f020f876a18d519a1a20598a172f1c98036f7 --- .../android/server/ConnectivityService.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 9676eb9e8a..ceb17c7bb6 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -701,7 +701,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mNetConfigs[preference].isDefault()) { if (mNetworkPreference != preference) { final ContentResolver cr = mContext.getContentResolver(); - Settings.Secure.putInt(cr, Settings.Secure.NETWORK_PREFERENCE, preference); + Settings.Global.putInt(cr, Settings.Global.NETWORK_PREFERENCE, preference); synchronized(this) { mNetworkPreference = preference; } @@ -724,8 +724,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { private int getPersistedNetworkPreference() { final ContentResolver cr = mContext.getContentResolver(); - final int networkPrefSetting = Settings.Secure - .getInt(cr, Settings.Secure.NETWORK_PREFERENCE, -1); + final int networkPrefSetting = Settings.Global + .getInt(cr, Settings.Global.NETWORK_PREFERENCE, -1); if (networkPrefSetting != -1) { return networkPrefSetting; } @@ -2108,14 +2108,14 @@ public class ConnectivityService extends IConnectivityManager.Stub { final int timeout; if (ConnectivityManager.isNetworkTypeMobile(type)) { - timeout = Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.DATA_ACTIVITY_TIMEOUT_MOBILE, + timeout = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE, 0); // Canonicalize mobile network type type = ConnectivityManager.TYPE_MOBILE; } else if (ConnectivityManager.TYPE_WIFI == type) { - timeout = Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.DATA_ACTIVITY_TIMEOUT_WIFI, + timeout = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI, 0); } else { // do not track any other networks @@ -2930,8 +2930,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { public boolean isTetheringSupported() { enforceTetherAccessPermission(); int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1); - boolean tetherEnabledInSettings = (Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.TETHER_SUPPORTED, defaultVal) != 0); + boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.TETHER_SUPPORTED, defaultVal) != 0); return tetherEnabledInSettings && mTetheringConfigValid; }