commit b0ba087e1ab7b2b14032a2cb1911f3f4ede05531
author Sailesh Nepal <sail@google.com> Tue Jul 08 22:09:50 2014 -0700
committer Sailesh Nepal <sail@google.com> Tue Jul 08 22:09:50 2014 -0700
tree cbd7c3fa6832625aaefa01a8d914bdc71cbd922b
parent 35faf8cf29dc0f4a73935478e0fba957df9619d6

Set PhoneAccount for incoming calls

Change-Id: I4f21b0d4616dd4025b8d598499c221c30bfff5e9

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 49e72b2..5785ee7 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -159,7 +159,7 @@
      * service. */
     private final GatewayInfo mGatewayInfo;
 
-    private final PhoneAccount mAccount;
+    private PhoneAccount mPhoneAccount;
 
     private final Handler mHandler = new Handler();
 
@@ -260,7 +260,7 @@
         mState = isConference ? CallState.ACTIVE : CallState.NEW;
         setHandle(handle);
         mGatewayInfo = gatewayInfo;
-        mAccount = account;
+        mPhoneAccount = account;
         mIsIncoming = isIncoming;
         mIsConference = isConference;
         maybeLoadCannedSmsResponses();
@@ -386,8 +386,8 @@
         return mGatewayInfo;
     }
 
-    PhoneAccount getAccount() {
-        return mAccount;
+    PhoneAccount getPhoneAccount() {
+        return mPhoneAccount;
     }
 
     boolean isIncoming() {
@@ -492,6 +492,8 @@
      * in-call UI.
      */
     void handleVerifiedIncoming(ConnectionRequest request) {
+        mPhoneAccount = request.getAccount();
+
         // We do not handle incoming calls immediately when they are verified by the connection
         // service. We allow the caller-info-query code to execute first so that we can read the
         // direct-to-voicemail property before deciding if we want to show the incoming call to the

src/com/android/telecomm/CallLogManager.java

diff --git a/src/com/android/telecomm/CallLogManager.java b/src/com/android/telecomm/CallLogManager.java
index 906ecd4..142e43b 100644
--- a/src/com/android/telecomm/CallLogManager.java
+++ b/src/com/android/telecomm/CallLogManager.java
@@ -112,7 +112,7 @@
         Log.d(TAG, "logNumber set to: %s", Log.pii(logNumber));
 
         final int presentation = getPresentation(call, contactInfo);
-        final PhoneAccount account = call.getAccount();
+        final PhoneAccount account = call.getPhoneAccount();
 
         logCall(contactInfo, logNumber, presentation, callLogType, account, creationTime, age);
     }

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index c80e5af..42d6a03 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -304,8 +304,8 @@
 
         return new InCallCall(callId, state, call.getDisconnectCause(), call.getDisconnectMessage(),
                 call.getCannedSmsResponses(), capabilities, connectTimeMillis, call.getHandle(),
-                call.getGatewayInfo(), call.getAccount(), descriptor, call.getCallVideoProvider(),
-                parentCallId, childCallIds, call.getFeatures(), call.getStatusHints());
+                call.getGatewayInfo(), call.getPhoneAccount(), descriptor,
+                call.getCallVideoProvider(), parentCallId, childCallIds, call.getFeatures(),
+                call.getStatusHints());
     }
-
 }