commit a501e993756d9f55b1050d27c19c62043bca65a2
author Andrew Lee <anwlee@google.com> Mon Jun 01 11:44:55 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Jun 01 13:48:51 2015 -0700
tree 64b1288a1619a5df33ef49826c0cdebc40d5b131
parent 2b2634f47dab523bf4e1822c4d1e3654c1b0a91a

Use setIntentExtras instead of setExtras.

There was a recent change to distinguish between extras provided by
Connections, and extras intended for use on Intents.

Bug: 21555553
Change-Id: I42c09427c4c36e7e441091807beac66b7e6f5f21

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

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index afa616c..2d74d88 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -451,7 +451,7 @@
                 true /* isIncoming */,
                 false /* isConference */);
 
-        call.setExtras(extras);
+        call.setIntentExtras(extras);
         // TODO: Move this to be a part of addCall()
         call.addListener(this);
         call.startCreateConnection(mPhoneAccountRegistrar);
@@ -476,7 +476,7 @@
                 true /* isIncoming */,
                 false /* isConference */);
         call.setIsUnknown(true);
-        call.setExtras(extras);
+        call.setIntentExtras(extras);
         call.addListener(this);
         call.startCreateConnection(mPhoneAccountRegistrar);
     }
@@ -584,7 +584,7 @@
             call.setState(CallState.CONNECTING);
         }
 
-        call.setExtras(extras);
+        call.setIntentExtras(extras);
 
         // Do not add the call if it is a potential MMI code.
         if ((isPotentialMMICode(handle) || isPotentialInCallMMICode) && !needsAccountSelection) {