diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2021-01-29 23:24:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-29 23:24:35 +0000 |
| commit | 56efb4fa2b0d0f2cb02a30b6f17bb79e65e36cb3 (patch) | |
| tree | d607c8d17ffc35c3d05c75d932f02461f357c7de /core/res | |
| parent | af364469e5a6de677e3999905415c09ab8324b5b (diff) | |
| parent | 0a35aae9d626212f914a34e043584f508995e3a9 (diff) | |
Merge "Add config config_voice_data_sms_auto_fallback" am: 0a35aae9d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433920
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4413bf936d1cc129b3b14442cd91bced306c7c1
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d30efa95edff..20cb27085661 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -4411,4 +4411,7 @@ <!-- Component names of the services which will keep critical code path warm --> <string-array name="config_keep_warming_services" translatable="false" /> + + <!-- Whether to select voice/data/sms preference without user confirmation --> + <bool name="config_voice_data_sms_auto_fallback">false</bool> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 937716dbcf74..4509b4e0b3f9 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -4057,4 +4057,6 @@ <java-symbol type="array" name="config_notificationMsgPkgsAllowedAsConvos" /> <java-symbol type="array" name="config_keep_warming_services" /> + + <java-symbol type="bool" name="config_voice_data_sms_auto_fallback" /> </resources> |