Rollback telephony-resources
Bug: 149776042
Test: TeleServiceTests
Change-Id: Ib6294a7ad4641054eced1de9da24e42bb9663eb3
diff --git a/device-blueline.mk b/device-blueline.mk
index a8a616b..4cb8d2b 100644
--- a/device-blueline.mk
+++ b/device-blueline.mk
@@ -20,9 +20,6 @@
DEVICE_PACKAGE_OVERLAYS += device/google/crosshatch/blueline/overlay
-PRODUCT_PACKAGES += \
- TelephonyOverlay2018Blueline
-
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/init.insmod.blueline.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
diff --git a/device-crosshatch.mk b/device-crosshatch.mk
index 695930c..97fc991 100644
--- a/device-crosshatch.mk
+++ b/device-crosshatch.mk
@@ -20,9 +20,6 @@
DEVICE_PACKAGE_OVERLAYS += device/google/crosshatch/crosshatch/overlay
-PRODUCT_PACKAGES += \
- TelephonyOverlay2018Crosshatch
-
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/init.insmod.crosshatch.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.cfg
diff --git a/rro_overlays/TelephonyOverlay/Android.bp b/rro_overlays/TelephonyOverlay/Android.bp
deleted file mode 100644
index bddfd52..0000000
--- a/rro_overlays/TelephonyOverlay/Android.bp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (C) 2020 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.
-//
-
-runtime_resource_overlay {
- name: "TelephonyOverlay2018Crosshatch",
- resource_dirs: ["Crosshatch/res","Common/res"],
- certificate: "platform",
- product_specific: true,
- aaptflags: ["--auto-add-overlay"],
- manifest: "AndroidManifest.xml",
- theme: "TelephonyOverlay2018Crosshatch",
-}
-
-
-runtime_resource_overlay {
- name: "TelephonyOverlay2018Blueline",
- resource_dirs: ["Blueline/res","Common/res"],
- certificate: "platform",
- product_specific: true,
- aaptflags: ["--auto-add-overlay"],
- manifest: "AndroidManifest.xml",
- theme: "TelephonyOverlay2018Blueline",
-}
-
diff --git a/rro_overlays/TelephonyOverlay/AndroidManifest.xml b/rro_overlays/TelephonyOverlay/AndroidManifest.xml
deleted file mode 100644
index e3662bc..0000000
--- a/rro_overlays/TelephonyOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<!-- Pixel specific wifi overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.telephony.resources.pixel"
- android:versionCode="1"
- android:versionName="1.0">
- <application android:hasCode="false" />
- <overlay
- android:targetPackage="com.android.telephony.resources"
- android:targetName="TelephonyCustomization"
- android:isStatic="true"
- android:priority="0"/>
-</manifest>
-
diff --git a/rro_overlays/TelephonyOverlay/Blueline/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Blueline/res/values-mcc310-mnc004/donottranslate_config.xml
deleted file mode 100644
index 347e7d6..0000000
--- a/rro_overlays/TelephonyOverlay/Blueline/res/values-mcc310-mnc004/donottranslate_config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">g013a</string>
- <!-- MMS user agent profile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g013a/g013a.xml</string>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Blueline/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Blueline/res/values-mcc311-mnc480/donottranslate_config.xml
deleted file mode 100644
index 347e7d6..0000000
--- a/rro_overlays/TelephonyOverlay/Blueline/res/values-mcc311-mnc480/donottranslate_config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">g013a</string>
- <!-- MMS user agent profile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g013a/g013a.xml</string>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Blueline/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Blueline/res/values/donottranslate_config.xml
deleted file mode 100644
index 00d197a..0000000
--- a/rro_overlays/TelephonyOverlay/Blueline/res/values/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2019 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>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">g013a</string>
- <!-- MMS user agent profile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G013A.xml</string>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc204-mnc04/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc204-mnc04/donottranslate_config.xml
deleted file mode 100644
index 4eef2d0..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc204-mnc04/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- Use ERI text for network name on CDMA LTE -->
- <bool name="config_LTE_eri_for_network_name">false</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc004/donottranslate_config.xml
deleted file mode 100644
index 4eef2d0..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc004/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- Use ERI text for network name on CDMA LTE -->
- <bool name="config_LTE_eri_for_network_name">false</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml
deleted file mode 100644
index b940d41..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc120/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- Sometimes, PDU has garbages. So, need to use valid index -->
- <integer name="config_valid_wappush_index">4</integer>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc260/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc260/donottranslate_config.xml
deleted file mode 100644
index 4cb6c79..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc260/donottranslate_config.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <!-- Configure mobile tcp buffer sizes in the form:
- rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
- If no value is found for the rat-name in use, the system default will be applied.
- -->
- <string-array name="config_mobile_tcp_buffers">
- <item>umts:21135,131070,1056768,6144,24576,165312</item>
- <item>hspa:18300,131070,1056768,6144,24576,393216</item>
- <item>hsdpa:18300,131070,1056768,6144,24576,393216</item>
- <item>hsupa:6141,131070,1056768,6144,24576,393216</item>
- <item>hspap:31455,131070,1830912,6144,24576,1830912</item>
- <item>edge:8192,26280,704512,4096,16384,110208</item>
- <item>gprs:8192,8760,704512,4096,8760,110208</item>
- <item>lte:2097152,4194304,8388608,262144,524288,1048576</item>
- </string-array>
-
-
-</resources>
-
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc410/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc410/donottranslate_config.xml
deleted file mode 100644
index 4d0762e..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc310-mnc410/donottranslate_config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <!-- Configure mobile tcp buffer sizes in the form:
- rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
- If no value is found for the rat-name in use, the system default will be applied.
- -->
- <string-array name="config_mobile_tcp_buffers">
- <item>umts:131072,262144,1452032,4096,16384,399360</item>
- <item>hspa:131072,262144,1452032,4096,16384,399360</item>
- <item>hsdpa:131072,262144,1452032,4096,16384,399360</item>
- <item>hsupa:131072,262144,1452032,4096,16384,399360</item>
- <item>hspap:131072,262144,1452032,4096,16384,399360</item>
- <item>edge:4093,26280,35040,4096,16384,35040</item>
- <item>gprs:4092,8760,11680,4096,8760,11680</item>
- <item>evdo:4094,87380,262144,4096,16384,262144</item>
- <item>lte:524288,1048576,8388608,262144,524288,4194304</item>
- </string-array>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc311-mnc480/donottranslate_config.xml
deleted file mode 100644
index 4eef2d0..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc311-mnc480/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- Use ERI text for network name on CDMA LTE -->
- <bool name="config_LTE_eri_for_network_name">false</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc312-mnc530/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc312-mnc530/donottranslate_config.xml
deleted file mode 100644
index b940d41..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc312-mnc530/donottranslate_config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- Sometimes, PDU has garbages. So, need to use valid index -->
- <integer name="config_valid_wappush_index">4</integer>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc313-mnc100/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc313-mnc100/donottranslate_config.xml
deleted file mode 100644
index 3bdaa06..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc313-mnc100/donottranslate_config.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (c) 2018, The Linux Foundation. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Do not translate. Defines the slots is Two Digit Number for dialing normally not USSD -->
- <string-array name="config_twoDigitNumberPattern">
- <item>"0"</item>
- <item>"00"</item>
- <item>"*0"</item>
- <item>"*1"</item>
- <item>"*2"</item>
- <item>"*3"</item>
- <item>"*4"</item>
- <item>"*5"</item>
- <item>"*6"</item>
- <item>"*7"</item>
- <item>"*8"</item>
- <item>"*9"</item>
- <item>"#0"</item>
- <item>"#1"</item>
- <item>"#2"</item>
- <item>"#3"</item>
- <item>"#4"</item>
- <item>"#5"</item>
- <item>"#6"</item>
- <item>"#7"</item>
- <item>"#8"</item>
- <item>"#9"</item>
- </string-array>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc01/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc01/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc01/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc02/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc02/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc02/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc03/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc03/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc03/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc07/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc07/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc07/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc11/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc11/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc11/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc71/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc71/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc71/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc72/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc72/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc72/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc90/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc90/donottranslate_config.xml
deleted file mode 100644
index 8c0c020..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values-mcc505-mnc90/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2016, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
- <bool name="config_auto_attach_data_on_creation">false</bool>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml
deleted file mode 100644
index 607e25d..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_arrays.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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>
- <!-- Device-specific array of SIM slot indexes which are are embedded eUICCs.
- e.g. If a device has two physical slots with indexes 0, 1, and slot 1 is an
- eUICC, then the value of this array should be:
- <integer-array name="non_removable_euicc_slots">
- <item>1</item>
- </integer-array>
- If a device has three physical slots and slot 1 and 2 are eUICCs, then the value of
- this array should be:
- <integer-array name="non_removable_euicc_slots">
- <item>1</item>
- <item>2</item>
- </integer-array>
- This is used to differentiate between removable eUICCs and built in eUICCs, and should
- be set by OEMs for devices which use eUICCs. -->
- <integer-array name="non_removable_euicc_slots">
- <item>0</item>
- </integer-array>
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml
deleted file mode 100644
index 7e3d950..0000000
--- a/rro_overlays/TelephonyOverlay/Common/res/values/donottranslate_config.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2019 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>
- <!-- Config determines whether to update phone object when voice registration
- state changes. Voice radio tech change will always trigger an update of
- phone object irrespective of this config -->
- <bool name="config_switch_phone_on_voice_reg_state_change">false</bool>
-
- <!-- Boolean indicating if restoring network selection should be skipped -->
- <!-- The restoring is handled by modem if it is true -->
- <bool translatable="false" name="skip_restoring_network_selection">true</bool>
-
-
- <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
- is not necessarily the same as the number of phones/logical modems supported by the device.
- For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots,
- or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM
- and one pSIM) -->
- <integer name="config_num_physical_slots">2</integer>
-
- <!-- Is the device capable of hot swapping an UICC Card -->
- <bool name="config_hotswapCapable">true</bool>
-
- <!-- An array of device capabilities defined by GSMA SGP.22 v2.0, and their corresponding major
- version. -->
- <string-array translatable="false" name="config_telephonyEuiccDeviceCapabilities">
- <item>"gsm,11"</item>
- <item>"utran,11"</item>
- <item>"cdma1x,1"</item>
- <item>"hrpd,3"</item>
- <item>"ehrpd,12"</item>
- <item>"eutran,11"</item>
- </string-array>
-
- <!-- Configure mobile tcp buffer sizes in the form:
- rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
- If no value is found for the rat-name in use, the system default will be applied.
- -->
- <string-array name="config_mobile_tcp_buffers">
- <item>umts:131072,262144,1452032,4096,16384,399360</item>
- <item>hspa:131072,262144,2441216,4096,16384,399360</item>
- <item>hsupa:131072,262144,2441216,4096,16384,399360</item>
- <item>hsdpa:131072,262144,2441216,4096,16384,399360</item>
- <item>hspap:131072,262144,2441216,4096,16384,399360</item>
- <item>edge:16384,32768,131072,4096,16384,65536</item>
- <item>gprs:4096,8192,24576,4096,8192,24576</item>
- <item>1xrtt:16384,32768,131070,4096,16384,102400</item>
- <item>evdo:131072,262144,1048576,4096,16384,524288</item>
- <item>lte:524288,1048576,8388608,262144,524288,4194304</item>
- </string-array>
-
- <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
- <string name="config_ims_package" translatable="false">org.codeaurora.ims</string>
-
- <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
- <bool name="config_dynamic_bind_ims">true</bool>
-
- <!-- Flag specifying whether VoLTE is availasble on device -->
- <bool name="config_device_volte_available">true</bool>
-
- <!-- Flag specifying whether VoLTE is available on device -->
- <bool name="config_device_vt_available">true</bool>
-
- <!-- Flag specifying whether WFC over IMS is availasble on device -->
- <bool name="config_device_wfc_ims_available">true</bool>
-
- <!-- Enable video pause workaround when enabling/disabling the camera. -->
- <bool name="config_useVideoPauseWorkaround">true</bool>
-
- <!-- Use ERI text for network name on CDMA LTE -->
- <bool name="config_LTE_eri_for_network_name">true</bool>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Crosshatch/res/values-mcc310-mnc004/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Crosshatch/res/values-mcc310-mnc004/donottranslate_config.xml
deleted file mode 100644
index 12a4c7c..0000000
--- a/rro_overlays/TelephonyOverlay/Crosshatch/res/values-mcc310-mnc004/donottranslate_config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">g013c</string>
- <!-- MMS user agent profile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g013c/g013c.xml</string>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Crosshatch/res/values-mcc311-mnc480/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Crosshatch/res/values-mcc311-mnc480/donottranslate_config.xml
deleted file mode 100644
index 12a4c7c..0000000
--- a/rro_overlays/TelephonyOverlay/Crosshatch/res/values-mcc311-mnc480/donottranslate_config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2018, 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.
-*/
--->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
-<resources>
-
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">g013c</string>
- <!-- MMS user agent profile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://uaprof.vtext.com/google/g013c/g013c.xml</string>
-
-</resources>
diff --git a/rro_overlays/TelephonyOverlay/Crosshatch/res/values/donottranslate_config.xml b/rro_overlays/TelephonyOverlay/Crosshatch/res/values/donottranslate_config.xml
deleted file mode 100644
index 1cb13db..0000000
--- a/rro_overlays/TelephonyOverlay/Crosshatch/res/values/donottranslate_config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2019 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>
- <!-- MMS user agent string -->
- <string name="config_mms_user_agent" translatable="false">g013c</string>
- <!-- MMS user agent profile url -->
- <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G013C.xml</string>
-</resources>
