First step towards cleaning up Global settings.
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index ceb17c7..891cac7 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1509,8 +1509,8 @@
// which is where we store the value and maybe make this
// asynchronous.
enforceAccessPermission();
- boolean retVal = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.MOBILE_DATA, 1) == 1;
+ boolean retVal = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.MOBILE_DATA, 1) == 1;
if (VDBG) log("getMobileDataEnabled returning " + retVal);
return retVal;
}
diff --git a/services/java/com/android/server/ThrottleService.java b/services/java/com/android/server/ThrottleService.java
index f36d73a..75eb3c4 100644
--- a/services/java/com/android/server/ThrottleService.java
+++ b/services/java/com/android/server/ThrottleService.java
@@ -211,20 +211,20 @@
void register(Context context) {
ContentResolver resolver = context.getContentResolver();
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_POLLING_SEC), false, this);
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_THRESHOLD_BYTES), false, this);
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_VALUE_KBITSPS), false, this);
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_RESET_DAY), false, this);
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_NOTIFICATION_TYPE), false, this);
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_HELP_URI), false, this);
- resolver.registerContentObserver(Settings.Secure.getUriFor(
- Settings.Secure.THROTTLE_MAX_NTP_CACHE_AGE_SEC), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_POLLING_SEC), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_THRESHOLD_BYTES), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_VALUE_KBITSPS), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_RESET_DAY), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_NOTIFICATION_TYPE), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_HELP_URI), false, this);
+ resolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.THROTTLE_MAX_NTP_CACHE_AGE_SEC), false, this);
}
void unregister(Context context) {
@@ -297,8 +297,8 @@
public String getHelpUri() {
enforceAccessPermission();
- return Settings.Secure.getString(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_HELP_URI);
+ return Settings.Global.getString(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_HELP_URI);
}
// TODO - fetch for the iface
@@ -436,18 +436,18 @@
int pollingPeriod = mContext.getResources().getInteger(
R.integer.config_datause_polling_period_sec);
- mPolicyPollPeriodSec = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_POLLING_SEC, pollingPeriod);
+ mPolicyPollPeriodSec = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_POLLING_SEC, pollingPeriod);
// TODO - remove testing stuff?
long defaultThreshold = mContext.getResources().getInteger(
R.integer.config_datause_threshold_bytes);
int defaultValue = mContext.getResources().getInteger(
R.integer.config_datause_throttle_kbitsps);
- long threshold = Settings.Secure.getLong(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_THRESHOLD_BYTES, defaultThreshold);
- int value = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_VALUE_KBITSPS, defaultValue);
+ long threshold = Settings.Global.getLong(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_THRESHOLD_BYTES, defaultThreshold);
+ int value = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_VALUE_KBITSPS, defaultValue);
mPolicyThreshold.set(threshold);
mPolicyThrottleValue.set(value);
@@ -456,14 +456,14 @@
mPolicyThreshold.set(TESTING_THRESHOLD);
}
- mPolicyResetDay = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_RESET_DAY, -1);
+ mPolicyResetDay = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_RESET_DAY, -1);
if (mPolicyResetDay == -1 ||
((mPolicyResetDay < 1) || (mPolicyResetDay > 28))) {
Random g = new Random();
mPolicyResetDay = 1 + g.nextInt(28); // 1-28
- Settings.Secure.putInt(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_RESET_DAY, mPolicyResetDay);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_RESET_DAY, mPolicyResetDay);
}
if (mIface == null) {
mPolicyThreshold.set(0);
@@ -471,11 +471,11 @@
int defaultNotificationType = mContext.getResources().getInteger(
R.integer.config_datause_notification_type);
- mPolicyNotificationsAllowedMask = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_NOTIFICATION_TYPE, defaultNotificationType);
+ mPolicyNotificationsAllowedMask = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_NOTIFICATION_TYPE, defaultNotificationType);
- final int maxNtpCacheAgeSec = Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.THROTTLE_MAX_NTP_CACHE_AGE_SEC,
+ final int maxNtpCacheAgeSec = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.THROTTLE_MAX_NTP_CACHE_AGE_SEC,
(int) (MAX_NTP_CACHE_AGE / 1000));
mMaxNtpCacheAge = maxNtpCacheAgeSec * 1000;