From 6c97dcf3c7e18d2266edf386bde1d541523b8b5f Mon Sep 17 00:00:00 2001 From: Ashish Sharma Date: Wed, 26 Sep 2012 11:33:50 -0700 Subject: [PATCH] Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global Bug: 7189605 Change-Id: Id54b8d490d7849bf071c3fbfd8f7358ed873a4e8 --- services/java/com/android/server/ConnectivityService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 9676eb9e8a..c8d6459a35 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -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