2cc1003b9f15dce2c8511f6feb0ef262ff58ab20 - fp2-dev/platform/frameworks/base

commit	2cc1003b9f15dce2c8511f6feb0ef262ff58ab20	[log] [tgz]
author	Suresh Kumar Sugguna <sureshk@codeaurora.org>	Wed Aug 13 07:40:39 2014 -0700
committer	Linux Build Service Account <lnxbuild@localhost>	Tue Nov 04 08:36:27 2014 -0700
tree	c90ad70b9ab3b6fc30ddbc72a8ef6616242e8170
parent	c9f43e9140f13e8d0ab1426c578ad82632808aac [diff]

IMS: Deflect call feature

Code changes to support IMS Deflect call feature.

CRs-Fixed: 713856

Conflicts:
telecomm/java/android/telecomm/ConnectionService.java
telecomm/java/android/telecom/InCallAdapter.java
Change-Id: I74b7fd34cad8d49f660fb05bd33becf6ae1de5d2

telecomm/java/android/telecom/Call.java[diff]
telecomm/java/android/telecom/Connection.java[diff]
telecomm/java/android/telecom/ConnectionService.java[diff]
telecomm/java/android/telecom/InCallAdapter.java[diff]
telecomm/java/com/android/internal/telecom/IConnectionService.aidl[diff]
telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl[diff]
telephony/java/com/android/ims/internal/IImsCallSession.aidl[diff]
telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl[diff]

8 files changed

tree: c90ad70b9ab3b6fc30ddbc72a8ef6616242e8170