commit 8bdaa4625517fe118ccbb7e4a003b9905b9d06cd
author Ben Gilad <gilad@google.com> Wed Feb 05 12:53:19 2014 -0800
committer Ben Gilad <gilad@google.com> Thu Feb 06 09:58:36 2014 -0800
tree 378675edddfd50266144f524e53ad70c9c64e9c2
parent 0120241e30d3b9437eff41017be939c75e328900

Removing CallServiceUnavailableException that is no longer applicable.

Also including some cleanup in preparation for the next round of switchboard changes.

Change-Id: Ia8b293c971ff3866e4317eca4c9d053779917956

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 29890b6..0712f03 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 
-import com.android.telecomm.exceptions.CallServiceUnavailableException;
 import com.android.telecomm.exceptions.RestrictedCallException;
 import com.google.common.collect.Lists;
 
@@ -53,16 +52,16 @@
 
     private VoicemailManager mVoicemailManager;
 
-    private List<OutgoingCallFilter> mOutgoingCallFilters = Lists.newArrayList();
+    private List<OutgoingCallValidator> mOutgoingCallValidators = Lists.newArrayList();
 
-    private List<IncomingCallFilter> mIncomingCallFilters = Lists.newArrayList();
+    private List<IncomingCallValidator> mIncomingCallValidators = Lists.newArrayList();
 
     static CallsManager getInstance() {
         return INSTANCE;
     }
 
     /**
-     * Private constructor initializes main components of telecomm.
+     * Initializes the required Telecomm components.
      */
     private CallsManager() {
         mSwitchboard = new Switchboard();
@@ -80,10 +79,10 @@
      * @param context The application context.
      */
     void processOutgoingCallIntent(String handle, ContactInfo contactInfo, Context context)
-            throws RestrictedCallException, CallServiceUnavailableException {
+            throws RestrictedCallException {
 
-        for (OutgoingCallFilter policy : mOutgoingCallFilters) {
-            policy.validate(handle, contactInfo);
+        for (OutgoingCallValidator validator : mOutgoingCallValidators) {
+            validator.validate(handle, contactInfo);
         }
 
         // No objection to issue the call, proceed with trying to put it through.