Migrate shamu overlay to default config app.

Many of the variables in these overlays were migrated to
CarrierConfgiManager, so the overlay values were migrated into the
default config app (packages/apps/CarrierConfig). Everything no longer
needed here is deleted.

Bug: 20827908
Change-Id: I9ec1c3f240a96746bf02c04c7e96a1ecf6671818

31 files changed, 0 insertions, 682 deletions

diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc070/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc070/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc070/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc090/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc090/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc090/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml
index d29eb835..6561c6cb 100644
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml
+++ b/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml
@@ -21,20 +21,8 @@
          are routed through the android.media.AudioManager class (true) or through
          the com.android.internal.telephony.Phone interface (false). -->
     <bool name="send_mic_mute_to_AudioManager">true</bool>
-    <!-- Configure certain GsmUmtsOptions to be available or not. The
-         default values are in Phone/res/values/config.xml and maybe overridden
-         in operator specific resource directories or device specific overlays. -->
-    <bool name="config_apn_expand" translatable="false">false</bool>
     <!-- Show enabled lte option for lte device -->
     <bool name="config_enabled_lte" translatable="false">true</bool>
-    <!-- Show cdma auto network mode in (glabal) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-    <!-- CDMA activation goes through HFA [DO NOT TRANSLATE] -->
-    <bool name="config_use_hfa_for_provisioning" translatable="false">true</bool>
-    <!-- Display carrier settings -->
-    <bool name="config_carrier_settings_enable">true</bool>
-    <!-- Don't display swap button after merging calls into Cdma conference. -->
-    <bool name="support_swap_after_merge">false</bool>
     <!-- carrier settings menu -->
     <string name="carrier_settings" translatable="false">com.android.sdm.plugins.sprintdm</string>
     <string name="carrier_settings_menu" translatable="false">com.android.sdm.plugins.sprintdm.SprintCarrierSettingsActivity</string>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc150/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc150/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc150/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc170/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc170/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc170/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc180/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc180/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc180/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc380/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc380/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc380/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc410/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc410/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc410/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc560/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc560/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc560/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc680/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc680/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc680/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc980/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc980/config.xml
deleted file mode 100644
index 35ed25ef..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc980/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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>
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <bool name="csp_enabled">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc220/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc220/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc220/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc221/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc221/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc221/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc222/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc222/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc222/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc223/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc223/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc223/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc224/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc224/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc224/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc225/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc225/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc225/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc226/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc226/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc226/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc227/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc227/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc227/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc228/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc228/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc228/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc229/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc229/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc229/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc580/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc580/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc580/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc581/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc581/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc581/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc582/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc582/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc582/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc583/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc583/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc583/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc584/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc584/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc584/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc585/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc585/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc585/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc586/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc586/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc586/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc587/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc587/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc587/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc588/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc588/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc588/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>
diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc589/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc589/config.xml
deleted file mode 100644
index 558dc245..00000000
--- a/overlay/packages/services/Telephony/res/values-mcc311-mnc589/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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 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.
--->
-
-<!-- Phone app resources that may need to be customized
-     for different hardware or product builds. -->
-<resources>
-    <!-- Show cdma auto network mode in (global) roaming -->
-    <bool name="config_show_cdma" translatable="false">true</bool>
-</resources>