Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8594e870 authored by Jordan Liu's avatar Jordan Liu
Browse files

Remove configs in frameworks/base 

Remove old configs within frameworks/base. With move to CarrierConfig no
need for the old config_cdma_3waycall_flash_delay resources.

Note that the new carrier_config files replace all values with 300
instead of leaving some as 70 and some as 300. The configs that set the
value to 70 were to fix http://b/17331584, and the configs that set the
value to 300 fixed http://b/24638158. It seems like as long as the value
is above 70ms both bugs should stay resolved.
Merged-In: I15d54e09a4b474b1f83a05cbe777c826cdef368f

Bug: 29873049
Change-Id: I15d54e09a4b474b1f83a05cbe777c826cdef368f
parent 5706a8f5

core/res/res/values-mcc310-mnc120/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
    -->

    <integer name="config_mobile_mtu">1422</integer>



    <!-- Sprint need a 70 ms delay for 3way call -->

    <integer name="config_cdma_3waycall_flash_delay">70</integer>



    <!-- If this value is true, The mms content-disposition field is supported correctly.

         If false, Content-disposition fragments are ignored -->

    <bool name="config_mms_content_disposition_support">false</bool>

core/res/res/values-mcc311-mnc220/config.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2014, 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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- USC need a 70 ms delay for 3way call -->

    <integer name="config_cdma_3waycall_flash_delay">300</integer>

</resources>

core/res/res/values-mcc311-mnc221/config.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2014, 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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- USC need a 70 ms delay for 3way call -->

    <integer name="config_cdma_3waycall_flash_delay">300</integer>

</resources>

core/res/res/values-mcc311-mnc222/config.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2014, 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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- USC need a 70 ms delay for 3way call -->

    <integer name="config_cdma_3waycall_flash_delay">300</integer>

</resources>

core/res/res/values-mcc311-mnc223/config.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2014, 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 my 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.

*/

-->



<!-- These resources are around just to allow their values to be customized

     for different hardware and product builds. -->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <!-- USC need a 70 ms delay for 3way call -->

    <integer name="config_cdma_3waycall_flash_delay">300</integer>

</resources>