From c868b645b46685574955eaff9f8d46d9262a3357 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 12 Sep 2012 17:41:04 -0700 Subject: [PATCH] Moved a few telephony settings from Secure to Global Also tidy up the bookkeeping for a few settings that were earlier moved to Global without the redirect tables being fixed up. Change-Id: I69275db3b2636cd6ba9c8c51b88e97d8ba4b7b7d --- core/java/android/provider/Settings.java | 52 +++++++++++++++---- .../providers/settings/DatabaseHelper.java | 19 ++++++- .../providers/settings/SettingsProvider.java | 6 +++ 3 files changed, 65 insertions(+), 12 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 17392057a68c7..9ea523de71917 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2616,6 +2616,12 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED); MOVED_TO_GLOBAL.add(Settings.Global.WIFI_WATCHDOG_RSSI_FETCH_INTERVAL_MS); MOVED_TO_GLOBAL.add(Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON); + MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_ENABLE); + MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_TIMEOUT); + MOVED_TO_GLOBAL.add(Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE); + MOVED_TO_GLOBAL.add(Settings.Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS); + MOVED_TO_GLOBAL.add(Settings.Global.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS); + MOVED_TO_GLOBAL.add(Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS); MOVED_TO_GLOBAL.add(Settings.Global.WTF_IS_FATAL); } @@ -4254,30 +4260,28 @@ public final class Settings { Global.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT; /** - * The number of milliseconds to delay when checking for data stalls during - * non-aggressive detection. (screen is turned off.) + * @deprecated Moved to Settings.Global * @hide */ + @Deprecated public static final String DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS = - "data_stall_alarm_non_aggressive_delay_in_ms"; + Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS; /** - * The number of milliseconds to delay when checking for data stalls during - * aggressive detection. (screen on or suspected data stall) + * @deprecated Moved to Settings.Global * @hide */ + @Deprecated public static final String DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS = - "data_stall_alarm_aggressive_delay_in_ms"; + Global.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS; /** - * The interval in milliseconds at which to check gprs registration - * after the first registration mismatch of gprs and voice service, - * to detect possible data network registration problems. - * + * @deprecated Moved to Settings.Global * @hide */ + @Deprecated public static final String GPRS_REGISTER_CHECK_PERIOD_MS = - "gprs_register_check_period_ms"; + Global.GPRS_REGISTER_CHECK_PERIOD_MS; /** * @deprecated Use {@link android.provider.Settings.Global#NITZ_UPDATE_SPACING} instead @@ -5603,6 +5607,32 @@ public final class Settings { */ public static final String WIFI_P2P_DEVICE_NAME = "wifi_p2p_device_name"; + /** + * The number of milliseconds to delay when checking for data stalls during + * non-aggressive detection. (screen is turned off.) + * @hide + */ + public static final String DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS = + "data_stall_alarm_non_aggressive_delay_in_ms"; + + /** + * The number of milliseconds to delay when checking for data stalls during + * aggressive detection. (screen on or suspected data stall) + * @hide + */ + public static final String DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS = + "data_stall_alarm_aggressive_delay_in_ms"; + + /** + * The interval in milliseconds at which to check gprs registration + * after the first registration mismatch of gprs and voice service, + * to detect possible data network registration problems. + * + * @hide + */ + public static final String GPRS_REGISTER_CHECK_PERIOD_MS = + "gprs_register_check_period_ms"; + /** * Nonzero causes Log.wtf() to crash. * @hide diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 05673c3576c5c..23b4b59a3f820 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -67,7 +67,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion' // is properly propagated through your change. Not doing so will result in a loss of user // settings. - private static final int DATABASE_VERSION = 87; + private static final int DATABASE_VERSION = 88; private Context mContext; private int mUserHandle; @@ -1305,6 +1305,23 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 87; } + if (upgradeVersion == 87) { + db.beginTransaction(); + try { + String[] settingsToMove = { + Settings.Secure.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS, + Settings.Secure.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS, + Settings.Secure.GPRS_REGISTER_CHECK_PERIOD_MS + }; + moveSettingsToNewTable(db, TABLE_SECURE, TABLE_GLOBAL, settingsToMove, true); + + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + upgradeVersion = 88; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 523b95edc3a02..e1a5b52510f73 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -195,6 +195,12 @@ public class SettingsProvider extends ContentProvider { sSecureGlobalKeys.add(Settings.Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED); sSecureGlobalKeys.add(Settings.Secure.WIFI_WATCHDOG_RSSI_FETCH_INTERVAL_MS); sSecureGlobalKeys.add(Settings.Secure.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON); + sSecureGlobalKeys.add(Settings.Secure.PACKAGE_VERIFIER_ENABLE); + sSecureGlobalKeys.add(Settings.Secure.PACKAGE_VERIFIER_TIMEOUT); + sSecureGlobalKeys.add(Settings.Secure.PACKAGE_VERIFIER_DEFAULT_RESPONSE); + sSecureGlobalKeys.add(Settings.Secure.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS); + sSecureGlobalKeys.add(Settings.Secure.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS); + sSecureGlobalKeys.add(Settings.Secure.GPRS_REGISTER_CHECK_PERIOD_MS); sSecureGlobalKeys.add(Settings.Secure.WTF_IS_FATAL); // Keys from the 'system' table now moved to 'global'