Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Define a list of radios for SATELLITE_MODE_RADIOS" into udc-dev am: 5ff3c73038

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22319434

Change-Id: I3cffd7716ab52f9bdb191c98b4c101d7e452c5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thomas Nguyen
2023-03-29 16:30:39 +00:00
committed by Automerger Merge Worker
parent f7e1290579 5ff3c73038
commit 7101c896c8
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsProvider/res/values/defaults.xml
View File

@@ -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>

6
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -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);