commit a161070ea054f91a5b2d5b4e3413381134d548b8
author Santos Cordon <santoscordon@google.com> Wed Jun 04 20:22:56 2014 -0700
committer Santos Cordon <santoscordon@google.com> Thu Jun 12 16:14:47 2014 -0700
tree 5d8337459f39b70b6952547699760502bcc3852d
parent 21284a2443b29ce7e4dd58b9d69fa1f6dfcc97c1

Support conference calling. (2/4)

Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a

src/com/android/telecomm/CallIdMapper.java

diff --git a/src/com/android/telecomm/CallIdMapper.java b/src/com/android/telecomm/CallIdMapper.java
index 7f92067..e6b5c1f 100644
--- a/src/com/android/telecomm/CallIdMapper.java
+++ b/src/com/android/telecomm/CallIdMapper.java
@@ -38,12 +38,15 @@
         mCalls.put(callId, newCall);
     }
 
+    void addCall(Call call, String id) {
+        Preconditions.checkNotNull(call);
+        ThreadUtil.checkOnMainThread();
+        mCalls.put(id, call);
+    }
+
     void addCall(Call call) {
         ThreadUtil.checkOnMainThread();
-        Preconditions.checkNotNull(call);
-        sIdCount++;
-        String callId = mCallIdPrefix + sIdCount;
-        mCalls.put(callId, call);
+        addCall(call, getNewId());
     }
 
     void removeCall(Call call) {
@@ -91,4 +94,9 @@
         // Note, no need for thread check, this method is thread safe.
         return callId != null && callId.startsWith(mCallIdPrefix);
     }
+
+    String getNewId() {
+        sIdCount++;
+        return mCallIdPrefix + sIdCount;
+    }
 }