commit 2d05f8db63642c514cf29d9841fcaa15a14c6965
author Youming Ye <paulye@google.com> Wed Apr 10 10:11:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 10 10:11:42 2019 -0700
tree 1bb6576139753a2d62593a4a2b87b10b740a94bb
parent 379ad53004f7303e76f92d9950733023361133be
parent 8bfba76cf2426396f1b0ce73cdb0827788790fe7

Disable companion and car mode role in role manager adapter
am: 8bfba76cf2

Change-Id: I6587d77a65b8e1bb0031a9b3ec586fa447a19739

src/com/android/server/telecom/RoleManagerAdapterImpl.java

diff --git a/src/com/android/server/telecom/RoleManagerAdapterImpl.java b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
index 615ee11..5fb8451 100644
--- a/src/com/android/server/telecom/RoleManagerAdapterImpl.java
+++ b/src/com/android/server/telecom/RoleManagerAdapterImpl.java
@@ -31,9 +31,7 @@
 
 public class RoleManagerAdapterImpl implements RoleManagerAdapter {
     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;
@@ -77,8 +75,6 @@
     @Override
     public List<String> getCallCompanionApps() {
         List<String> callCompanionApps = new ArrayList<>();
-        // List from RoleManager is not resizable. AbstractList.add action is not supported.
-        callCompanionApps.addAll(getRoleManagerCallCompanionApps());
         callCompanionApps.addAll(mOverrideCallCompanionApps);
         return callCompanionApps;
     }
@@ -119,17 +115,14 @@
         return roleHolders.get(0);
     }
 
+    // TODO in R: query and return car mode apps
     private String getRoleManagerCarModeDialerApp() {
-        List<String> roleHolders = mRoleManager.getRoleHoldersAsUser(ROLE_CAR_MODE_DIALER,
-                mCurrentUserHandle);
-        if (roleHolders == null || roleHolders.isEmpty()) {
-            return null;
-        }
-        return roleHolders.get(0);
+        return null;
     }
 
+    // TODO in R: Use companion app manager
     private List<String> getRoleManagerCallCompanionApps() {
-        return mRoleManager.getRoleHoldersAsUser(ROLE_CALL_COMPANION_APP, mCurrentUserHandle);
+        return new ArrayList<>();
     }
 
     private String getRoleManagerCallRedirectionApp() {