Merge "Bluetooth: Disable LPM for ROME" into mnc-dr-dev
diff --git a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml b/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
index e485672..1c60410 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc310-mnc120/config.xml
@@ -65,6 +65,9 @@
<!-- sms encoded as octet is decoded by utf8 decoder. if it is true -->
<bool name="config_sms_utf8_support">true</bool>
+ <!-- Sprint need a 3s delay for 3way call -->
+ <integer name="config_cdma_3waycall_flash_delay">300</integer>
+
<!-- Entitlement APP provisioning for Tethering -->
<string-array translatable="false" name="config_mobile_hotspot_provision_app">
<item>com.lge.entitlement</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml
index 35f34cc..7651e3d 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc490/config.xml
@@ -62,6 +62,9 @@
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/R5LkS9d9_LIAeJ1_/Nexus5X-M10.xml</string>
+ <!-- Sprint need a 3s delay for 3way call -->
+ <integer name="config_cdma_3waycall_flash_delay">300</integer>
+
<!-- Entitlement APP provisioning for Tethering -->
<string-array translatable="false" name="config_mobile_hotspot_provision_app">
<item>com.lge.entitlement</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml
index 35f34cc..7651e3d 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc311-mnc870/config.xml
@@ -62,6 +62,9 @@
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/R5LkS9d9_LIAeJ1_/Nexus5X-M10.xml</string>
+ <!-- Sprint need a 3s delay for 3way call -->
+ <integer name="config_cdma_3waycall_flash_delay">300</integer>
+
<!-- Entitlement APP provisioning for Tethering -->
<string-array translatable="false" name="config_mobile_hotspot_provision_app">
<item>com.lge.entitlement</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc312-mnc530/config.xml b/overlay/frameworks/base/core/res/res/values-mcc312-mnc530/config.xml
index 872965a..a645761 100644
--- a/overlay/frameworks/base/core/res/res/values-mcc312-mnc530/config.xml
+++ b/overlay/frameworks/base/core/res/res/values-mcc312-mnc530/config.xml
@@ -61,6 +61,9 @@
<!-- MMS user agent prolfile url -->
<string name="config_mms_user_agent_profile_url" translatable="false">http://gsm.lge.com/html/gsm/R5LkS9d9_LIAeJ1_/Nexus5X-M10.xml</string>
+ <!-- Sprint need a 3s delay for 3way call -->
+ <integer name="config_cdma_3waycall_flash_delay">300</integer>
+
<!-- Entitlement APP provisioning for Tethering -->
<string-array translatable="false" name="config_mobile_hotspot_provision_app">
<item>com.lge.entitlement</item>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc440-mnc00/config.xml b/overlay/frameworks/base/core/res/res/values-mcc440-mnc00/config.xml
deleted file mode 100644
index e8a82d5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc440-mnc00/config.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2015, 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>
-
- <string-array translatable="false" name="config_default_vm_number">
- <!-- SBM -->
- <item>1416</item>
- </string-array>
-
- <!-- Set initial MaxRetry value for operators -->
- <integer name="config_mdc_initial_max_retry">10</integer>
-
- <!-- Entitlement APP provisioning for Tethering -->
- <string-array translatable="false" name="config_mobile_hotspot_provision_app">
- <item>com.lge.entitlement</item>
- <item>com.lge.entitlement.EntitlementDialogActivity</item>
- </string-array>
- <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
- <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
-
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc441-mnc00/config.xml b/overlay/frameworks/base/core/res/res/values-mcc441-mnc00/config.xml
deleted file mode 100644
index e8a82d5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc441-mnc00/config.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2015, 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>
-
- <string-array translatable="false" name="config_default_vm_number">
- <!-- SBM -->
- <item>1416</item>
- </string-array>
-
- <!-- Set initial MaxRetry value for operators -->
- <integer name="config_mdc_initial_max_retry">10</integer>
-
- <!-- Entitlement APP provisioning for Tethering -->
- <string-array translatable="false" name="config_mobile_hotspot_provision_app">
- <item>com.lge.entitlement</item>
- <item>com.lge.entitlement.EntitlementDialogActivity</item>
- </string-array>
- <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
- <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
-
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values-mcc441-mnc20/config.xml b/overlay/frameworks/base/core/res/res/values-mcc441-mnc20/config.xml
deleted file mode 100644
index e8a82d5..0000000
--- a/overlay/frameworks/base/core/res/res/values-mcc441-mnc20/config.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2015, 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>
-
- <string-array translatable="false" name="config_default_vm_number">
- <!-- SBM -->
- <item>1416</item>
- </string-array>
-
- <!-- Set initial MaxRetry value for operators -->
- <integer name="config_mdc_initial_max_retry">10</integer>
-
- <!-- Entitlement APP provisioning for Tethering -->
- <string-array translatable="false" name="config_mobile_hotspot_provision_app">
- <item>com.lge.entitlement</item>
- <item>com.lge.entitlement.EntitlementDialogActivity</item>
- </string-array>
- <string translatable="false" name="config_mobile_hotspot_provision_app_no_ui">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK</string>
- <string translatable="false" name="config_mobile_hotspot_provision_response">com.lge.entitlement.SILENT_ENTITLEMENT_CHECK_RESULT</string>
-
-</resources>
