diff options
| author | 2023-03-29 16:22:33 +0000 | |
|---|---|---|
| committer | 2023-03-29 16:22:33 +0000 | |
| commit | 5ff3c73038586ed072ee7712c3dc9973084b9279 (patch) | |
| tree | 6f42b7f14fa87e19072f32782285678c9b86740d | |
| parent | 54a9873aa89581f9526175665ef2d2a2e0382274 (diff) | |
| parent | 492a9a5a59c5d155a861d5b2c27147ce521fea31 (diff) | |
Merge "Define a list of radios for SATELLITE_MODE_RADIOS" into udc-dev
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 6312913d1403..59cd7a051fad 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -25,6 +25,8 @@ <!-- Comma-separated list of bluetooth, wifi, and cell. --> <string name="def_airplane_mode_radios" translatable="false">cell,bluetooth,uwb,wifi,wimax</string> <string name="airplane_mode_toggleable_radios" translatable="false">bluetooth,wifi</string> + <string name="def_satellite_mode_radios" translatable="false"></string> + <integer name="def_satellite_mode_enabled" translatable="false">0</integer> <string name="def_bluetooth_disabled_profiles" translatable="false">0</string> <bool name="def_auto_time">true</bool> <bool name="def_auto_time_zone">true</bool> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 74774167caa0..ed5654d4f259 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2413,6 +2413,12 @@ class DatabaseHelper extends SQLiteOpenHelper { loadStringSetting(stmt, Settings.Global.AIRPLANE_MODE_RADIOS, R.string.def_airplane_mode_radios); + loadStringSetting(stmt, Global.SATELLITE_MODE_RADIOS, + R.string.def_satellite_mode_radios); + + loadIntegerSetting(stmt, Global.SATELLITE_MODE_ENABLED, + R.integer.def_satellite_mode_enabled); + loadStringSetting(stmt, Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS, R.string.airplane_mode_toggleable_radios); |