Cleanup to remove misused CallGroup concept.
authorTyler Gunn <tgunn@google.com>
Tue, 2 Dec 2014 17:21:01 +0000 (09:21 -0800)
committerTyler Gunn <tgunn@google.com>
Tue, 2 Dec 2014 18:22:13 +0000 (18:22 +0000)
commit9bd5ca59239ac4acdccf97c0ab7a2a4ab957bf28
treed3e58cda0d03be760cef7e896c6110372d26aeee
parent652ee0ef914be165355b34c903c4cbc95d4f4afc
Cleanup to remove misused CallGroup concept.

The ImsCall code makes extensive use of a "CallGroup".  This CallGroup has
been the source of a number of bugs, since the CallGroup concept does not
match well with how we are performing merges in IMS.

1. Removed Call Group, replacing with a "peer" and "host" references in
the ImsCall.
2. Revisited the merge logic within the context of the peer/host changes.
3. Also, changed log statements to log the ImsCall instead of the session.
This aids debugging by making it more clear what the context of the various
method operations are.

Bug: 18588383

Change-Id: I78613c44bf656c8ebf9e5d6a1145784ce630deef
src/java/com/android/ims/ImsCall.java
src/java/com/android/ims/ImsCallGroup.java [deleted file]
src/java/com/android/ims/internal/CallGroup.java [deleted file]
src/java/com/android/ims/internal/CallGroupManager.java [deleted file]
src/java/com/android/ims/internal/ICallGroup.java [deleted file]