Skip to content

Commit 1584609

Browse files
committed
Add configuration flag controlling whether IMS can be completely disabled.
Change-Id: I70e6fc163d65bba7d1260df0acb74ca614e54b68
1 parent 362dac0 commit 1584609

File tree

4 files changed

+47
-1
lines changed

4 files changed

+47
-1
lines changed

core/res/res/values-mcc311-mnc480

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/*
4+
** Copyright 2012, The Android Open Source Project
5+
**
6+
** Licensed under the Apache License, Version 2.0 (the "License");
7+
** you may not use this file except in compliance with the License.
8+
** You may obtain a copy of the License at
9+
**
10+
** http://www.apache.org/licenses/LICENSE-2.0
11+
**
12+
** Unless required by applicable law or agreed to in writing, software
13+
** distributed under the License is distributed on an "AS IS" BASIS,
14+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
** See the License for the specific language governing permissions and
16+
** limitations under the License.
17+
*/
18+
-->
19+
20+
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
21+
22+
<!-- CDMA home system id for Verizon -->
23+
<string-array translatable="false" name="config_cdma_home_system">
24+
<item>64</item>
25+
<item>65</item>
26+
<item>76</item>
27+
<item>77</item>
28+
<item>78</item>
29+
<item>79</item>
30+
<item>80</item>
31+
<item>81</item>
32+
<item>82</item>
33+
<item>83</item>
34+
</string-array>
35+
36+
<!-- Flag indicating whether the IMS service can be turned off. If false then
37+
the service will not be turned-off completely (the ImsManager.turnOffIms() will
38+
be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->
39+
<bool name="imsServiceAllowTurnOff">false</bool>
40+
41+
</resources>

core/res/res/values/config.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,6 +1650,11 @@
16501650
the IMS connection -->
16511651
<bool name="useImsAlwaysForEmergencyCall">true</bool>
16521652

1653+
<!-- Flag indicating whether the IMS service can be turned off. If false then
1654+
the service will not be turned-off completely (the ImsManager.turnOffIms() will
1655+
be disabled) but individual Features can be disabled using ImsConfig.setFeatureValue() -->
1656+
<bool name="imsServiceAllowTurnOff">true</bool>
1657+
16531658
<bool name="config_networkSamplingWakesDevice">true</bool>
16541659

16551660
<string-array translatable="false" name="config_cdma_home_system" />

core/res/res/values/symbols.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1956,6 +1956,7 @@
19561956
<java-symbol type="style" name="Theme.DeviceDefault.Resolver" />
19571957
<java-symbol type="attr" name="preferenceFragmentStyle" />
19581958
<java-symbol type="bool" name="skipHoldBeforeMerge" />
1959+
<java-symbol type="bool" name="imsServiceAllowTurnOff" />
19591960
<java-symbol type="bool" name="useImsAlwaysForEmergencyCall" />
19601961
<java-symbol type="attr" name="touchscreenBlocksFocus" />
19611962
<java-symbol type="layout" name="resolver_list_with_default" />

0 commit comments

Comments
 (0)