commit 2583b67c376358538cfa11e25a241adb2dc9e34a
author Santos Cordon <santoscordon@google.com> Sat Jul 19 13:07:33 2014 -0700
committer Santos Cordon <santoscordon@google.com> Mon Jul 21 01:15:40 2014 +0000
tree 8fd4d4ca9fcfeb6be1ee63a9d7c2b26a6edde75c
parent 313bad76c8697ebffa94c04fd9ce5317487c9ee4

Rename InCallCall to ParcelableCall (2/2)

Bug: 16416927
Change-Id: Iae97d83ce74b4395d6877cc167d7e5057dac201b

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index e11d60e..8442597 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -31,7 +31,7 @@
 import android.telecomm.CallCapabilities;
 import android.telecomm.CallPropertyPresentation;
 import android.telecomm.CallState;
-import android.telecomm.InCallCall;
+import android.telecomm.ParcelableCall;
 
 import com.android.internal.telecomm.IInCallService;
 import com.google.common.collect.ImmutableCollection;
@@ -136,7 +136,7 @@
                 mCallIdMapper.addCall(call);
                 call.addListener(mCallListener);
                 try {
-                    mInCallService.addCall(toInCallCall(call));
+                    mInCallService.addCall(toParcelableCall(call));
                 } catch (RemoteException ignored) {
                 }
             }
@@ -286,15 +286,15 @@
     private void updateCall(Call call) {
         if (mInCallService != null) {
             try {
-                InCallCall inCallCall = toInCallCall(call);
-                Log.v(this, "updateCall %s ==> %s", call, inCallCall);
-                mInCallService.updateCall(inCallCall);
+                ParcelableCall parcelableCall = toParcelableCall(call);
+                Log.v(this, "updateCall %s ==> %s", call, parcelableCall);
+                mInCallService.updateCall(parcelableCall);
             } catch (RemoteException ignored) {
             }
         }
     }
 
-    private InCallCall toInCallCall(Call call) {
+    private ParcelableCall toParcelableCall(Call call) {
         String callId = mCallIdMapper.getCallId(call);
 
         int capabilities = call.getCallCapabilities();
@@ -336,11 +336,24 @@
         String callerDisplayName = call.getCallerDisplayNamePresentation() ==
                 CallPropertyPresentation.ALLOWED ?  call.getCallerDisplayName() : null;
 
-        return new InCallCall(callId, state, call.getDisconnectCause(), call.getDisconnectMessage(),
-                call.getCannedSmsResponses(), capabilities, connectTimeMillis, handle,
-                call.getHandlePresentation(), callerDisplayName,
-                call.getCallerDisplayNamePresentation(), call.getGatewayInfo(),
-                call.getPhoneAccount(), call.getCallVideoProvider(), parentCallId, childCallIds,
-                call.getStatusHints() , call.getVideoState());
+        return new ParcelableCall(
+                callId,
+                state,
+                call.getDisconnectCause(),
+                call.getDisconnectMessage(),
+                call.getCannedSmsResponses(),
+                capabilities,
+                connectTimeMillis,
+                handle,
+                call.getHandlePresentation(),
+                callerDisplayName,
+                call.getCallerDisplayNamePresentation(),
+                call.getGatewayInfo(),
+                call.getPhoneAccount(),
+                call.getCallVideoProvider(),
+                parentCallId,
+                childCallIds,
+                call.getStatusHints(),
+                call.getVideoState());
     }
 }