From 492a9a5a59c5d155a861d5b2c27147ce521fea31 Mon Sep 17 00:00:00 2001 From: Thomas Nguyen Date: Tue, 28 Mar 2023 14:02:46 -0700 Subject: Define a list of radios for SATELLITE_MODE_RADIOS Bug: 274636414 Test: build. atest android.provider.SettingsBackupTest Change-Id: I10b6a23bf2e5cd5ca9e4d5548a7b5ecd3c561725 --- packages/SettingsProvider/res/values/defaults.xml | 2 ++ .../src/com/android/providers/settings/DatabaseHelper.java | 6 ++++++ 2 files changed, 8 insertions(+) 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 @@ cell,bluetooth,uwb,wifi,wimax bluetooth,wifi + + 0 0 true true 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); -- cgit v1.2.3-59-g8ed1b