Tyler Gunn 96d6c40c71 resolved conflicts for merge of 00de38a1 to master ...

Change-Id: Ib1ac99ba7181ad79af94a04124380833bcb79a0c

2015-03-18 12:39:23 -07:00

..

AudioState.aidl

…

AudioState.java

Revert "Remove deprecated Telecom APIs"

2015-01-30 13:07:32 +00:00

AuthenticatorService.java

Add frameworks classes and methods necessary for VVM syncadapter structure.

2015-03-02 20:43:58 +00:00

Call.java

resolved conflicts for merge of 00de38a1 to master

2015-03-18 12:39:23 -07:00

CallProperties.java

…

CallState.java

Fixing where call goes from disconnecting to active to disconnecting state.

2014-10-07 10:14:55 -07:00

CameraCapabilities.aidl

…

CameraCapabilities.java

…

Conference.java

Revert "Remove deprecated Telecom APIs"

2015-01-30 13:07:32 +00: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

resolved conflicts for merge of 00de38a1 to master

2015-03-18 12:39:23 -07:00

ConnectionRequest.aidl

…

ConnectionRequest.java

Apply @hide / @SystemApi to android.telecom.*

2014-11-10 11:52:31 -08:00

ConnectionService.java

Fix for call timer resetting when starting IMS conference call. 1/4

2015-01-12 09:02:01 -08:00

ConnectionServiceAdapter.java

Pass onPostDialChar call back from Telephony to Telecom.

2014-12-16 12:53:04 -08:00

ConnectionServiceAdapterServant.java

Pass onPostDialChar call back from Telephony to Telecom.

2014-12-16 12:53:04 -08:00

DisconnectCause.aidl

Add new DisconnectCause class to telecomm.

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

DisconnectCause.java

Apply @hide / @SystemApi to android.telecom.*

2014-11-10 11:52:31 -08:00

GatewayInfo.aidl

…

GatewayInfo.java

Apply @hide / @SystemApi to android.telecom.*

2014-11-10 11:52:31 -08:00

IConferenceable.java

Change Connections to allow setting conferenceable with conferences.

2014-11-17 15:49:51 -08: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

Make add-call a global property of telecom. (1/4)

2014-11-10 19:19:35 +00:00

Log.java

…

ParcelableCall.aidl

…

ParcelableCall.java

Add new DisconnectCause class to telecomm.

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

ParcelableConference.aidl

…

ParcelableConference.java

Fix for call timer resetting when starting IMS conference call. 1/4

2015-01-12 09:02:01 -08:00

ParcelableConnection.aidl

…

ParcelableConnection.java

Telecom API updates (1/6)

2014-11-28 15:54:35 -08:00

Phone.java

Make add-call a global property of telecom. (1/4)

2014-11-10 19:19:35 +00:00

PhoneAccount.aidl

…

PhoneAccount.java

Fixing build after merge from mirror-m-wireless-internal-release

2015-03-15 14:04:19 -07:00

PhoneAccountHandle.aidl

…

PhoneAccountHandle.java

Small update to PhoneAccountHandle ID javadoc.

2015-03-02 20:18:54 +00:00

RemoteConference.java

Revert "Remove deprecated Telecom APIs"

2015-01-30 13:07:32 +00:00

RemoteConnection.java

Revert "Remove deprecated Telecom APIs"

2015-01-30 13:07:32 +00:00

RemoteConnectionManager.java

…

RemoteConnectionService.java

Don't set address for failed remote connections

2015-01-31 20:17:35 -08:00

Response.java

…

StatusHints.aidl

…

StatusHints.java

Apply @hide / @SystemApi to android.telecom.*

2014-11-10 11:52:31 -08:00

TelecomManager.java

Fixing build after merge from mirror-m-wireless-internal-release

2015-03-15 14:04:19 -07:00

VideoCallbackServant.java

…

VideoCallImpl.java

…

VideoProfile.aidl

…

VideoProfile.java

Unhide telecom APIs needed by Contacts

2015-03-02 08:35:32 -08:00

Voicemail.java

Add frameworks classes and methods necessary for VVM syncadapter structure.

2015-03-02 20:43:58 +00:00