commit 713a53fca9f759d77f3a44ec467566149af6eead
author Linux Build Service Account <lnxbuild@localhost> Sat Oct 24 20:33:40 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Oct 24 20:33:40 2015 -0700
tree 0a5f0a6cb9ddc30b024c6639264cc61e84789d69
parent 90438edd4a14d39480fec8439b0d54b559b08e61
parent e3505b58b483678d0aa542c37d885c36e9bc54e1

Merge "Fix to prevent CTS failures."

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

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index f8e9f19..a3d1399 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -521,7 +521,14 @@
                     if (mCallIdMapper.isValidCallId(callId)
                             || mCallIdMapper.isValidConferenceId(callId)) {
                         Call call = mCallIdMapper.getCall(callId);
-                        if (call != null) {
+                        if (call != null && extras != null) {
+                            if (extras.getParcelable(EMR_DIAL_ACCOUNT) instanceof
+                                    PhoneAccountHandle) {
+                                PhoneAccountHandle account = extras.
+                                        getParcelable(EMR_DIAL_ACCOUNT);
+                                Log.d(this, "setTargetPhoneAccount, account = " + account);
+                                call.setTargetPhoneAccount(account);
+                            }
                             call.setExtras(extras);
                         }
                     }
@@ -644,6 +651,7 @@
     private final ConnectionServiceRepository mConnectionServiceRepository;
     private final PhoneAccountRegistrar mPhoneAccountRegistrar;
     private final CallsManager mCallsManager;
+    private static final String EMR_DIAL_ACCOUNT = "emr_dial_account";
 
     /**
      * Creates a connection service.