Revert "Add config to turn on no-preferred-APN option."
breaking jb-mr1-release
This reverts commit b2053cede5216558d5fd20af620e5448979b7acc
Change-Id: Icc20f9214820a9175bd040e167ccdcb97f26923d
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc090/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc150/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc380/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc410/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc560/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc680/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc980/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc980/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc980/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc990/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc990/config.xml
deleted file mode 100644
index c534be5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc990/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2012, 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>
- <!-- Set to true if we need to not prefer an APN.
- This is being added to enable a simple scenario of pre-paid
- provisioning on some carriers, working around a bug (7305641)
- where if the preferred is used we don't try the others. -->
- <bool name="config_dontPreferApn">true</bool>
-</resources>
