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

Merge "Moved telephony related resource to a separate file" into tm-dev

Browse Source
This commit is contained in:
Jack Yu
2022-04-04 17:44:46 +00:00
committed by Android (Google) Code Review
parent 3c1bcfa499 7380604407
commit 5b88e9fcb5
4 changed files with 115 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/OWNERS
View File

@@ -42,3 +42,6 @@ per-file res/*-watch/* = file:/platform/frameworks/opt/wear:/OWNERS
# PowerProfile
per-file res/xml/power_profile.xml = file:/BATTERY_STATS_OWNERS
per-file res/xml/power_profile_test.xml = file:/BATTERY_STATS_OWNERS
# Telephony
per-file res/values/config_telephony.xml = file:/platform/frameworks/opt/telephony:/OWNERS

75
core/res/res/values/config.xml
View File

@@ -2703,41 +2703,10 @@
<string-array name="config_mobile_tcp_buffers">
</string-array>
<!-- Configure tcp buffer sizes per network type in the form:
network-type:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
The network-type must be a valid DataConfigNetworkType value. If no value is found for the
network-type in use, config_tcp_buffers will be used instead.
-->
<string-array name="config_network_type_tcp_buffers">
</string-array>
<!-- Configure tcp buffer sizes in the form:
rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
If this is configured as an empty string, the system default will be applied.
For now this config is used by mobile data only. In the future it should be
used by Wi-Fi as well.
-->
<string name="config_tcp_buffers" translatable="false"></string>
<!-- Configure ethernet tcp buffersizes in the form:
rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->
<string name="config_ethernet_tcp_buffers" translatable="false">524288,1048576,3145728,524288,1048576,2097152</string>
<!-- What source to use to estimate link upstream and downstream bandwidth capacities.
Default is bandwidth_estimator.
Values are bandwidth_estimator, carrier_config and modem. -->
<string name="config_bandwidthEstimateSource">bandwidth_estimator</string>
<!-- Whether force to enable telephony new data stack or not -->
<bool name="config_force_enable_telephony_new_data_stack">true</bool>
<!-- Whether to adopt the predefined handover policies for IWLAN.
{@see CarrierConfigManager#KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY}
-->
<bool name="config_enable_iwlan_handover_policy">true</bool>
<!-- Whether WiFi display is supported by this device.
There are many prerequisites for this feature to work correctly.
Here are a few of them:
@@ -3317,27 +3286,6 @@
<!-- String array containing numbers that shouldn't be logged. Country-specific. -->
<string-array name="unloggable_phone_numbers" />
<!-- Cellular data service package name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wwan_data_service_package" translatable="false">com.android.phone</string>
<!-- IWLAN data service package name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_data_service_package" translatable="false"></string>
<!-- Boolean indicating whether the Iwlan data service supports persistence of iwlan ipsec
tunnels across service restart. If iwlan tunnels are not persisted across restart,
Framework will clean up dangling data connections when service restarts -->
<bool name="config_wlan_data_service_conn_persistence_on_restart">true</bool>
<!-- Cellular data service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wwan_data_service_class" translatable="false"></string>
<!-- IWLAN data service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_data_service_class" translatable="false"></string>
<bool name="config_networkSamplingWakesDevice">true</bool>
<!--From SmsMessage-->
@@ -3437,11 +3385,6 @@
<item>2</item> <!-- USAGE_SETTING_DATA_CENTRIC -->
</integer-array>
<!-- When a radio power off request is received, we will delay completing the request until
either IMS moves to the deregistered state or the timeout defined by this configuration
elapses. If 0, this feature is disabled and we do not delay radio power off requests.-->
<integer name="config_delay_for_ims_dereg_millis">0</integer>
<!--Thresholds for LTE dbm in status bar-->
<integer-array translatable="false" name="config_lteDbmThresholds">
<item>-140</item> <!-- SIGNAL_STRENGTH_NONE_OR_UNKNOWN -->
@@ -4405,24 +4348,6 @@
<bool name="config_keepRestrictedProfilesInBackground">true</bool>
<!-- Cellular network service package name to bind to by default. -->
<string name="config_wwan_network_service_package" translatable="false">com.android.phone</string>
<!-- Cellular network service class name to bind to by default.-->
<string name="config_wwan_network_service_class" translatable="false"></string>
<!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_network_service_package" translatable="false"></string>
<!-- IWLAN network service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_network_service_class" translatable="false"></string>
<!-- Telephony qualified networks service package name to bind to by default. -->
<string name="config_qualified_networks_service_package" translatable="false"></string>
<!-- Telephony qualified networks service class name to bind to by default. -->
<string name="config_qualified_networks_service_class" translatable="false"></string>
<!-- Wear devices: Controls the radios affected by Activity Mode. -->
<string-array name="config_wearActivityModeRadios">
<item>"wifi"</item>

112
core/res/res/values/config_telephony.xml Normal file
View File

@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2022 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<resources>
<!-- This file defines Android telephony related resources -->
<!-- Whether force to enable telephony new data stack or not -->
<bool name="config_force_enable_telephony_new_data_stack">true</bool>
<java-symbol type="bool" name="config_force_enable_telephony_new_data_stack" />
<!-- Configure tcp buffer sizes per network type in the form:
network-type:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
The network-type must be a valid DataConfigNetworkType value. If no value is found for the
network-type in use, config_tcp_buffers will be used instead.
-->
<string-array name="config_network_type_tcp_buffers">
</string-array>
<java-symbol type="array" name="config_network_type_tcp_buffers" />
<!-- Configure tcp buffer sizes in the form:
rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
If this is configured as an empty string, the system default will be applied.
-->
<string name="config_tcp_buffers" translatable="false"></string>
<java-symbol type="string" name="config_tcp_buffers" />
<!-- What source to use to estimate link upstream and downstream bandwidth capacities.
Default is bandwidth_estimator.
Values are bandwidth_estimator, carrier_config and modem. -->
<string name="config_bandwidthEstimateSource">bandwidth_estimator</string>
<java-symbol type="string" name="config_bandwidthEstimateSource" />
<!-- Whether to adopt the predefined handover policies for IWLAN.
{@see CarrierConfigManager#KEY_IWLAN_HANDOVER_POLICY_STRING_ARRAY}
-->
<bool name="config_enable_iwlan_handover_policy">true</bool>
<java-symbol type="bool" name="config_enable_iwlan_handover_policy" />
<!-- When a radio power off request is received, we will delay completing the request until
either IMS moves to the deregistered state or the timeout defined by this configuration
elapses. If 0, this feature is disabled and we do not delay radio power off requests.-->
<integer name="config_delay_for_ims_dereg_millis">0</integer>
<java-symbol type="integer" name="config_delay_for_ims_dereg_millis" />
<!-- Boolean indicating whether the Iwlan data service supports persistence of iwlan ipsec
tunnels across service restart. If iwlan tunnels are not persisted across restart,
Framework will clean up dangling data connections when service restarts -->
<bool name="config_wlan_data_service_conn_persistence_on_restart">true</bool>
<java-symbol type="bool" name="config_wlan_data_service_conn_persistence_on_restart" />
<!-- Cellular data service package name to bind to by default. If none is specified in an
overlay, an empty string is passed in -->
<string name="config_wwan_data_service_package" translatable="false">com.android.phone</string>
<java-symbol type="string" name="config_wwan_data_service_package" />
<!-- IWLAN data service package name to bind to by default. If none is specified in an overlay,
an empty string is passed in -->
<string name="config_wlan_data_service_package" translatable="false"></string>
<java-symbol type="string" name="config_wlan_data_service_package" />
<!-- Cellular data service class name to bind to by default. If none is specified in an overlay,
an empty string is passed in -->
<string name="config_wwan_data_service_class" translatable="false"></string>
<java-symbol type="string" name="config_wwan_data_service_class" />
<!-- IWLAN data service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_data_service_class" translatable="false"></string>
<java-symbol type="string" name="config_wlan_data_service_class" />
<!-- Cellular network service package name to bind to by default. -->
<string name="config_wwan_network_service_package" translatable="false">
com.android.phone
</string>
<java-symbol type="string" name="config_wwan_network_service_package" />
<!-- Cellular network service class name to bind to by default.-->
<string name="config_wwan_network_service_class" translatable="false"></string>
<java-symbol type="string" name="config_wwan_network_service_class" />
<!-- IWLAN network service package name to bind to by default. If none is specified in an
overlay, an empty string is passed in -->
<string name="config_wlan_network_service_package" translatable="false"></string>
<java-symbol type="string" name="config_wlan_network_service_package" />
<!-- IWLAN network service class name to bind to by default. If none is specified in an overlay,
an empty string is passed in -->
<string name="config_wlan_network_service_class" translatable="false"></string>
<java-symbol type="string" name="config_wlan_network_service_class" />
<!-- Telephony qualified networks service package name to bind to by default. -->
<string name="config_qualified_networks_service_package" translatable="false"></string>
<java-symbol type="string" name="config_qualified_networks_service_package" />
<!-- Telephony qualified networks service class name to bind to by default. -->
<string name="config_qualified_networks_service_class" translatable="false"></string>
<java-symbol type="string" name="config_qualified_networks_service_class" />
</resources>

17
core/res/res/values/symbols.xml
View File

@@ -294,17 +294,6 @@
<java-symbol type="bool" name="config_enableBurnInProtection" />
<java-symbol type="bool" name="config_hotswapCapable" />
<java-symbol type="bool" name="config_mms_content_disposition_support" />
<java-symbol type="string" name="config_wwan_network_service_package" />
<java-symbol type="string" name="config_wlan_network_service_package" />
<java-symbol type="string" name="config_wwan_network_service_class" />
<java-symbol type="string" name="config_wlan_network_service_class" />
<java-symbol type="bool" name="config_wlan_data_service_conn_persistence_on_restart" />
<java-symbol type="string" name="config_wwan_data_service_package" />
<java-symbol type="string" name="config_wlan_data_service_package" />
<java-symbol type="string" name="config_wwan_data_service_class" />
<java-symbol type="string" name="config_wlan_data_service_class" />
<java-symbol type="string" name="config_qualified_networks_service_package" />
<java-symbol type="string" name="config_qualified_networks_service_class" />
<java-symbol type="bool" name="config_networkSamplingWakesDevice" />
<java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />
<java-symbol type="bool" name="config_sip_wifi_only" />
@@ -472,10 +461,6 @@
<java-symbol type="integer" name="config_safe_media_volume_usb_mB" />
<java-symbol type="integer" name="config_mobile_mtu" />
<java-symbol type="array" name="config_mobile_tcp_buffers" />
<java-symbol type="array" name="config_network_type_tcp_buffers" />
<java-symbol type="string" name="config_tcp_buffers" />
<java-symbol type="bool" name="config_force_enable_telephony_new_data_stack" />
<java-symbol type="bool" name="config_enable_iwlan_handover_policy" />
<java-symbol type="integer" name="config_volte_replacement_rat"/>
<java-symbol type="integer" name="config_valid_wappush_index" />
<java-symbol type="integer" name="config_overrideHasPermanentMenuKey" />
@@ -489,10 +474,8 @@
<java-symbol type="integer" name="config_num_physical_slots" />
<java-symbol type="integer" name="config_default_cellular_usage_setting" />
<java-symbol type="array" name="config_supported_cellular_usage_settings" />
<java-symbol type="integer" name="config_delay_for_ims_dereg_millis" />
<java-symbol type="array" name="config_integrityRuleProviderPackages" />
<java-symbol type="bool" name="config_useAssistantVolume" />
<java-symbol type="string" name="config_bandwidthEstimateSource" />
<java-symbol type="integer" name="config_smartSelectionInitializedTimeoutMillis" />
<java-symbol type="integer" name="config_smartSelectionInitializingTimeoutMillis" />
<java-symbol type="integer" name="config_preferKeepClearForFocusDelayMillis" />