diff options
| author | Roman Birg <roman@cyngn.com> | 2016-07-11 09:41:14 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-07-12 10:21:04 -0700 |
| commit | 1d9d5901f26797d32553eaf5e767ad4e3a2eb12b (patch) | |
| tree | e9c992cafaf4a9e52c9f87b23984324dd6e1f905 /packages/SettingsProvider | |
| parent | d55349007e223c9bca9cc2281c067562c71a4c99 (diff) | |
| download | frameworks_base-1d9d5901f26797d32553eaf5e767ad4e3a2eb12b.zip frameworks_base-1d9d5901f26797d32553eaf5e767ad4e3a2eb12b.tar.gz frameworks_base-1d9d5901f26797d32553eaf5e767ad4e3a2eb12b.tar.bz2 | |
SettingsProvider: fix data_enabled default lookup
We shouldn't set the MOBILE_DATA + phoneId keys because it will cause
collisions with other parts of the system that actually query
MOBILE_DATA + subId - leading to incorrect defaults.
TelephonyManager.getIntWithSubId() actually falls back to just
MOBILE_DATA for a specific sub id query, so we do not need to touch
these values, since it applies the same default to all sub ids anyways.
Ticket: CYNGNOS-3171
Change-Id: I38405000b3d641029080fb630eae4d128bd44719
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index a3aeaa9..e4b2409 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2880,16 +2880,6 @@ class DatabaseHelper extends SQLiteOpenHelper { R.bool.def_enable_mobile_data); int phoneCount = TelephonyManager.getDefault().getPhoneCount(); - // SUB specific flags for Multisim devices - for (int phoneId = 0; phoneId < MAX_PHONE_COUNT; phoneId++) { - // Mobile Data default, based on build - loadRegionLockedBooleanSetting(stmt, Settings.Global.MOBILE_DATA + phoneId, - R.bool.def_enable_mobile_data); - - // Data roaming default, based on build - loadRegionLockedBooleanSetting(stmt, Settings.Global.DATA_ROAMING + phoneId, - R.bool.def_enable_data_roaming); - } loadBooleanSetting(stmt, Settings.Global.NETSTATS_ENABLED, R.bool.def_netstats_enabled); |