Merge "Support Manual Network Selection Config"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 813ad12..72a0cef 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -34,6 +34,7 @@
<protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" />
<protected-broadcast android:name="android.intent.action.DATA_STALL_DETECTED" />
<protected-broadcast android:name="android.intent.action.SIM_STATE_CHANGED" />
+ <protected-broadcast android:name="android.intent.action.USER_ACTIVITY_NOTIFICATION" />
<protected-broadcast android:name="android.telephony.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" />
<protected-broadcast android:name="android.intent.action.ACTION_MDN_STATE_CHANGED" />
<protected-broadcast android:name="android.provider.Telephony.SPN_STRINGS_UPDATED" />
@@ -75,7 +76,7 @@
<protected-broadcast android:name= "com.android.imsconnection.DISCONNECTED" />
<protected-broadcast android:name= "com.android.intent.action.IMS_FEATURE_CHANGED" />
<protected-broadcast android:name= "com.android.intent.action.IMS_CONFIG_CHANGED" />
- <protected-broadcast android:name= "com.android.ims.REGISTRATION_ERROR" />
+ <protected-broadcast android:name= "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR" />
<protected-broadcast android:name= "com.android.phone.vvm.omtp.sms.REQUEST_SENT" />
<protected-broadcast android:name= "com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_VVM_PACKAGE_INSTALLED" />
diff --git a/res/values-af/config.xml b/res/values-af/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-af/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-am/config.xml b/res/values-am/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-am/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ar/config.xml b/res/values-ar/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ar/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-as/config.xml b/res/values-as/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-as/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-az/config.xml b/res/values-az/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-az/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-b+sr+Latn/config.xml b/res/values-b+sr+Latn/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-b+sr+Latn/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-be/config.xml b/res/values-be/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-be/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-bg/config.xml b/res/values-bg/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-bg/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-bn/config.xml b/res/values-bn/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-bn/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-bs/config.xml b/res/values-bs/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-bs/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ca/config.xml b/res/values-ca/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ca/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-cs/config.xml b/res/values-cs/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-cs/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-da/config.xml b/res/values-da/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-da/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-de/config.xml b/res/values-de/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-de/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-el/config.xml b/res/values-el/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-el/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-en-rAU/config.xml b/res/values-en-rAU/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-en-rAU/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-en-rCA/config.xml b/res/values-en-rCA/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-en-rCA/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-en-rGB/config.xml b/res/values-en-rGB/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-en-rGB/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-en-rIN/config.xml b/res/values-en-rIN/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-en-rIN/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-en-rXC/config.xml b/res/values-en-rXC/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-en-rXC/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-es-rUS/config.xml b/res/values-es-rUS/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-es-rUS/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-es/config.xml b/res/values-es/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-es/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-et/config.xml b/res/values-et/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-et/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-eu/config.xml b/res/values-eu/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-eu/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-fa/config.xml b/res/values-fa/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-fa/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-fi/config.xml b/res/values-fi/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-fi/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-fr-rCA/config.xml b/res/values-fr-rCA/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-fr-rCA/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-fr/config.xml b/res/values-fr/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-fr/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-gl/config.xml b/res/values-gl/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-gl/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-gu/config.xml b/res/values-gu/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-gu/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-hi/config.xml b/res/values-hi/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-hi/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-hr/config.xml b/res/values-hr/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-hr/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-hu/config.xml b/res/values-hu/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-hu/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-hy/config.xml b/res/values-hy/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-hy/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-in/config.xml b/res/values-in/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-in/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-is/config.xml b/res/values-is/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-is/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-it/config.xml b/res/values-it/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-it/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-iw/config.xml b/res/values-iw/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-iw/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ja/config.xml b/res/values-ja/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ja/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ka/config.xml b/res/values-ka/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ka/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-kk/config.xml b/res/values-kk/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-kk/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-km/config.xml b/res/values-km/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-km/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-kn/config.xml b/res/values-kn/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-kn/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ko/config.xml b/res/values-ko/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ko/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ky/config.xml b/res/values-ky/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ky/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-lo/config.xml b/res/values-lo/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-lo/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-lt/config.xml b/res/values-lt/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-lt/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-lv/config.xml b/res/values-lv/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-lv/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-mk/config.xml b/res/values-mk/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-mk/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ml/config.xml b/res/values-ml/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ml/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-mn/config.xml b/res/values-mn/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-mn/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-mr/config.xml b/res/values-mr/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-mr/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ms/config.xml b/res/values-ms/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ms/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-my/config.xml b/res/values-my/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-my/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-nb/config.xml b/res/values-nb/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-nb/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ne/config.xml b/res/values-ne/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ne/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-nl/config.xml b/res/values-nl/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-nl/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-or/config.xml b/res/values-or/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-or/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-pa/config.xml b/res/values-pa/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-pa/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-pl/config.xml b/res/values-pl/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-pl/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-pt-rPT/config.xml b/res/values-pt-rPT/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-pt-rPT/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-pt/config.xml b/res/values-pt/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-pt/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ro/config.xml b/res/values-ro/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ro/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ru/config.xml b/res/values-ru/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ru/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-si/config.xml b/res/values-si/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-si/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-sk/config.xml b/res/values-sk/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-sk/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-sl/config.xml b/res/values-sl/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-sl/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-sq/config.xml b/res/values-sq/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-sq/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-sr/config.xml b/res/values-sr/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-sr/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-sv/config.xml b/res/values-sv/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-sv/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-sw/config.xml b/res/values-sw/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-sw/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ta/config.xml b/res/values-ta/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ta/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-te/config.xml b/res/values-te/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-te/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-th/config.xml b/res/values-th/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-th/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-tl/config.xml b/res/values-tl/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-tl/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-tr/config.xml b/res/values-tr/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-tr/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-uk/config.xml b/res/values-uk/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-uk/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-ur/config.xml b/res/values-ur/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-ur/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-uz/config.xml b/res/values-uz/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-uz/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-vi/config.xml b/res/values-vi/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-vi/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-zh-rCN/config.xml b/res/values-zh-rCN/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-zh-rCN/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-zh-rHK/config.xml b/res/values-zh-rHK/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-zh-rHK/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-zh-rTW/config.xml b/res/values-zh-rTW/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-zh-rTW/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values-zu/config.xml b/res/values-zu/config.xml
deleted file mode 100644
index c3f4475..0000000
--- a/res/values-zu/config.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 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.
- -->
-
-<!-- NOTE: Many variables that used to be in this file have been migrated to
- CarrierConfigManager.java. Please consider whether new variables belong
- there before adding to this file. Variables here should be more closely
- related to devices than to networks. -->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="system_visual_voicemail_client" msgid="8236140562734796837"></string>
- <string name="config_ims_mmtel_package" msgid="9015392522044235756"></string>
- <string name="config_ims_rcs_package" msgid="6497765530737193250"></string>
-</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 6906089..d4e4c79 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -209,7 +209,7 @@
<!-- The package to handle visual voicemail if the default dialer or the package
CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING does not handle it -->
- <string name="system_visual_voicemail_client"></string>
+ <string name="system_visual_voicemail_client" translatable="false"/>
<!-- Flag to enable VVM3 visual voicemail. VVM3 is used by Verizon Wireless. -->
<bool name="vvm3_enabled">false</bool>
@@ -236,10 +236,10 @@
<bool name="config_support_rtt">false</bool>
<!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
- <string name="config_ims_mmtel_package"></string>
+ <string name="config_ims_mmtel_package" translatable="false"/>
<!-- String indicating the package name of the device ImsService implementation for RCS. -->
- <string name="config_ims_rcs_package"></string>
+ <string name="config_ims_rcs_package" translatable="false"/>
<!-- The package name for the platform number verification supplier app. -->
<string name="platform_number_verification_package" translatable="false"></string>
diff --git a/src/com/android/phone/CellInfoUtil.java b/src/com/android/phone/CellInfoUtil.java
index 8272029..f6d741f 100644
--- a/src/com/android/phone/CellInfoUtil.java
+++ b/src/com/android/phone/CellInfoUtil.java
@@ -33,6 +33,7 @@
import com.android.internal.telephony.OperatorInfo;
+import java.util.Collections;
import java.util.List;
/**
@@ -149,7 +150,8 @@
mcc,
mnc,
operatorInfo.getOperatorAlphaLong(),
- operatorInfo.getOperatorAlphaShort());
+ operatorInfo.getOperatorAlphaShort(),
+ Collections.emptyList());
CellInfoGsm ci = new CellInfoGsm();
ci.setCellIdentity(cig);
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f63b1df..67bbfef 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -49,6 +49,7 @@
import android.os.ParcelFileDescriptor;
import android.os.ParcelUuid;
import android.os.PersistableBundle;
+import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ServiceSpecificException;
@@ -128,6 +129,7 @@
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.DefaultPhoneNotifier;
import com.android.internal.telephony.HalVersion;
+import com.android.internal.telephony.IBooleanConsumer;
import com.android.internal.telephony.IIntegerConsumer;
import com.android.internal.telephony.INumberVerificationCallback;
import com.android.internal.telephony.ITelephony;
@@ -186,6 +188,8 @@
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
/**
* Implementation of the ITelephony interface.
@@ -271,6 +275,9 @@
private static final int EVENT_CHANGE_ICC_LOCK_PASSWORD_DONE = 77;
private static final int CMD_SET_ICC_LOCK_ENABLED = 78;
private static final int EVENT_SET_ICC_LOCK_ENABLED_DONE = 79;
+ private static final int CMD_SET_SYSTEM_SELECTION_CHANNELS = 80;
+ private static final int EVENT_SET_SYSTEM_SELECTION_CHANNELS_DONE = 81;
+ private static final int MSG_NOTIFY_USER_ACTIVITY = 82;
// Parameters of select command.
private static final int SELECT_COMMAND = 0xA4;
@@ -291,6 +298,12 @@
private SharedPreferences mTelephonySharedPreferences;
private PhoneConfigurationManager mPhoneConfigurationManager;
+ /** User Activity */
+ private AtomicBoolean mNotifyUserActivity;
+ private static final String ACTION_USER_ACTIVITY_NOTIFICATION =
+ "android.intent.action.USER_ACTIVITY_NOTIFICATION";
+ private static final int USER_ACTIVITY_NOTIFICATION_DELAY = 200;
+
private static final String PREF_CARRIERS_ALPHATAG_PREFIX = "carrier_alphtag_";
private static final String PREF_CARRIERS_NUMBER_PREFIX = "carrier_number_";
private static final String PREF_CARRIERS_SUBSCRIBER_PREFIX = "carrier_subscriber_";
@@ -1183,6 +1196,23 @@
}
notifyRequester(request);
break;
+ case CMD_SET_SYSTEM_SELECTION_CHANNELS: {
+ request = (MainThreadRequest) msg.obj;
+ onCompleted = obtainMessage(EVENT_SET_SYSTEM_SELECTION_CHANNELS_DONE, request);
+ Pair<List<RadioAccessSpecifier>, Consumer<Boolean>> args =
+ (Pair<List<RadioAccessSpecifier>, Consumer<Boolean>>) request.argument;
+ request.phone.setSystemSelectionChannels(args.first, onCompleted);
+ break;
+ }
+ case EVENT_SET_SYSTEM_SELECTION_CHANNELS_DONE: {
+ ar = (AsyncResult) msg.obj;
+ request = (MainThreadRequest) ar.userObj;
+ Pair<List<RadioAccessSpecifier>, Consumer<Boolean>> args =
+ (Pair<List<RadioAccessSpecifier>, Consumer<Boolean>>) request.argument;
+ args.second.accept(ar.exception == null);
+ notifyRequester(request);
+ break;
+ }
case EVENT_SET_FORBIDDEN_PLMNS_DONE:
ar = (AsyncResult) msg.obj;
request = (MainThreadRequest) ar.userObj;
@@ -1272,6 +1302,13 @@
notifyRequester(request);
break;
+ case MSG_NOTIFY_USER_ACTIVITY:
+ removeMessages(MSG_NOTIFY_USER_ACTIVITY);
+ Intent intent = new Intent(ACTION_USER_ACTIVITY_NOTIFICATION);
+ intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
+ getDefaultPhone().getContext().sendBroadcastAsUser(
+ intent, UserHandle.ALL, permission.USER_ACTIVITY);
+ break;
default:
Log.w(LOG_TAG, "MainThreadHandler: unexpected message code: " + msg.what);
break;
@@ -2496,6 +2533,17 @@
mApp.enforceCallingOrSelfPermission(android.Manifest.permission.MODIFY_PHONE_STATE, null);
}
+ /**
+ * Make sure the caller is system.
+ *
+ * @throws SecurityException if the caller is not system.
+ */
+ private void enforceSystemCaller() {
+ if (Binder.getCallingUid() != Process.SYSTEM_UID) {
+ throw new SecurityException("Caller must be system");
+ }
+ }
+
private void enforceActiveEmergencySessionPermission() {
mApp.enforceCallingOrSelfPermission(
android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION, null);
@@ -2997,11 +3045,33 @@
@Override
public int getNetworkSelectionMode(int subId) {
- if (!isActiveSubscription(subId)) {
- return TelephonyManager.NETWORK_SELECTION_MODE_UNKNOWN;
+ TelephonyPermissions
+ .enforeceCallingOrSelfReadPrecisePhoneStatePermissionOrCarrierPrivilege(
+ mApp, subId, "getNetworkSelectionMode");
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ if (!isActiveSubscription(subId)) {
+ return TelephonyManager.NETWORK_SELECTION_MODE_UNKNOWN;
+ }
+ return (int) sendRequest(CMD_GET_NETWORK_SELECTION_MODE, null /* argument */, subId);
+ } finally {
+ Binder.restoreCallingIdentity(identity);
}
+ }
- return (int) sendRequest(CMD_GET_NETWORK_SELECTION_MODE, null /* argument */, subId);
+ @Override
+ public PhoneCapability getPhoneCapability(int subId, String callingPackage,
+ String callingFeatureId) {
+ if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(
+ mApp, subId, callingPackage, callingFeatureId, "getPhoneCapability")) {
+ return null;
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ return mPhoneConfigurationManager.getStaticPhoneCapability();
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
}
@Override
@@ -4932,12 +5002,11 @@
TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(
mApp, subId, "setNetworkSelectionModeAutomatic");
- if (!isActiveSubscription(subId)) {
- return;
- }
-
final long identity = Binder.clearCallingIdentity();
try {
+ if (!isActiveSubscription(subId)) {
+ return;
+ }
if (DBG) log("setNetworkSelectionModeAutomatic: subId " + subId);
sendRequest(CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC, null, subId);
} finally {
@@ -5323,6 +5392,34 @@
}
/**
+ * Enable or disable always reporting signal strength changes from radio.
+ *
+ * @param isEnable {@code true} for enabling; {@code false} for disabling.
+ */
+ @Override
+ public void setAlwaysReportSignalStrength(int subId, boolean isEnable) {
+ enforceModifyPermission();
+ enforceSystemCaller();
+
+ final long identity = Binder.clearCallingIdentity();
+ final Phone phone = getPhone(subId);
+ try {
+ if (phone != null) {
+ if (DBG) {
+ log("setAlwaysReportSignalStrength: subId=" + subId
+ + " isEnable=" + isEnable);
+ }
+ phone.setAlwaysReportSignalStrength(isEnable);
+ } else {
+ loge("setAlwaysReportSignalStrength: no phone found for subId="
+ + subId);
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
+ /**
* Get the user enabled state of Mobile Data.
*
* TODO: remove and use isUserDataEnabled.
@@ -7732,7 +7829,7 @@
loge("isMultiSimSupportedInternal: no static configuration available");
return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
}
- if (staticCapability.logicalModemList.size() < 2) {
+ if (staticCapability.getLogicalModemUuids().size() < 2) {
loge("isMultiSimSupportedInternal: maximum number of modem is < 2");
return TelephonyManager.MULTISIM_NOT_SUPPORTED_BY_HARDWARE;
}
@@ -7917,6 +8014,39 @@
}
@Override
+ public void setSystemSelectionChannels(List<RadioAccessSpecifier> specifiers,
+ int subscriptionId, IBooleanConsumer resultCallback) {
+ enforceModifyPermission();
+ long token = Binder.clearCallingIdentity();
+ try {
+ Phone phone = getPhone(subscriptionId);
+ if (phone == null) {
+ try {
+ if (resultCallback != null) {
+ resultCallback.accept(false);
+ }
+ } catch (RemoteException e) {
+ // ignore
+ }
+ return;
+ }
+ Pair<List<RadioAccessSpecifier>, Consumer<Boolean>> argument =
+ Pair.create(specifiers, (x) -> {
+ try {
+ if (resultCallback != null) {
+ resultCallback.accept(x);
+ }
+ } catch (RemoteException e) {
+ // ignore
+ }
+ });
+ sendRequestAsync(CMD_SET_SYSTEM_SELECTION_CHANNELS, argument, phone, null);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
public boolean isMvnoMatched(int subId, int mvnoType, @NonNull String mvnoMatchData) {
IccRecords iccRecords = UiccController.getInstance().getIccRecords(
SubscriptionManager.getPhoneId(subId), UiccController.APP_FAM_3GPP);
@@ -8154,4 +8284,42 @@
}
return 0;
}
+
+ /**
+ * Request for receiving user activity notification
+ */
+ @Override
+ public void requestUserActivityNotification() {
+ if (!mNotifyUserActivity.get()
+ && !mMainThreadHandler.hasMessages(MSG_NOTIFY_USER_ACTIVITY)) {
+ mNotifyUserActivity.set(true);
+ }
+ }
+
+ /**
+ * Called when userActivity is signalled in the power manager.
+ * This is safe to call from any thread, with any window manager locks held or not.
+ */
+ @Override
+ public void userActivity() {
+ // ***************************************
+ // * Inherited from PhoneWindowManager *
+ // ***************************************
+ // THIS IS CALLED FROM DEEP IN THE POWER MANAGER
+ // WITH ITS LOCKS HELD.
+ //
+ // This code must be VERY careful about the locks
+ // it acquires.
+ // In fact, the current code acquires way too many,
+ // and probably has lurking deadlocks.
+
+ if (Binder.getCallingUid() != Process.SYSTEM_UID) {
+ throw new SecurityException("Only the OS may call notifyUserActivity()");
+ }
+
+ if (mNotifyUserActivity.getAndSet(false)) {
+ mMainThreadHandler.sendEmptyMessageDelayed(MSG_NOTIFY_USER_ACTIVITY,
+ USER_ACTIVITY_NOTIFICATION_DELAY);
+ }
+ }
}
diff --git a/src/com/android/phone/ServiceStateProvider.java b/src/com/android/phone/ServiceStateProvider.java
index 00269e0..a7d27d5 100644
--- a/src/com/android/phone/ServiceStateProvider.java
+++ b/src/com/android/phone/ServiceStateProvider.java
@@ -17,32 +17,9 @@
package com.android.phone;
import static android.provider.Telephony.ServiceStateTable;
-import static android.provider.Telephony.ServiceStateTable.CDMA_DEFAULT_ROAMING_INDICATOR;
-import static android.provider.Telephony.ServiceStateTable.CDMA_ERI_ICON_INDEX;
-import static android.provider.Telephony.ServiceStateTable.CDMA_ERI_ICON_MODE;
-import static android.provider.Telephony.ServiceStateTable.CDMA_ROAMING_INDICATOR;
import static android.provider.Telephony.ServiceStateTable.CONTENT_URI;
-import static android.provider.Telephony.ServiceStateTable.CSS_INDICATOR;
-import static android.provider.Telephony.ServiceStateTable.DATA_OPERATOR_ALPHA_LONG;
-import static android.provider.Telephony.ServiceStateTable.DATA_OPERATOR_ALPHA_SHORT;
-import static android.provider.Telephony.ServiceStateTable.DATA_OPERATOR_NUMERIC;
-import static android.provider.Telephony.ServiceStateTable.DATA_REG_STATE;
-import static android.provider.Telephony.ServiceStateTable.DATA_ROAMING_TYPE;
-import static android.provider.Telephony.ServiceStateTable.IS_EMERGENCY_ONLY;
import static android.provider.Telephony.ServiceStateTable.IS_MANUAL_NETWORK_SELECTION;
-import static android.provider.Telephony.ServiceStateTable.IS_USING_CARRIER_AGGREGATION;
-import static android.provider.Telephony.ServiceStateTable.NETWORK_ID;
-import static android.provider.Telephony.ServiceStateTable.OPERATOR_ALPHA_LONG_RAW;
-import static android.provider.Telephony.ServiceStateTable.OPERATOR_ALPHA_SHORT_RAW;
-import static android.provider.Telephony.ServiceStateTable.RIL_DATA_RADIO_TECHNOLOGY;
-import static android.provider.Telephony.ServiceStateTable.RIL_VOICE_RADIO_TECHNOLOGY;
-import static android.provider.Telephony.ServiceStateTable.SERVICE_STATE;
-import static android.provider.Telephony.ServiceStateTable.SYSTEM_ID;
-import static android.provider.Telephony.ServiceStateTable.VOICE_OPERATOR_ALPHA_LONG;
-import static android.provider.Telephony.ServiceStateTable.VOICE_OPERATOR_ALPHA_SHORT;
-import static android.provider.Telephony.ServiceStateTable.VOICE_OPERATOR_NUMERIC;
import static android.provider.Telephony.ServiceStateTable.VOICE_REG_STATE;
-import static android.provider.Telephony.ServiceStateTable.VOICE_ROAMING_TYPE;
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionId;
import static android.provider.Telephony.ServiceStateTable.getUriForSubscriptionIdAndField;
@@ -74,6 +51,186 @@
public static final String AUTHORITY = ServiceStateTable.AUTHORITY;
public static final Uri AUTHORITY_URI = Uri.parse("content://" + AUTHORITY);
+ /**
+ * The current service state.
+ *
+ * This is the entire {@link ServiceState} object in byte array.
+ *
+ * @hide
+ */
+ public static final String SERVICE_STATE = "service_state";
+
+ /**
+ * An integer value indicating the current data service state.
+ * <p>
+ * Valid values: {@link ServiceState#STATE_IN_SERVICE},
+ * {@link ServiceState#STATE_OUT_OF_SERVICE}, {@link ServiceState#STATE_EMERGENCY_ONLY},
+ * {@link ServiceState#STATE_POWER_OFF}.
+ * <p>
+ * This is the same as {@link ServiceState#getDataRegState()}.
+ * @hide
+ */
+ public static final String DATA_REG_STATE = "data_reg_state";
+
+ /**
+ * An integer value indicating the current voice roaming type.
+ * <p>
+ * This is the same as {@link ServiceState#getVoiceRoamingType()}.
+ * @hide
+ */
+ public static final String VOICE_ROAMING_TYPE = "voice_roaming_type";
+
+ /**
+ * An integer value indicating the current data roaming type.
+ * <p>
+ * This is the same as {@link ServiceState#getDataRoamingType()}.
+ * @hide
+ */
+ public static final String DATA_ROAMING_TYPE = "data_roaming_type";
+
+ /**
+ * The current registered voice network operator name in long alphanumeric format.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorAlphaLong()}.
+ * @hide
+ */
+ public static final String VOICE_OPERATOR_ALPHA_LONG = "voice_operator_alpha_long";
+
+ /**
+ * The current registered operator name in short alphanumeric format.
+ * <p>
+ * In GSM/UMTS, short format can be up to 8 characters long. The current registered voice
+ * network operator name in long alphanumeric format.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorAlphaShort()}.
+ * @hide
+ */
+ public static final String VOICE_OPERATOR_ALPHA_SHORT = "voice_operator_alpha_short";
+
+ /**
+ * The current registered operator numeric id.
+ * <p>
+ * In GSM/UMTS, numeric format is 3 digit country code plus 2 or 3 digit
+ * network code.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorNumeric()}.
+ */
+ public static final String VOICE_OPERATOR_NUMERIC = "voice_operator_numeric";
+
+ /**
+ * The current registered data network operator name in long alphanumeric format.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorAlphaLong()}.
+ * @hide
+ */
+ public static final String DATA_OPERATOR_ALPHA_LONG = "data_operator_alpha_long";
+
+ /**
+ * The current registered data network operator name in short alphanumeric format.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorAlphaShort()}.
+ * @hide
+ */
+ public static final String DATA_OPERATOR_ALPHA_SHORT = "data_operator_alpha_short";
+
+ /**
+ * The current registered data network operator numeric id.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorNumeric()}.
+ * @hide
+ */
+ public static final String DATA_OPERATOR_NUMERIC = "data_operator_numeric";
+
+ /**
+ * This is the same as {@link ServiceState#getRilVoiceRadioTechnology()}.
+ * @hide
+ */
+ public static final String RIL_VOICE_RADIO_TECHNOLOGY = "ril_voice_radio_technology";
+
+ /**
+ * This is the same as {@link ServiceState#getRilDataRadioTechnology()}.
+ * @hide
+ */
+ public static final String RIL_DATA_RADIO_TECHNOLOGY = "ril_data_radio_technology";
+
+ /**
+ * This is the same as {@link ServiceState#getCssIndicator()}.
+ * @hide
+ */
+ public static final String CSS_INDICATOR = "css_indicator";
+
+ /**
+ * This is the same as {@link ServiceState#getCdmaNetworkId()}.
+ * @hide
+ */
+ public static final String NETWORK_ID = "network_id";
+
+ /**
+ * This is the same as {@link ServiceState#getCdmaSystemId()}.
+ * @hide
+ */
+ public static final String SYSTEM_ID = "system_id";
+
+ /**
+ * This is the same as {@link ServiceState#getCdmaRoamingIndicator()}.
+ * @hide
+ */
+ public static final String CDMA_ROAMING_INDICATOR = "cdma_roaming_indicator";
+
+ /**
+ * This is the same as {@link ServiceState#getCdmaDefaultRoamingIndicator()}.
+ * @hide
+ */
+ public static final String CDMA_DEFAULT_ROAMING_INDICATOR =
+ "cdma_default_roaming_indicator";
+
+ /**
+ * This is the same as {@link ServiceState#getCdmaEriIconIndex()}.
+ * @hide
+ */
+ public static final String CDMA_ERI_ICON_INDEX = "cdma_eri_icon_index";
+
+ /**
+ * This is the same as {@link ServiceState#getCdmaEriIconMode()}.
+ * @hide
+ */
+ public static final String CDMA_ERI_ICON_MODE = "cdma_eri_icon_mode";
+
+ /**
+ * This is the same as {@link ServiceState#isEmergencyOnly()}.
+ * @hide
+ */
+ public static final String IS_EMERGENCY_ONLY = "is_emergency_only";
+
+ /**
+ * This is the same as {@link ServiceState#getDataRoamingFromRegistration()}.
+ * @hide
+ */
+ public static final String IS_DATA_ROAMING_FROM_REGISTRATION =
+ "is_data_roaming_from_registration";
+
+ /**
+ * This is the same as {@link ServiceState#isUsingCarrierAggregation()}.
+ * @hide
+ */
+ public static final String IS_USING_CARRIER_AGGREGATION = "is_using_carrier_aggregation";
+
+ /**
+ * The current registered raw data network operator name in long alphanumeric format.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorAlphaLongRaw()}.
+ * @hide
+ */
+ public static final String OPERATOR_ALPHA_LONG_RAW = "operator_alpha_long_raw";
+
+ /**
+ * The current registered raw data network operator name in short alphanumeric format.
+ * <p>
+ * This is the same as {@link ServiceState#getOperatorAlphaShortRaw()}.
+ * @hide
+ */
+ public static final String OPERATOR_ALPHA_SHORT_RAW = "operator_alpha_short_raw";
+
private final HashMap<Integer, ServiceState> mServiceStates = new HashMap<>();
private static final String[] sColumns = {
VOICE_REG_STATE,
@@ -389,4 +546,21 @@
return true;
}
+
+ /**
+ * Used to insert a ServiceState into the ServiceStateProvider as a ContentValues instance.
+ *
+ * @param state the ServiceState to convert into ContentValues
+ * @return the convertedContentValues instance
+ * @hide
+ */
+ public static ContentValues getContentValuesForServiceState(ServiceState state) {
+ ContentValues values = new ContentValues();
+ final Parcel p = Parcel.obtain();
+ state.writeToParcel(p, 0);
+ // Turn the parcel to byte array. Safe to do this because the content values were never
+ // written into a persistent storage. ServiceStateProvider keeps values in the memory.
+ values.put(SERVICE_STATE, p.marshall());
+ return values;
+ }
}
diff --git a/src/com/android/services/telephony/CdmaConference.java b/src/com/android/services/telephony/CdmaConference.java
old mode 100755
new mode 100644
index 693fd16..32badd0
--- a/src/com/android/services/telephony/CdmaConference.java
+++ b/src/com/android/services/telephony/CdmaConference.java
@@ -73,6 +73,16 @@
}
@Override
+ public void onAnswer(int videoState) {
+ Log.e(this, new Exception(), "Answer not supported for CDMA conference call.");
+ }
+
+ @Override
+ public void onReject() {
+ Log.e(this, new Exception(), "Reject not supported for CDMA conference call.");
+ }
+
+ @Override
public void onHold() {
Log.e(this, new Exception(), "Hold not supported for CDMA conference call.");
}
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index e8386e8..dd000ce 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -199,6 +199,18 @@
TelephonyConnection telephonyConnection = (TelephonyConnection) c;
handleConferenceParticipantsUpdate(telephonyConnection, participants);
}
+
+ /**
+ * Handles request to play a ringback tone.
+ *
+ * @param c The connection.
+ * @param ringback Whether the ringback tone is to be played.
+ */
+ @Override
+ public void onRingbackRequested(android.telecom.Connection c, boolean ringback) {
+ Log.d(this, "onRingbackRequested ringback %s", ringback ? "Y" : "N");
+ setRingbackRequested(ringback);
+ }
};
/**
@@ -224,6 +236,11 @@
private TelecomAccountRegistry mTelecomAccountRegistry;
/**
+ * The participant with which Adhoc Conference call is getting formed.
+ */
+ private List<Uri> mParticipants;
+
+ /**
* The known conference participant connections. The HashMap is keyed by a Pair containing
* the handle and endpoint Uris.
* Access to the hashmap is protected by the {@link #mUpdateSyncRoot}.
@@ -383,6 +400,10 @@
conferenceProperties = changeBitmask(conferenceProperties,
Connection.PROPERTY_REMOTELY_HOSTED, !isConferenceHost());
+ conferenceProperties = changeBitmask(conferenceProperties,
+ Connection.PROPERTY_IS_ADHOC_CONFERENCE,
+ (properties & Connection.PROPERTY_IS_ADHOC_CONFERENCE) != 0);
+
return conferenceProperties;
}
@@ -422,6 +443,26 @@
return VideoProfile.STATE_AUDIO_ONLY;
}
+ public Connection getConferenceHost() {
+ return mConferenceHost;
+ }
+
+ /**
+ * @return The address's to which this Connection is currently communicating.
+ */
+ public final List<Uri> getParticipants() {
+ return mParticipants;
+ }
+
+ /**
+ * Sets the value of the {@link #getParticipants()}.
+ *
+ * @param address The new address's.
+ */
+ public final void setParticipants(List<Uri> address) {
+ mParticipants = address;
+ }
+
/**
* Invoked when the Conference and all its {@link Connection}s should be disconnected.
* <p>
@@ -481,6 +522,28 @@
}
/**
+ * Invoked when the conference is answered.
+ */
+ @Override
+ public void onAnswer(int videoState) {
+ if (mConferenceHost == null) {
+ return;
+ }
+ mConferenceHost.performAnswer(videoState);
+ }
+
+ /**
+ * Invoked when the conference is rejected.
+ */
+ @Override
+ public void onReject() {
+ if (mConferenceHost == null) {
+ return;
+ }
+ mConferenceHost.performReject();
+ }
+
+ /**
* Invoked when the conference should be put on hold.
*/
@Override
@@ -838,7 +901,8 @@
+ "newParticipantcount=%d", oldParticipantCount, newParticipantCount);
// If the single party call emulation fature flag is enabled, we can potentially treat
// the conference as a single party call when there is just one participant.
- if (mFeatureFlagProxy.isUsingSinglePartyCallEmulation()) {
+ if (mFeatureFlagProxy.isUsingSinglePartyCallEmulation() &&
+ !mConferenceHost.isAdhocConferenceCall()) {
if (oldParticipantCount != 1 && newParticipantCount == 1) {
// If number of participants goes to 1, emulate a single party call.
startEmulatingSinglePartyCall();
@@ -1173,11 +1237,13 @@
switch (state) {
case Connection.STATE_INITIALIZING:
case Connection.STATE_NEW:
- case Connection.STATE_RINGING:
// No-op -- not applicable.
break;
+ case Connection.STATE_RINGING:
+ setConferenceOnRinging();
+ break;
case Connection.STATE_DIALING:
- setDialing();
+ setConferenceOnDialing();
break;
case Connection.STATE_DISCONNECTED:
DisconnectCause disconnectCause;
@@ -1198,10 +1264,10 @@
destroyTelephonyConference();
break;
case Connection.STATE_ACTIVE:
- setActive();
+ setConferenceOnActive();
break;
case Connection.STATE_HOLDING:
- setOnHold();
+ setConferenceOnHold();
break;
}
}
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java
index 5445cc4..8789ba8 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -52,8 +52,19 @@
Log.v(ImsConferenceController.class, "onDestroyed: %s", conference);
}
+ if (conference instanceof ImsConference) {
+ // Ims Conference call ended, so UE may now have the ability to initiate
+ // an Adhoc Conference call. Hence, try enabling adhoc conference capability
+ mTelecomAccountRegistry.refreshAdhocConference(true);
+ }
mImsConferences.remove(conference);
}
+
+ @Override
+ public void onStateChanged(Conference conference, int oldState, int newState) {
+ Log.v(this, "onStateChanged: Conference = " + conference);
+ recalculateConferenceable();
+ }
};
private final TelephonyConnection.TelephonyConnectionListener mTelephonyConnectionListener =
@@ -101,10 +112,11 @@
private final ArrayList<TelephonyConnection> mTelephonyConnections = new ArrayList<>();
/**
- * List of known {@link ImsConference}s. Realistically there will only ever be a single
- * concurrent IMS conference.
+ * List of known {@link ImsConference}s. There can be upto maximum two Ims conference calls.
+ * One conference call can be a host conference call and another conference call formed as a
+ * result of accepting incoming conference call.
*/
- private final ArrayList<ImsConference> mImsConferences = new ArrayList<>(1);
+ private final ArrayList<ImsConference> mImsConferences = new ArrayList<>(2);
private TelecomAccountRegistry mTelecomAccountRegistry;
@@ -122,6 +134,17 @@
mFeatureFlagProxy = featureFlagProxy;
}
+ void addConference(ImsConference conference) {
+ if (mImsConferences.contains(conference)) {
+ // Adding a duplicate realistically shouldn't happen.
+ Log.w(this, "addConference - conference already tracked; conference=%s", conference);
+ return;
+ }
+ mImsConferences.add(conference);
+ conference.addTelephonyConferenceListener(mConferenceListener);
+ recalculateConferenceable();
+ }
+
/**
* Adds a new connection to the IMS conference controller.
*
@@ -250,6 +273,11 @@
continue;
}
+ // Since UE cannot host two conference calls, remove the ability to initiate
+ // another conference call as there already exists a conference call, which
+ // is hosted on this device.
+ mTelecomAccountRegistry.refreshAdhocConference(false);
+
switch (conference.getState()) {
case Connection.STATE_ACTIVE:
//fall through
@@ -360,6 +388,10 @@
Log.v(this, "Start new ImsConference - connection: %s", connection);
}
+ if (connection.isAdhocConferenceCall()) {
+ Log.w(this, "start new ImsConference - control should never come here");
+ return;
+ }
// Make a clone of the connection which will become the Ims conference host connection.
// This is necessary since the Connection Service does not support removing a connection
// from Telecom. Instead we create a new instance and remove the old one from telecom.
diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index 69e4020..a917f3d 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -293,7 +293,11 @@
}
} else {
TelecomManager tm = mPhone.getContext().getSystemService(TelecomManager.class);
- tm.addNewIncomingCall(handle, extras);
+ if (connection.isMultiparty()) {
+ tm.addNewIncomingConference(handle, extras);
+ } else {
+ tm.addNewIncomingCall(handle, extras);
+ }
}
}
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index bd789c5..919d3b2 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -49,6 +49,8 @@
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsException;
import android.telephony.ims.ImsMmTelManager;
+import android.telephony.ims.ImsReasonInfo;
+import android.telephony.ims.RegistrationManager;
import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.text.TextUtils;
@@ -86,9 +88,11 @@
private final PstnPhoneCapabilitiesNotifier mPhoneCapabilitiesNotifier;
private boolean mIsEmergency;
private boolean mIsRttCapable;
+ private boolean mIsAdhocConfCapable;
private boolean mIsEmergencyPreferred;
private MmTelFeature.MmTelCapabilities mMmTelCapabilities;
private ImsMmTelManager.CapabilityCallback mMmtelCapabilityCallback;
+ private RegistrationManager.RegistrationCallback mImsRegistrationCallback;
private ImsMmTelManager mMmTelManager;
private final boolean mIsDummy;
private boolean mIsVideoCapable;
@@ -106,6 +110,7 @@
mPhone = phone;
mIsEmergency = isEmergency;
mIsDummy = isDummy;
+ mIsAdhocConfCapable = mPhone.isImsRegistered();
mAccount = registerPstnPhoneAccount(isEmergency, isDummy);
Log.i(this, "Registered phoneAccount: %s with handle: %s",
mAccount, mAccount.getAccountHandle());
@@ -138,15 +143,38 @@
updateRttCapability();
}
};
-
registerMmTelCapabilityCallback();
+
+ mImsRegistrationCallback = new RegistrationManager.RegistrationCallback() {
+ @Override
+ public void onRegistered(int imsRadioTech) {
+ updateAdhocConfCapability(true);
+ }
+
+ @Override
+ public void onRegistering(int imsRadioTech) {
+ updateAdhocConfCapability(false);
+ }
+
+ @Override
+ public void onUnregistered(ImsReasonInfo imsReasonInfo) {
+ updateAdhocConfCapability(false);
+ }
+ };
+ registerImsRegistrationCallback();
}
void teardown() {
mIncomingCallNotifier.teardown();
mPhoneCapabilitiesNotifier.teardown();
- if (mMmTelManager != null && mMmtelCapabilityCallback != null) {
- mMmTelManager.unregisterMmTelCapabilityCallback(mMmtelCapabilityCallback);
+ if (mMmTelManager != null) {
+ if (mMmtelCapabilityCallback != null) {
+ mMmTelManager.unregisterMmTelCapabilityCallback(mMmtelCapabilityCallback);
+ }
+
+ if (mImsRegistrationCallback != null) {
+ mMmTelManager.unregisterImsRegistrationCallback(mImsRegistrationCallback);
+ }
}
}
@@ -171,6 +199,25 @@
}
}
+ private void registerImsRegistrationCallback() {
+ if (mMmTelManager == null || mImsRegistrationCallback == null) {
+ return;
+ }
+
+ try {
+ mMmTelManager.registerImsRegistrationCallback(mContext.getMainExecutor(),
+ mImsRegistrationCallback);
+ } catch (ImsException e) {
+ Log.w(this, "registerImsRegistrationCallback: registration failed, no ImsService"
+ + " available. Exception: " + e.getMessage());
+ return;
+ } catch (IllegalArgumentException e) {
+ Log.w(this, "registerImsRegistrationCallback: registration failed, invalid"
+ + " subscription, Exception" + e.getMessage());
+ return;
+ }
+ }
+
/**
* Trigger re-registration of this account.
*/
@@ -322,6 +369,12 @@
extras.putAll(getPhoneAccountExtras());
}
+ if (mIsAdhocConfCapable && isCarrierAdhocConferenceCallSupported()) {
+ capabilities |= PhoneAccount.CAPABILITY_ADHOC_CONFERENCE_CALLING;
+ } else {
+ capabilities &= ~PhoneAccount.CAPABILITY_ADHOC_CONFERENCE_CALLING;
+ }
+
final boolean isHandoverFromSupported = mContext.getResources().getBoolean(
R.bool.config_support_handover_from);
if (isHandoverFromSupported && !isEmergency) {
@@ -512,6 +565,19 @@
}
/**
+ * Determines from carrier config whether adhoc conference calling is supported.
+ *
+ * @return {@code true} if adhoc conference calling is supported, {@code false} otherwise.
+ */
+ private boolean isCarrierAdhocConferenceCallSupported() {
+ PersistableBundle b =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+ return b != null &&
+ b.getBoolean(CarrierConfigManager.KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL);
+ }
+
+
+ /**
* Determines from carrier config whether merging calls is supported.
*
* @return {@code true} if merging calls is supported, {@code false} otherwise.
@@ -665,6 +731,26 @@
}
}
+ public void updateAdhocConfCapability(boolean isAdhocConfCapable) {
+ synchronized (mAccountsLock) {
+ if (!mAccounts.contains(this)) {
+ // Account has already been torn down, don't try to register it again.
+ // This handles the case where teardown has already happened, and we got a Ims
+ // registartion update that lost the race for the mAccountsLock. In such a
+ // scenario by the time we get here, the original phone account could have been
+ // torn down.
+ return;
+ }
+
+ if (isAdhocConfCapable != mIsAdhocConfCapable) {
+ Log.i(this, "updateAdhocConfCapability - changed, new value: "
+ + isAdhocConfCapable);
+ mIsAdhocConfCapable = isAdhocConfCapable;
+ mAccount = registerPstnPhoneAccount(mIsEmergency, mIsDummy);
+ }
+ }
+ }
+
public void updateRttCapability() {
boolean isRttEnabled = isRttCurrentlySupported();
if (isRttEnabled != mIsRttCapable) {
@@ -1049,6 +1135,21 @@
return null;
}
+ public void refreshAdhocConference(boolean isEnableAdhocConf) {
+ synchronized (mAccountsLock) {
+ Log.v(this, "refreshAdhocConference isEnable = " + isEnableAdhocConf);
+ for (AccountEntry entry : mAccounts) {
+ boolean hasAdhocConfCapability = entry.mAccount.hasCapabilities(
+ PhoneAccount.CAPABILITY_ADHOC_CONFERENCE_CALLING);
+ if (!isEnableAdhocConf && hasAdhocConfCapability) {
+ entry.updateAdhocConfCapability(isEnableAdhocConf);
+ } else if (isEnableAdhocConf && !hasAdhocConfCapability) {
+ entry.updateAdhocConfCapability(entry.mPhone.isImsRegistered());
+ }
+ }
+ }
+ }
+
/**
* Returns whethere a the subscription associated with a {@link PhoneAccountHandle} is using a
* sim call manager.
diff --git a/src/com/android/services/telephony/TelephonyConference.java b/src/com/android/services/telephony/TelephonyConference.java
index afbe89d..d720639 100644
--- a/src/com/android/services/telephony/TelephonyConference.java
+++ b/src/com/android/services/telephony/TelephonyConference.java
@@ -93,6 +93,16 @@
}
@Override
+ public void onAnswer(int videoState) {
+ Log.e(this, new Exception(), "Answer not supported for GSM conference call.");
+ }
+
+ @Override
+ public void onReject() {
+ Log.e(this, new Exception(), "Reject not supported for GSM conference call.");
+ }
+
+ @Override
public void onMerge(Connection connection) {
try {
Phone phone = ((TelephonyConnection) connection).getPhone();
diff --git a/src/com/android/services/telephony/TelephonyConferenceBase.java b/src/com/android/services/telephony/TelephonyConferenceBase.java
index 5e7ecf6..1c81fb9 100644
--- a/src/com/android/services/telephony/TelephonyConferenceBase.java
+++ b/src/com/android/services/telephony/TelephonyConferenceBase.java
@@ -48,6 +48,14 @@
public void onConferenceMembershipChanged(Connection connection) {}
/**
+ * Listener called when there conference call state changes.
+ * @param conference The conference.
+ * @param oldState previous state of conference call.
+ * @param newState new state of conference call.
+ */
+ public void onStateChanged(Conference conference, int oldState, int newState) {}
+
+ /**
* Listener called when a conference is destroyed.
* @param conference The conference.
*/
@@ -129,6 +137,54 @@
}
/**
+ * Sets state to be on hold.
+ */
+ public final void setConferenceOnHold() {
+ int oldState = getState();
+ if (oldState == Connection.STATE_HOLDING) {
+ return;
+ }
+ setOnHold();
+ notifyStateChanged(oldState, getState());
+ }
+
+ /**
+ * Sets state to be dialing.
+ */
+ public final void setConferenceOnDialing() {
+ int oldState = getState();
+ if (oldState == Connection.STATE_DIALING) {
+ return;
+ }
+ setDialing();
+ notifyStateChanged(oldState, getState());
+ }
+
+ /**
+ * Sets state to be ringing.
+ */
+ public final void setConferenceOnRinging() {
+ int oldState = getState();
+ if (oldState == Connection.STATE_RINGING) {
+ return;
+ }
+ setRinging();
+ notifyStateChanged(oldState, getState());
+ }
+
+ /**
+ * Sets state to be active.
+ */
+ public final void setConferenceOnActive() {
+ int oldState = getState();
+ if (oldState == Connection.STATE_ACTIVE) {
+ return;
+ }
+ setActive();
+ notifyStateChanged(oldState, getState());
+ }
+
+ /**
* Updates RIL voice radio technology used for current conference after its creation.
*/
public void updateCallRadioTechAfterCreation() {
@@ -188,4 +244,12 @@
listener.onDestroyed(this);
}
}
+
+ private void notifyStateChanged(int oldState, int newState) {
+ if (oldState != newState) {
+ for (TelephonyConferenceListener listener : mListeners) {
+ listener.onStateChanged(this, oldState, newState);
+ }
+ }
+ }
}
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 7d7b72b..f2b2244 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -114,6 +114,9 @@
private static final int MSG_ON_CONNECTION_EVENT = 19;
private static final int MSG_REDIAL_CONNECTION_CHANGED = 20;
+ private List<Uri> mParticipants;
+ private boolean mIsAdhocConferenceCall;
+
private final Handler mHandler = new Handler(Looper.getMainLooper()) {
@Override
public void handleMessage(Message msg) {
@@ -163,7 +166,9 @@
"not foreground connection, skipping");
return;
}
- setRingbackRequested((Boolean) ((AsyncResult) msg.obj).result);
+ boolean ringback = (Boolean) ((AsyncResult) msg.obj).result;
+ setRingbackRequested(ringback);
+ notifyRingbackRequested(ringback);
break;
case MSG_DISCONNECT:
updateState();
@@ -463,6 +468,7 @@
public void onVideoProviderChanged(android.telecom.Connection c,
Connection.VideoProvider videoProvider) {}
public void onVideoStateChanged(android.telecom.Connection c, int videoState) {}
+ public void onRingbackRequested(Connection c, boolean ringback) {}
}
private final PostDialListener mPostDialListener = new PostDialListener() {
@@ -876,14 +882,7 @@
@Override
public void onAnswer(int videoState) {
- Log.v(this, "onAnswer");
- if (isValidRingingCall() && getPhone() != null) {
- try {
- getPhone().acceptCall(videoState);
- } catch (CallStateException e) {
- Log.e(this, e, "Failed to accept call.");
- }
- }
+ performAnswer(videoState);
}
@Override
@@ -927,7 +926,11 @@
@Override
public void onReject() {
- Log.v(this, "onReject");
+ performReject();
+ }
+
+ public void performReject() {
+ Log.v(this, "performReject");
if (isValidRingingCall()) {
mHandler.obtainMessage(MSG_HANGUP, android.telephony.DisconnectCause.INCOMING_REJECTED)
.sendToTarget();
@@ -1001,6 +1004,17 @@
originalConnection.sendRttModifyResponse(textStream);
}
+ public void performAnswer(int videoState) {
+ Log.v(this, "performAnswer");
+ if (isValidRingingCall() && getPhone() != null) {
+ try {
+ getPhone().acceptCall(videoState);
+ } catch (CallStateException e) {
+ Log.e(this, e, "Failed to accept call.");
+ }
+ }
+ }
+
public void performHold() {
Log.v(this, "performHold");
// TODO: Can dialing calls be put on hold as well since they take up the
@@ -1167,6 +1181,8 @@
newProperties = changeBitmask(newProperties, PROPERTY_IS_RTT, isRtt());
newProperties = changeBitmask(newProperties, PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL,
isNetworkIdentifiedEmergencyCall());
+ newProperties = changeBitmask(newProperties, PROPERTY_IS_ADHOC_CONFERENCE,
+ isAdhocConferenceCall());
if (getConnectionProperties() != newProperties) {
setTelephonyConnectionProperties(newProperties);
@@ -1255,6 +1271,7 @@
setTelephonyVideoState(mOriginalConnection.getVideoState());
setOriginalConnectionCapabilities(mOriginalConnection.getConnectionCapabilities());
setIsNetworkIdentifiedEmergencyCall(mOriginalConnection.isNetworkIdentifiedEmergencyCall());
+ setIsAdhocConferenceCall(mOriginalConnection.isAdhocConference());
setAudioModeIsVoip(mOriginalConnection.getAudioModeIsVoip());
setTelephonyVideoProvider(mOriginalConnection.getVideoProvider());
setAudioQuality(mOriginalConnection.getAudioQuality());
@@ -1511,6 +1528,39 @@
return true;
}
+ /**
+ * @return The address's to which this Connection is currently communicating.
+ */
+ public final @Nullable List<Uri> getParticipants() {
+ return mParticipants;
+ }
+
+ /**
+ * Sets the value of the {@link #getParticipants()} property.
+ *
+ * @param address The participant address's.
+ */
+ public final void setParticipants(@Nullable List<Uri> address) {
+ mParticipants = address;
+ }
+
+ /**
+ * @return true if connection is adhocConference call else false.
+ */
+ public final boolean isAdhocConferenceCall() {
+ return mIsAdhocConferenceCall;
+ }
+
+ /**
+ * Sets the value of the {@link #isAdhocConferenceCall()} property.
+ *
+ * @param isAdhocConferenceCall represents if the call is adhoc conference call or not.
+ */
+ public void setIsAdhocConferenceCall(boolean isAdhocConferenceCall) {
+ mIsAdhocConferenceCall = isAdhocConferenceCall;
+ updateConnectionProperties();
+ }
+
private boolean canHoldImsCalls() {
PersistableBundle b = getCarrierConfig();
// Return true if the CarrierConfig is unavailable
@@ -2530,6 +2580,8 @@
}
sb.append(" confSupported:");
sb.append(mIsConferenceSupported ? "Y" : "N");
+ sb.append(" isAdhocConf:");
+ sb.append(isAdhocConferenceCall() ? "Y" : "N");
sb.append("]");
return sb.toString();
}
@@ -2855,6 +2907,16 @@
}
/**
+ * Notifies {@link TelephonyConnectionListener}s of a whether to play Ringback Tone or not.
+ * @param ringback Whether the ringback tone is to be played
+ */
+ private void notifyRingbackRequested(boolean ringback) {
+ for (TelephonyConnectionListener listener : mTelephonyListeners) {
+ listener.onRingbackRequested(this, ringback);
+ }
+ }
+
+ /**
* Notifies {@link TelephonyConnectionListener}s of changes to the video provider for a
* connection.
* @param videoProvider The new video provider.
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 69a2672..8ee285f 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -516,6 +516,136 @@
return super.onUnbind(intent);
}
+ private Conference placeOutgoingConference(ConnectionRequest request,
+ Connection resultConnection, Phone phone) {
+ if (resultConnection instanceof TelephonyConnection) {
+ return placeOutgoingConference((TelephonyConnection) resultConnection, phone, request);
+ }
+ return null;
+ }
+
+ private Conference placeOutgoingConference(TelephonyConnection conferenceHostConnection,
+ Phone phone, ConnectionRequest request) {
+ updatePhoneAccount(conferenceHostConnection, phone);
+ com.android.internal.telephony.Connection originalConnection = null;
+ try {
+ originalConnection = phone.startConference(
+ getParticipantsToDial(request.getParticipants()),
+ new ImsPhone.ImsDialArgs.Builder()
+ .setVideoState(request.getVideoState())
+ .setRttTextStream(conferenceHostConnection.getRttTextStream())
+ .build());
+ } catch (CallStateException e) {
+ Log.e(this, e, "placeOutgoingConference, phone.startConference exception: " + e);
+ handleCallStateException(e, conferenceHostConnection, phone);
+ return null;
+ }
+
+ if (originalConnection == null) {
+ Log.d(this, "placeOutgoingConference, phone.startConference returned null");
+ conferenceHostConnection.setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
+ android.telephony.DisconnectCause.OUTGOING_FAILURE,
+ "conferenceHostConnection is null",
+ phone.getPhoneId()));
+ conferenceHostConnection.clearOriginalConnection();
+ conferenceHostConnection.destroy();
+ } else {
+ conferenceHostConnection.setOriginalConnection(originalConnection);
+ }
+
+ return prepareConference(conferenceHostConnection, request.getAccountHandle());
+ }
+
+ Conference prepareConference(Connection conn, PhoneAccountHandle phoneAccountHandle) {
+ if (!(conn instanceof TelephonyConnection)) {
+ Log.w(this, "prepareConference returning NULL conference");
+ return null;
+ }
+
+ TelephonyConnection connection = (TelephonyConnection)conn;
+ ImsConference conference = new ImsConference(TelecomAccountRegistry.getInstance(this),
+ mTelephonyConnectionServiceProxy, connection,
+ phoneAccountHandle, () -> true);
+ mImsConferenceController.addConference(conference);
+ conference.setVideoState(connection,
+ connection.getVideoState());
+ conference.setVideoProvider(connection,
+ connection.getVideoProvider());
+ conference.setStatusHints(connection.getStatusHints());
+ conference.setAddress(connection.getAddress(),
+ connection.getAddressPresentation());
+ conference.setCallerDisplayName(connection.getCallerDisplayName(),
+ connection.getCallerDisplayNamePresentation());
+ conference.setParticipants(connection.getParticipants());
+ return conference;
+ }
+
+ @Override
+ public @Nullable Conference onCreateIncomingConference(
+ @Nullable PhoneAccountHandle connectionManagerPhoneAccount,
+ @NonNull final ConnectionRequest request) {
+ Log.i(this, "onCreateIncomingConference, request: " + request);
+ Connection connection = onCreateIncomingConnection(connectionManagerPhoneAccount, request);
+ Log.d(this, "onCreateIncomingConference, connection: %s", connection);
+ if (connection == null) {
+ Log.i(this, "onCreateIncomingConference, implementation returned null connection.");
+ return Conference.createFailedConference(
+ new DisconnectCause(DisconnectCause.ERROR, "IMPL_RETURNED_NULL_CONNECTION"),
+ request.getAccountHandle());
+ }
+
+ final Phone phone = getPhoneForAccount(request.getAccountHandle(),
+ false /* isEmergencyCall*/, null /* not an emergency call */);
+ if (phone == null) {
+ Log.d(this, "onCreateIncomingConference, phone is null");
+ return Conference.createFailedConference(
+ DisconnectCauseUtil.toTelecomDisconnectCause(
+ android.telephony.DisconnectCause.OUT_OF_SERVICE,
+ "Phone is null"),
+ request.getAccountHandle());
+ }
+
+ return prepareConference(connection, request.getAccountHandle());
+ }
+
+ @Override
+ public @Nullable Conference onCreateOutgoingConference(
+ @Nullable PhoneAccountHandle connectionManagerPhoneAccount,
+ @NonNull final ConnectionRequest request) {
+ Log.i(this, "onCreateOutgoingConference, request: " + request);
+ Connection connection = onCreateOutgoingConnection(connectionManagerPhoneAccount, request);
+ Log.d(this, "onCreateOutgoingConference, connection: %s", connection);
+ if (connection == null) {
+ Log.i(this, "onCreateOutgoingConference, implementation returned null connection.");
+ return Conference.createFailedConference(
+ new DisconnectCause(DisconnectCause.ERROR, "IMPL_RETURNED_NULL_CONNECTION"),
+ request.getAccountHandle());
+ }
+
+ final Phone phone = getPhoneForAccount(request.getAccountHandle(),
+ false /* isEmergencyCall*/, null /* not an emergency call */);
+ if (phone == null) {
+ Log.d(this, "onCreateOutgoingConference, phone is null");
+ return Conference.createFailedConference(
+ DisconnectCauseUtil.toTelecomDisconnectCause(
+ android.telephony.DisconnectCause.OUT_OF_SERVICE,
+ "Phone is null"),
+ request.getAccountHandle());
+ }
+
+ return placeOutgoingConference(request, connection, phone);
+ }
+
+ private String[] getParticipantsToDial(List<Uri> participants) {
+ String[] participantsToDial = new String[participants.size()];
+ int i = 0;
+ for (Uri participant : participants) {
+ participantsToDial[i] = participant.getSchemeSpecificPart();
+ i++;
+ }
+ return participantsToDial;
+ }
+
@Override
public Connection onCreateOutgoingConnection(
PhoneAccountHandle connectionManagerPhoneAccount,
@@ -523,7 +653,9 @@
Log.i(this, "onCreateOutgoingConnection, request: " + request);
Uri handle = request.getAddress();
- if (handle == null) {
+ boolean isAdhocConference = request.isAdhocConferenceCall();
+
+ if (!isAdhocConference && handle == null) {
Log.d(this, "onCreateOutgoingConnection, handle is null");
return Connection.createFailedConnection(
mDisconnectCauseFactory.toTelecomDisconnectCause(
@@ -626,7 +758,6 @@
}
final String numberToDial = number;
-
final boolean isAirplaneModeOn = mDeviceState.isAirplaneModeOn(this);
boolean needToTurnOnRadio = (isEmergencyNumber && (!isRadioOn() || isAirplaneModeOn))
@@ -698,7 +829,15 @@
if (!isEmergencyNumber) {
final Connection resultConnection = getTelephonyConnection(request, numberToDial,
false, handle, phone);
- return placeOutgoingConnection(request, resultConnection, phone);
+ if (isAdhocConference) {
+ if (resultConnection instanceof TelephonyConnection) {
+ TelephonyConnection conn = (TelephonyConnection)resultConnection;
+ conn.setParticipants(request.getParticipants());
+ }
+ return resultConnection;
+ } else {
+ return placeOutgoingConnection(request, resultConnection, phone);
+ }
} else {
final Connection resultConnection = getTelephonyConnection(request, numberToDial,
true, handle, phone);
@@ -982,7 +1121,7 @@
final TelephonyConnection connection =
createConnectionFor(phone, null, true /* isOutgoing */, request.getAccountHandle(),
- request.getTelecomCallId());
+ request.getTelecomCallId(), request.isAdhocConferenceCall());
if (connection == null) {
return Connection.createFailedConnection(
mDisconnectCauseFactory.toTelecomDisconnectCause(
@@ -995,6 +1134,8 @@
connection.setTelephonyVideoState(request.getVideoState());
connection.setRttTextStream(request.getRttTextStream());
connection.setTtyEnabled(isTtyModeEnabled);
+ connection.setIsAdhocConferenceCall(request.isAdhocConferenceCall());
+ connection.setParticipants(request.getParticipants());
return connection;
}
@@ -1043,7 +1184,8 @@
TelephonyConnection connection =
createConnectionFor(phone, originalConnection, false /* isOutgoing */,
- request.getAccountHandle(), request.getTelecomCallId());
+ request.getAccountHandle(), request.getTelecomCallId(),
+ request.isAdhocConferenceCall());
handleIncomingRtt(request, originalConnection);
if (connection == null) {
return Connection.createCanceledConnection();
@@ -1155,6 +1297,29 @@
connection.close();
}
+ /**
+ * Called by the {@link ConnectionService} when a newly created {@link Conference} has been
+ * added to the {@link ConnectionService} and sent to Telecom. Here it is safe to send
+ * connection events.
+ *
+ * @param conference the {@link Conference}.
+ */
+ @Override
+ public void onCreateConferenceComplete(Conference conference) {
+ if (conference instanceof ImsConference) {
+ ImsConference imsConference = (ImsConference)conference;
+ TelephonyConnection telephonyConnection =
+ (TelephonyConnection)(imsConference.getConferenceHost());
+ maybeSendInternationalCallEvent(telephonyConnection);
+ }
+ }
+
+ public void onCreateIncomingConferenceFailed(PhoneAccountHandle connectionManagerPhoneAccount,
+ ConnectionRequest request) {
+ Log.i(this, "onCreateIncomingConferenceFailed, request: " + request);
+ onCreateIncomingConnectionFailed(connectionManagerPhoneAccount, request);
+ }
+
@Override
public void triggerConferenceRecalculate() {
if (mTelephonyConferenceController.shouldRecalculate()) {
@@ -1502,34 +1667,7 @@
}
} catch (CallStateException e) {
Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);
- int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
- switch (e.getError()) {
- case CallStateException.ERROR_OUT_OF_SERVICE:
- cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
- break;
- case CallStateException.ERROR_POWER_OFF:
- cause = android.telephony.DisconnectCause.POWER_OFF;
- break;
- case CallStateException.ERROR_ALREADY_DIALING:
- cause = android.telephony.DisconnectCause.ALREADY_DIALING;
- break;
- case CallStateException.ERROR_CALL_RINGING:
- cause = android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING;
- break;
- case CallStateException.ERROR_CALLING_DISABLED:
- cause = android.telephony.DisconnectCause.CALLING_DISABLED;
- break;
- case CallStateException.ERROR_TOO_MANY_CALLS:
- cause = android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS;
- break;
- case CallStateException.ERROR_OTASP_PROVISIONING_IN_PROCESS:
- cause = android.telephony.DisconnectCause.OTASP_PROVISIONING_IN_PROCESS;
- break;
- }
- connection.setTelephonyConnectionDisconnected(
- mDisconnectCauseFactory.toTelecomDisconnectCause(cause, e.getMessage(),
- phone.getPhoneId()));
- connection.close();
+ handleCallStateException(e, connection, phone);
return;
}
@@ -1583,12 +1721,55 @@
CarrierConfigManager.KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL, true);
}
+ private void handleCallStateException(CallStateException e, TelephonyConnection connection,
+ Phone phone) {
+ int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
+ switch (e.getError()) {
+ case CallStateException.ERROR_OUT_OF_SERVICE:
+ cause = android.telephony.DisconnectCause.OUT_OF_SERVICE;
+ break;
+ case CallStateException.ERROR_POWER_OFF:
+ cause = android.telephony.DisconnectCause.POWER_OFF;
+ break;
+ case CallStateException.ERROR_ALREADY_DIALING:
+ cause = android.telephony.DisconnectCause.ALREADY_DIALING;
+ break;
+ case CallStateException.ERROR_CALL_RINGING:
+ cause = android.telephony.DisconnectCause.CANT_CALL_WHILE_RINGING;
+ break;
+ case CallStateException.ERROR_CALLING_DISABLED:
+ cause = android.telephony.DisconnectCause.CALLING_DISABLED;
+ break;
+ case CallStateException.ERROR_TOO_MANY_CALLS:
+ cause = android.telephony.DisconnectCause.TOO_MANY_ONGOING_CALLS;
+ break;
+ case CallStateException.ERROR_OTASP_PROVISIONING_IN_PROCESS:
+ cause = android.telephony.DisconnectCause.OTASP_PROVISIONING_IN_PROCESS;
+ break;
+ }
+ connection.setTelephonyConnectionDisconnected(
+ DisconnectCauseUtil.toTelecomDisconnectCause(cause, e.getMessage(),
+ phone.getPhoneId()));
+ connection.close();
+ }
+
private TelephonyConnection createConnectionFor(
Phone phone,
com.android.internal.telephony.Connection originalConnection,
boolean isOutgoing,
PhoneAccountHandle phoneAccountHandle,
String telecomCallId) {
+ return createConnectionFor(phone, originalConnection, isOutgoing, phoneAccountHandle,
+ telecomCallId, false);
+ }
+
+ private TelephonyConnection createConnectionFor(
+ Phone phone,
+ com.android.internal.telephony.Connection originalConnection,
+ boolean isOutgoing,
+ PhoneAccountHandle phoneAccountHandle,
+ String telecomCallId,
+ boolean isAdhocConference) {
TelephonyConnection returnConnection = null;
int phoneType = phone.getPhoneType();
if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
@@ -1599,8 +1780,10 @@
allowsMute, isOutgoing, telecomCallId);
}
if (returnConnection != null) {
- // Listen to Telephony specific callbacks from the connection
- returnConnection.addTelephonyConnectionListener(mTelephonyConnectionListener);
+ if (!isAdhocConference) {
+ // Listen to Telephony specific callbacks from the connection
+ returnConnection.addTelephonyConnectionListener(mTelephonyConnectionListener);
+ }
returnConnection.setVideoPauseSupported(
TelecomAccountRegistry.getInstance(this).isVideoPauseSupported(
phoneAccountHandle));
diff --git a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
index 097c90a..ccb5639 100644
--- a/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
+++ b/testapps/TelephonyManagerTestApp/src/com/android/phone/testapps/telephonymanagertestapp/ParameterParser.java
@@ -19,12 +19,19 @@
import android.content.Context;
import android.telephony.NumberVerificationCallback;
import android.telephony.PhoneNumberRange;
+import android.telephony.RadioAccessSpecifier;
+import android.text.TextUtils;
import android.widget.Toast;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
+import java.util.function.Consumer;
import java.util.function.Function;
+import java.util.stream.Collectors;
class ParameterParser {
private static ParameterParser sInstance;
@@ -42,6 +49,9 @@
put(PhoneNumberRange.class, ParameterParser::parsePhoneNumberRange);
put(Executor.class, s -> parseExecutor(s));
put(NumberVerificationCallback.class, s -> parseNumberVerificationCallback(s));
+ put(Consumer.class, s -> parseConsumer(s));
+ put(List.class, s -> parseList(s));
+ put(RadioAccessSpecifier.class, s -> parseRadioAccessSpecifier(s));
}};
private ParameterParser(Context context) {
@@ -49,6 +59,7 @@
}
Object executeParser(Class type, String input) {
+ if ("null".equals(input)) return null;
return mParsers.getOrDefault(type, s -> null).apply(input);
}
@@ -64,6 +75,57 @@
return mContext.getMainExecutor();
}
+ private Consumer parseConsumer(String input) {
+ return o -> Toast.makeText(mContext, "Consumer: " + String.valueOf(o), Toast.LENGTH_SHORT)
+ .show();
+ }
+
+ /**
+ * input format: (ran)/(band1)+(band2)+.../(chan1)+(chan2)+...
+ * @return
+ */
+ private RadioAccessSpecifier parseRadioAccessSpecifier(String input) {
+ String[] parts = input.split("/");
+ int ran = Integer.parseInt(parts[0]);
+ String[] bandStrings = parts[1].split("\\+");
+ int[] bands = new int[bandStrings.length];
+ String[] chanStrings = parts[2].split("\\+");
+ int[] chans = new int[chanStrings.length];
+
+ for (int i = 0; i < bands.length; i++) {
+ bands[i] = Integer.parseInt(bandStrings[i]);
+ }
+
+ for (int i = 0; i < chans.length; i++) {
+ chans[i] = Integer.parseInt(chanStrings[i]);
+ }
+ return new RadioAccessSpecifier(ran, bands, chans);
+ }
+
+ private List parseList(String input) {
+ if (TextUtils.isEmpty(input)) {
+ return Collections.emptyList();
+ }
+ String[] components = input.split(" ");
+ String className = components[0];
+ Class c;
+ try {
+ c = mContext.getClassLoader().loadClass(className);
+ } catch (ClassNotFoundException e) {
+ Toast.makeText(mContext, "Invalid class " + className,
+ Toast.LENGTH_SHORT).show();
+ return null;
+ }
+ if (!mParsers.containsKey(c)) {
+ Toast.makeText(mContext, "Cannot parse " + className,
+ Toast.LENGTH_SHORT).show();
+ return null;
+ }
+ return Arrays.stream(components).skip(1)
+ .map(mParsers.get(c))
+ .collect(Collectors.toList());
+ }
+
private NumberVerificationCallback parseNumberVerificationCallback(String input) {
return new NumberVerificationCallback() {
@Override
diff --git a/tests/src/com/android/phone/PhoneGlobalsTest.java b/tests/src/com/android/phone/PhoneGlobalsTest.java
new file mode 100644
index 0000000..d45a890
--- /dev/null
+++ b/tests/src/com/android/phone/PhoneGlobalsTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+
+package com.android.phone;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.TelephonyTestBase;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
+
+@RunWith(AndroidJUnit4.class)
+public class PhoneGlobalsTest extends TelephonyTestBase {
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @Test
+ public void testGetImsResources() throws Exception {
+ // Do not use test context here, we are testing that overlaying for different locales works
+ // correctly
+ Context realContext = InstrumentationRegistry.getTargetContext();
+ String defaultImsMmtelPackage = getResourcesForLocale(realContext, Locale.US).getString(
+ R.string.config_ims_mmtel_package);
+ String defaultImsMmtelPackageUk = getResourcesForLocale(realContext, Locale.UK).getString(
+ R.string.config_ims_mmtel_package);
+ assertEquals("locales changed IMS package configuration!", defaultImsMmtelPackage,
+ defaultImsMmtelPackageUk);
+ }
+
+ private Resources getResourcesForLocale(Context context, Locale locale) {
+ Configuration config = new Configuration();
+ config.setToDefaults();
+ config.setLocale(locale);
+ Context localeContext = context.createConfigurationContext(config);
+ return localeContext.getResources();
+ }
+}