commit 905dfba7883666f45a0c6958d8bc6c19d68972d9
author Sailesh Nepal <sail@google.com> Mon Jul 14 08:20:41 2014 -0700
committer Sailesh Nepal <sail@google.com> Mon Jul 14 23:23:25 2014 +0000
tree 3b2a7a08ba5936023e4fb552b623d35ce4f9da25
parent 490459ecb8ac18021129ad36ca3d556e4e1c18ca

Remove CallServiceProvider and CallServiceDescript: Impl do not merge

This CL removes usage CallServiceProvider. Instead
ConnectionServiceRepository uses package manager to look up
all ConnectionService implementations.

Everywhere we used CallServiceDescriptors has now been
replaced by ComponentNames.

Change-Id: I2e40c5c64c0d242dc41b680943d7e9209142db5b
(cherry picked from commit 10e6050b2186650fbc18b0aa62b2e7d74e0aa80a)

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index c1c7eb4..e6a3dbc 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -16,6 +16,7 @@
 
 package com.android.telecomm;
 
+import android.content.ComponentName;
 import android.content.ContentUris;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
@@ -24,7 +25,6 @@
 import android.os.Handler;
 import android.provider.ContactsContract.Contacts;
 import android.telecomm.CallPropertyPresentation;
-import android.telecomm.CallServiceDescriptor;
 import android.telecomm.CallState;
 import android.telecomm.ConnectionRequest;
 import android.telecomm.GatewayInfo;
@@ -215,9 +215,6 @@
 
     private OutgoingCallProcessor mOutgoingCallProcessor;
 
-    // TODO(santoscordon): The repositories should be changed into singleton types.
-    private CallServiceRepository mCallServiceRepository;
-
     /** Caller information retrieved from the latest contact query. */
     private CallerInfo mCallerInfo;
 
@@ -250,15 +247,6 @@
     private StatusHints mStatusHints;
 
     /**
-     * Creates an empty call object.
-     *
-     * @param isIncoming True if this is an incoming call.
-     */
-    Call(boolean isIncoming, boolean isConference) {
-        this(null, null, null, isIncoming, isConference);
-    }
-
-    /**
      * Persists the specified parameters and initializes the new instance.
      *
      * @param handle The handle to dial.
@@ -388,7 +376,7 @@
     /**
      * @param disconnectCause The reason for the disconnection, any of
      *         {@link android.telephony.DisconnectCause}.
-     * @param disconnectMessage Optional call-service-provided message about the disconnect.
+     * @param disconnectMessage Optional message about the disconnect.
      */
     void setDisconnectCause(int disconnectCause, String disconnectMessage) {
         // TODO: Consider combining this method with a setDisconnected() method that is totally
@@ -514,13 +502,9 @@
     /**
      * Starts the incoming call flow through the switchboard. When switchboard completes, it will
      * invoke handle[Un]SuccessfulIncomingCall.
-     *
-     * @param descriptor The relevant call-service descriptor.
-     * @param extras The optional extras passed via
-     *         {@link TelecommConstants#EXTRA_INCOMING_CALL_EXTRAS}.
      */
-    void startIncoming(CallServiceDescriptor descriptor, Bundle extras) {
-        Switchboard.getInstance().retrieveIncomingCall(this, descriptor, extras);
+    void startIncoming() {
+        Switchboard.getInstance().retrieveIncomingCall(this);
     }
 
     /**
@@ -594,7 +578,7 @@
         Preconditions.checkState(mOutgoingCallProcessor == null);
 
         mOutgoingCallProcessor = new OutgoingCallProcessor(
-                this, Switchboard.getInstance().getCallServiceRepository(), this);
+                this, Switchboard.getInstance().getConnectionServiceRepository(), this);
         mOutgoingCallProcessor.process();
     }