Brad Ebinger c5eacceb3f resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp ...

Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034

2016-11-02 10:33:27 -07:00

..

Logging

Modify AIDLs to include Session.Info

2016-10-28 12:14:24 -07:00

AudioState.aidl

…

AudioState.java

…

AuthenticatorService.java

…

Call.java

API cleanups per API review.

2016-06-29 11:46:40 -07:00

CallAudioState.aidl

…

CallAudioState.java

DO NOT MERGE ANYWHERE

2015-11-17 12:31:53 -08:00

CallbackRecord.java

…

CallScreeningService.java

Make CallScreening.CallResponse static

2016-01-27 16:53:15 -08:00

Conference.java

API cleanups per API review.

2016-06-29 11:46:40 -07:00

Conferenceable.java

…

ConferenceParticipant.aidl

…

ConferenceParticipant.java

Enhance toString on ConferenceParticipant.

2016-07-12 08:28:54 -07:00

Connection.java

Framework fixes to support VoLTE conf calls via RemoteConnectionServices.

2016-10-17 15:48:19 -07:00

ConnectionRequest.aidl

…

ConnectionRequest.java

merge from master

2015-12-10 12:27:58 -08:00

ConnectionService.java

Modify AIDLs to include Session.Info

2016-10-28 20:17:03 +00:00

ConnectionServiceAdapter.java

Modify ConnectionServiceAdapter to include Session

2016-11-02 09:20:22 -07:00

ConnectionServiceAdapterServant.java

Modify ConnectionServiceAdapter to include Session

2016-11-02 09:20:22 -07:00

DefaultDialerManager.java

Make getInstalledDialerApplications to query for specific user

2016-01-19 19:39:01 +00:00

DisconnectCause.aidl

…

DisconnectCause.java

Telephony multi-endpoint disconnect causes.

2016-06-09 08:25:32 -07:00

GatewayInfo.aidl

…

GatewayInfo.java

…

InCallAdapter.java

Expand call/connection extras API.

2016-03-23 16:06:34 -07:00

InCallService.java

Update InCallService#onConnectionEvent comments.

2016-08-25 09:26:15 -07:00

Log.java

Modify AIDLs to include Session.Info

2016-10-28 12:14:24 -07:00

ParcelableCall.aidl

…

ParcelableCall.java

Remove dependency on android.telecom.Call in VideoCallImpl for testing.

2015-12-08 10:53:41 -08:00

ParcelableCallAnalytics.java

API 25 is frozen, so we can't change API.

2016-07-07 13:20:47 -06:00

ParcelableConference.aidl

…

ParcelableConference.java

Add connection properties to Connections.

2016-03-24 20:20:11 -07:00

ParcelableConnection.aidl

…

ParcelableConnection.java

Add connection properties to Connections.

2016-03-24 20:20:11 -07:00

Phone.java

Add API support for multi-endpoint.

2016-03-14 23:26:34 +00:00

PhoneAccount.aidl

…

PhoneAccount.java

Add Group Id to PhoneAccount

2016-07-11 14:35:10 -07:00

PhoneAccountHandle.aidl

…

PhoneAccountHandle.java

Update docs to better document PhoneAccountHandle

2016-03-17 15:22:06 -07:00

RemoteConference.java

Modify AIDLs to include Session.Info

2016-10-28 20:17:03 +00:00

RemoteConnection.java

Modify AIDLs to include Session.Info

2016-10-28 20:17:03 +00:00

RemoteConnectionManager.java

Modify AIDLs to include Session.Info

2016-10-28 12:14:24 -07:00

RemoteConnectionService.java

resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp

2016-11-02 10:33:27 -07:00

Response.java

…

StatusHints.aidl

…

StatusHints.java

…

TelecomAnalytics.aidl

Add support for Telecom analytics extensions

2016-06-14 16:37:10 -07:00

TelecomAnalytics.java

Add support for Telecom analytics extensions

2016-06-14 16:37:10 -07:00

TelecomManager.java

Add support for Telecom analytics extensions

2016-06-14 16:37:10 -07:00

TimedEvent.java

Add support for Telecom analytics extensions

2016-06-14 16:37:10 -07:00

VideoCallbackServant.java

…

VideoCallImpl.java

Remove dependency on android.telecom.Call in VideoCallImpl for testing.

2015-12-08 10:53:41 -08:00

VideoProfile.aidl

…

VideoProfile.java

Adding @IntDef checking for Video Quality and Video State values.

2016-01-08 13:20:25 -08:00

Voicemail.java

…