commit 1c5bbb22db19298e644bf0e34dff3d0d42a85341
author Shuo Qian <shuoq@google.com> Tue Apr 09 21:28:33 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 09 21:28:33 2019 -0700
tree 7f662da81e3a6b80bc548f8404ceb3ddcd77947d
parent 1af05603768b7422492ff66a4dc596f3742fda91
parent 379ad53004f7303e76f92d9950733023361133be

[automerger skipped] Merge "Use Received Uri as Gateway Uri" into qt-dev am: fccf61b643 -s ours
am: 379ad53004 -s ours
am skip reason: change_id Ie7b16411e6d26c88e990009733a9f5a0514d4902 with SHA1 b4f875c9b9 is in history

Change-Id: Ic724d1c1c87374e4b5289968660a4154a8d94c19

res/values-ja/strings.xml

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 0461797..081ec61 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -63,7 +63,7 @@
     <string name="add_blocked_dialog_body" msgid="9030243212265516828">"次の発信元からの通話とテキスト メッセージをブロック"</string>
     <string name="add_blocked_number_hint" msgid="6847675097085433553">"電話番号"</string>
     <string name="block_button" msgid="8822290682524373357">"ブロック"</string>
-    <string name="non_primary_user" msgid="5180129233352533459">"ブロックした番号を表示、管理できるのは端末の所有者のみです。"</string>
+    <string name="non_primary_user" msgid="5180129233352533459">"ブロックした番号を表示、管理できるのはデバイスの所有者のみです。"</string>
     <string name="delete_icon_description" msgid="8903995728252556724">"ブロックを解除"</string>
     <string name="blocked_numbers_butter_bar_title" msgid="438170866438793182">"ブロックが一時的に OFF になっています"</string>
     <string name="blocked_numbers_butter_bar_body" msgid="2223244484319442431">"緊急通報番号に電話をかけたり、テキスト メッセージを送信したりすると、ブロックが OFF になり、緊急通報受理機関からの通話を着信できるようになります。"</string>

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() {