Prerepa Viswanadham d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev ...

* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge

2015-05-05 01:06:38 +00:00

..

AudioState.aidl

…

AudioState.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -07:00

AuthenticatorService.java

DO NOT MERGE Hide Voicemail APIs

2015-04-15 13:17:11 -07:00

Call.java

Add Properties to Call.Details.

2015-04-30 17:21:10 -07:00

CallbackRecord.java

Add handler parameter for callbacks.

2015-04-30 15:24:50 -07:00

CameraCapabilities.aidl

…

CameraCapabilities.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -07:00

Conference.java

Merge commit '7f61051' into merge2

2015-04-24 14:02:07 -07:00

Conferenceable.java

API Cleanup - rename IConferenceable to Conferenceable.

2015-04-20 09:13:01 -07:00

ConferenceParticipant.aidl

Communicating participant changes to conference controller.

2014-10-28 13:51:27 -07:00

ConferenceParticipant.java

Communicating participant changes to conference controller.

2014-10-28 13:51:27 -07:00

Connection.java

Merge commit '17455a3' into master_merge

2015-05-01 10:12:11 -07:00

ConnectionRequest.aidl

…

ConnectionRequest.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -07:00

ConnectionService.java

Merge commit '17455a3' into master_merge

2015-05-01 10:12:11 -07:00

ConnectionServiceAdapter.java

Add plumbing for merge failures and renable button. (3/4)

2015-04-28 07:13:34 -07:00

ConnectionServiceAdapterServant.java

Add plumbing for merge failures and renable button. (3/4)

2015-04-28 07:13:34 -07:00

DefaultDialerManager.java

Merge "Simplify DefaultDialerManager" into mnc-dev

2015-04-28 18:57:46 +00:00

DisconnectCause.aidl

Add new DisconnectCause class to telecomm.

2014-09-16 12:07:41 -07:00

DisconnectCause.java

Fix up DisconnectCause description.

2015-04-24 11:37:07 -07:00

GatewayInfo.aidl

…

GatewayInfo.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -07:00

IConferenceable.java

API Cleanup - rename IConferenceable to Conferenceable.

2015-04-20 09:13:01 -07:00

InCallAdapter.java

Add an option to set the selected phone account as the default. (1/3)

2014-10-22 13:32:57 -07:00

InCallService.java

Add handler parameter for callbacks.

2015-04-30 15:24:50 -07:00

Log.java

…

ParcelableCall.aidl

…

ParcelableCall.java

Merge commit '7595842' into merge2

2015-04-24 13:56:35 -07:00

ParcelableConference.aidl

…

ParcelableConference.java

Fixing issue where conference calls enable speaker phone.

2015-04-27 13:13:32 -07:00

ParcelableConnection.aidl

…

ParcelableConnection.java

DO NOT MERGE Remove connection substate

2015-04-16 15:05:05 -07:00

Phone.java

Add handler parameter for callbacks.

2015-04-30 15:24:50 -07:00

PhoneAccount.aidl

…

PhoneAccount.java

DO NOT MERGE Make CAPABILITY_VIDEO_CALLING public

2015-04-21 15:03:29 -07:00

PhoneAccountHandle.aidl

…

PhoneAccountHandle.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -07:00

RemoteConference.java

Add handler parameter for callbacks.

2015-04-30 15:24:50 -07:00

RemoteConnection.java

Add handler parameter for callbacks.

2015-04-30 15:24:50 -07:00

RemoteConnectionManager.java

…

RemoteConnectionService.java

Merge commit '17455a3' into master_merge

2015-05-01 10:12:11 -07:00

Response.java

…

StatusHints.aidl

…

StatusHints.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -07:00

TelecomManager.java

Add default dialer checks to Telecom/Telephony

2015-04-29 16:21:00 -07:00

VideoCallbackServant.java

IMS-VT: Upgrade/Downgrade change

2015-04-01 21:40:45 +00:00

VideoCallImpl.java

Add handler parameter for callbacks.

2015-04-30 15:24:50 -07:00

VideoProfile.aidl

…

VideoProfile.java

Add videoStateToString on videoProvider Class.

2015-04-24 23:47:37 +00:00

Voicemail.java

DO NOT MERGE Hide Voicemail APIs

2015-04-15 13:17:11 -07:00