Remove car mode dialer and call companion roles.

Bug: 128861807
Test: presubmit
Change-Id: I8424b407aa34980cee4426a58dc322b4bdcc148b

2 files changed, 0 insertions, 71 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 24717877..8a6bee1d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -619,17 +619,6 @@
     <!-- Description when an app requests to become the default home app. [CHAR LIMIT=60] -->
     <string name="role_home_request_description">No permissions needed</string>
 
-    <!-- Label for the automotive dialer role. [CHAR LIMIT=30] -->
-    <string name="role_car_mode_dialer_label">Default car mode phone app</string>
-    <!-- Short label for the automotive dialer role. [CHAR LIMIT=30] -->
-    <string name="role_car_mode_dialer_short_label">Car mode phone app</string>
-    <!-- Description for the automotive dialer role. [CHAR LIMIT=NONE] -->
-    <string name="role_car_mode_dialer_description"></string>
-    <!-- Template for the title when an app requests to become the default automotive dialer app. [CHAR LIMIT=100] -->
-    <string name="role_car_mode_dialer_request_title">Set <xliff:g id="app_name" example="Super Car Mode Phone">%1$s</xliff:g> as your default car mode phone app?</string>
-    <!-- Description when an app requests to become the default automotive dialer app. [CHAR LIMIT=60] -->
-    <string name="role_car_mode_dialer_request_description"></string>
-
     <!-- Label for the call redirection role. [CHAR LIMIT=30] -->
     <string name="role_call_redirection_label">Default call redirecting app</string>
     <!-- Short label for the call redirection role. [CHAR LIMIT=30] -->
@@ -652,17 +641,6 @@
     <!-- Description when an app requests to become the default call screening app. [CHAR LIMIT=60] -->
     <string name="role_call_screening_request_description">No permissions needed</string>
 
-    <!-- Label for the call companion role. [CHAR LIMIT=30] -->
-    <string name="role_call_companion_label">Default call companion app</string>
-    <!-- Short label for the call companion role. [CHAR LIMIT=30] -->
-    <string name="role_call_companion_short_label">Call companion app</string>
-    <!-- Description for the call companion role. [CHAR LIMIT=NONE] -->
-    <string name="role_call_companion_description"></string>
-    <!-- Template for the title when an app requests to become the default call companion app. [CHAR LIMIT=100] -->
-    <string name="role_call_companion_request_title">Set <xliff:g id="app_name" example="Super Call Companion">%1$s</xliff:g> as your default call companion app?</string>
-    <!-- Description when an app requests to become the default call companion app. [CHAR LIMIT=60] -->
-    <string name="role_call_companion_request_description"></string>
-
     <!-- Subtitle for the application that is the current default application [CHAR LIMIT=30] -->
     <string name="request_role_current_default">Current default</string>
 
diff --git a/res/xml/roles.xml b/res/xml/roles.xml
index 82cc9823..c96d58fd 100644
--- a/res/xml/roles.xml
+++ b/res/xml/roles.xml
@@ -364,29 +364,6 @@
         </preferred-activities>
     </role>
 
-    <!--- @see android.telecom.InCallService -->
-    <role
-        name="android.app.role.CAR_MODE_DIALER"
-        description="@string/role_car_mode_dialer_description"
-        exclusive="true"
-        label="@string/role_car_mode_dialer_label"
-        requestDescription="@string/role_car_mode_dialer_request_description"
-        requestTitle="@string/role_car_mode_dialer_request_title"
-        shortLabel="@string/role_car_mode_dialer_short_label">
-        <required-components>
-            <service permission="android.permission.BIND_INCALL_SERVICE">
-                <meta-data
-                    name="android.telecom.IN_CALL_SERVICE_UI"
-                    value="false"
-                    optional="true" />
-                <meta-data name="android.telecom.IN_CALL_SERVICE_CAR_MODE_UI" value="true" />
-                <intent-filter>
-                    <action name="android.telecom.InCallService" />
-                </intent-filter>
-            </service>
-        </required-components>
-    </role>
-
     <!--- @see android.telecom.CallRedirectionService -->
     <role
         name="android.app.role.CALL_REDIRECTION"
@@ -422,30 +399,4 @@
             </service>
         </required-components>
     </role>
-
-    <!--- @see android.telecom.InCallService -->
-    <role
-        name="android.app.role.CALL_COMPANION"
-        description="@string/role_call_companion_description"
-        exclusive="false"
-        label="@string/role_call_companion_label"
-        requestDescription="@string/role_call_companion_request_description"
-        requestTitle="@string/role_call_companion_request_title"
-        shortLabel="@string/role_call_companion_short_label">
-        <required-components>
-            <service permission="android.permission.BIND_INCALL_SERVICE">
-                <meta-data
-                    name="android.telecom.IN_CALL_SERVICE_UI"
-                    value="false"
-                    optional="true" />
-                <meta-data
-                    name="android.telecom.IN_CALL_SERVICE_CAR_MODE_UI"
-                    value="false"
-                    optional="true" />
-                <intent-filter>
-                    <action name="android.telecom.InCallService" />
-                </intent-filter>
-            </service>
-        </required-components>
-    </role>
 </roles>