Rename the Proxy calling role to Call redirection.
Also drops the _APP suffix in role names, to be consistent with other
roles.
Test: manual
Change-Id: I4ec09c407b4819e0f8c788ae95114f5a00223a46
diff --git a/src/com/android/server/telecom/RoleManagerAdapterImpl.java b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
index 1200aa0..615ee11 100644
--- a/src/com/android/server/telecom/RoleManagerAdapterImpl.java
+++ b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
@@ -30,10 +30,10 @@
import java.util.stream.Collectors;
public class RoleManagerAdapterImpl implements RoleManagerAdapter {
- private static final String ROLE_CALL_REDIRECTION_APP = RoleManager.ROLE_PROXY_CALLING_APP;
- private static final String ROLE_CAR_MODE_DIALER = RoleManager.ROLE_CAR_MODE_DIALER_APP;
- private static final String ROLE_CALL_SCREENING = RoleManager.ROLE_CALL_SCREENING_APP;
- private static final String ROLE_CALL_COMPANION_APP = RoleManager.ROLE_CALL_COMPANION_APP;
+ private static final String ROLE_CALL_REDIRECTION_APP = RoleManager.ROLE_CALL_REDIRECTION;
+ private static final String ROLE_CAR_MODE_DIALER = RoleManager.ROLE_CAR_MODE_DIALER;
+ private static final String ROLE_CALL_SCREENING = RoleManager.ROLE_CALL_SCREENING;
+ private static final String ROLE_CALL_COMPANION_APP = RoleManager.ROLE_CALL_COMPANION;
private String mOverrideDefaultCallRedirectionApp = null;
private String mOverrideDefaultCallScreeningApp = null;
diff --git a/testapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java b/testapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
index 49879d1..fd12a2e 100644
--- a/testapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
+++ b/testapps/src/com/android/server/telecom/testapps/SelfManagedCallingActivity.java
@@ -243,7 +243,7 @@
private void requestCallScreeningRole() {
RoleManager roleManager = (RoleManager) getSystemService(ROLE_SERVICE);
- Intent intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_CALL_SCREENING_APP);
+ Intent intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_CALL_SCREENING);
startActivityForResult(intent, REQUEST_ID);
}
}
\ No newline at end of file