commit 8f3282c49bd4e8e6de59be4bdaefc726d99a3273
author Santos Cordon <santoscordon@google.com> Sun Jun 01 13:56:02 2014 -0700
committer Santos Cordon <santoscordon@google.com> Sun Jun 01 14:10:11 2014 -0700
tree 4de996c5367d7b6fc9222452a8926c4f4f57835a
parent d515a135b7ece82c63015a91e7161a3c7bd6777a

Method definitions for conference APIS.

Bug: 15326865
Change-Id: Iee5ce555696f48f57f925e4bd37209ace1355dfd

src/com/android/telecomm/CallServiceWrapper.java

diff --git a/src/com/android/telecomm/CallServiceWrapper.java b/src/com/android/telecomm/CallServiceWrapper.java
index 9b5e2c3..41a80e5 100644
--- a/src/com/android/telecomm/CallServiceWrapper.java
+++ b/src/com/android/telecomm/CallServiceWrapper.java
@@ -17,7 +17,6 @@
 package com.android.telecomm;
 
 import android.os.Bundle;
-
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -37,6 +36,7 @@
 import com.google.common.collect.Sets;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -252,6 +252,21 @@
             args.arg2 = ringback;
             mHandler.obtainMessage(MSG_SET_REQUESTING_RINGBACK, args).sendToTarget();
         }
+
+        /** ${inheritDoc} */
+        @Override
+        public void removeCall(String callId) {
+        }
+
+        /** ${inheritDoc} */
+        @Override
+        public void setCanConferenceWith(String callId, List<String> conferenceCapableCallIds) {
+        }
+
+        /** ${inheritDoc} */
+        @Override
+        public void setIsConferenced(String conferenceCallId, String callId, boolean isConferenced) {
+        }
     }
 
     private final Adapter mAdapter = new Adapter();
@@ -514,12 +529,12 @@
                 mIncomingCallsManager.handleFailedIncomingCall(call);
             }
 
-            if (!mPendingIncomingCalls.isEmpty()) {
-                Log.wtf(this, "Pending calls did not get cleared.");
-                mPendingIncomingCalls.clear();
-            }
-        }
-
-        mCallIdMapper.clear();
+      if (!mPendingIncomingCalls.isEmpty()) {
+        Log.wtf(this, "Pending calls did not get cleared.");
+        mPendingIncomingCalls.clear();
+      }
     }
+
+    mCallIdMapper.clear();
+  }
 }