Use CallerInfo correctly in Telecomm

Remove unused ContactInfo class
Pipe CallerInfo through to CallLogManager.addCall, and correctly
update data usage stats to fix speed dial.

Bug: 16232694
Bug: 15665694

Change-Id: Ibed9f53193b64891bffff30fd37b47062ab60048
diff --git a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
index c75e184..0b99dc6 100644
--- a/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
+++ b/src/com/android/telecomm/NewOutgoingCallIntentBroadcaster.java
@@ -70,13 +70,10 @@
     private static final String SCHEME_SIP = "sip";
 
     private final CallsManager mCallsManager;
-    private final ContactInfo mContactInfo;
     private final Intent mIntent;
 
-    NewOutgoingCallIntentBroadcaster(CallsManager callsManager, ContactInfo contactInfo,
-            Intent intent) {
+    NewOutgoingCallIntentBroadcaster(CallsManager callsManager, Intent intent) {
         mCallsManager = callsManager;
-        mContactInfo = contactInfo;
         mIntent = intent;
     }
 
@@ -121,8 +118,7 @@
 
             GatewayInfo gatewayInfo = getGateWayInfoFromIntent(intent, resultHandleUri);
             PhoneAccount account = getAccountFromIntent(intent);
-            mCallsManager.placeOutgoingCall(resultHandleUri, mContactInfo, gatewayInfo,
-                    account,
+            mCallsManager.placeOutgoingCall(resultHandleUri, gatewayInfo, account,
                     mIntent.getBooleanExtra(TelecommConstants.EXTRA_START_CALL_WITH_SPEAKERPHONE,
                             false),
                     mIntent.getIntExtra(TelecommConstants.EXTRA_START_CALL_WITH_VIDEO_STATE,
@@ -193,8 +189,7 @@
                     + " OutgoingCallBroadcastReceiver: %s", intent);
             String scheme = isUriNumber ? SCHEME_SIP : SCHEME_TEL;
             mCallsManager.placeOutgoingCall(
-                    Uri.fromParts(scheme, handle, null), mContactInfo, null, null,
-                    mIntent.getBooleanExtra(TelecommConstants.EXTRA_START_CALL_WITH_SPEAKERPHONE,
+                    Uri.fromParts(scheme, handle, null), null, null, mIntent.getBooleanExtra(TelecommConstants.EXTRA_START_CALL_WITH_SPEAKERPHONE,
                             false),
                     mIntent.getIntExtra(TelecommConstants.EXTRA_START_CALL_WITH_VIDEO_STATE,
                             VideoCallProfile.VIDEO_STATE_AUDIO_ONLY));