Merge "Add labels for ConnectionServices"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2b15c13..8af1758 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -565,17 +565,23 @@
<action android:name="android.telecomm.CallServiceSelector" />
</intent-filter>
</service>
- <service android:name="com.android.services.telephony.GsmConnectionService">
+ <service
+ android:name="com.android.services.telephony.GsmConnectionService"
+ android:label="@string/gsm_connection_service_label">
<intent-filter>
<action android:name="android.telecomm.CallService" />
</intent-filter>
</service>
- <service android:name="com.android.services.telephony.CdmaConnectionService">
+ <service
+ android:name="com.android.services.telephony.CdmaConnectionService"
+ android:label="@string/cdma_connection_service_label">
<intent-filter>
<action android:name="android.telecomm.CallService" />
</intent-filter>
</service>
- <service android:name="com.android.services.telephony.SipConnectionService">
+ <service
+ android:name="com.android.services.telephony.SipConnectionService"
+ android:label="@string/sip_connection_service_label">
<intent-filter>
<action android:name="android.telecomm.CallService" />
</intent-filter>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3333a9e..f08ce8b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1535,4 +1535,13 @@
<!-- Title for button to not use WiFi calling. -->
<string name ="choose_wifi_for_call_no">No</string>
+
+ <!-- Label for GSM connection service. -->
+ <string name="gsm_connection_service_label">Built-in GSM SIM card</string>
+
+ <!-- Label for CDMA connection service. -->
+ <string name="cdma_connection_service_label">Built-in CDMA SIM card</string>
+
+ <!-- Label for SIP connection service. -->
+ <string name="sip_connection_service_label">Built-in Internet calling</string>
</resources>