diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-17 11:24:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-17 11:24:28 +0000 |
| commit | f6ecb0017c816fbe2b8455a1c1c16324b5c71cac (patch) | |
| tree | 37106af36534206e8a0824814fd9c9d6efefd2fb /packages | |
| parent | b67cbe263125fcd3a5cf71dd2d33dc8e73b2790e (diff) | |
| parent | 62966b715b90900a952b4f8af249d9dfad707bb0 (diff) | |
Merge "Remove usage of networkAttributes"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Connectivity/service/ServiceConnectivityResources/res/values/config.xml | 10 | ||||
| -rw-r--r-- | packages/Connectivity/service/ServiceConnectivityResources/res/values/overlayable.xml | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/packages/Connectivity/service/ServiceConnectivityResources/res/values/config.xml b/packages/Connectivity/service/ServiceConnectivityResources/res/values/config.xml index 7d98c76a40ba..06c81921fd3f 100644 --- a/packages/Connectivity/service/ServiceConnectivityResources/res/values/config.xml +++ b/packages/Connectivity/service/ServiceConnectivityResources/res/values/config.xml @@ -42,4 +42,14 @@ --> </string-array> + <string-array translatable="false" name="config_legacy_networktype_restore_timers"> + <item>2,60000</item><!-- mobile_mms --> + <item>3,60000</item><!-- mobile_supl --> + <item>4,60000</item><!-- mobile_dun --> + <item>5,60000</item><!-- mobile_hipri --> + <item>10,60000</item><!-- mobile_fota --> + <item>11,60000</item><!-- mobile_ims --> + <item>12,60000</item><!-- mobile_cbs --> + </string-array> + </resources>
\ No newline at end of file diff --git a/packages/Connectivity/service/ServiceConnectivityResources/res/values/overlayable.xml b/packages/Connectivity/service/ServiceConnectivityResources/res/values/overlayable.xml index 00ec2df0e6f1..da8aee56276c 100644 --- a/packages/Connectivity/service/ServiceConnectivityResources/res/values/overlayable.xml +++ b/packages/Connectivity/service/ServiceConnectivityResources/res/values/overlayable.xml @@ -17,11 +17,11 @@ <overlayable name="ServiceConnectivityResourcesConfig"> <policy type="product|system|vendor"> <!-- Configuration values for ConnectivityService --> + <item type="array" name="config_legacy_networktype_restore_timers"/> <item type="string" name="config_networkCaptivePortalServerUrl"/> <item type="integer" name="config_networkTransitionTimeout"/> <item type="array" name="config_wakeonlan_supported_interfaces"/> - </policy> </overlayable> </resources> |