Santos Cordon cffc3605ce DO NOT MERGE Unfinal getPhone. ...

The change to make it final was breaking existing apps.

...and other changes.

Bug: 20283873
Change-Id: I8db4243850ad15f688dbca59ff5427b4799cbd1b

2015-04-16 17:27:45 -07: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

DO NOT MERGE Rename Call*Listener to Call*Callback.

2015-04-16 17:11:35 -07:00

CallProperties.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

CallState.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

CameraCapabilities.aidl

…

CameraCapabilities.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

Conference.java

resolve merge conflicts of edc625f to m-wireless-dev.

2015-04-16 13:11:55 -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

DO NOT MERGE Remove connection substate

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

ConnectionRequest.aidl

…

ConnectionRequest.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

ConnectionService.java

DO NOT MERGE Remove connection substate

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

ConnectionServiceAdapter.java

DO NOT MERGE Remove connection substate

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

ConnectionServiceAdapterServant.java

DO NOT MERGE Remove connection substate

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

DisconnectCause.aidl

Add new DisconnectCause class to telecomm.

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

DisconnectCause.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

GatewayInfo.aidl

…

GatewayInfo.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

IConferenceable.java

DO NOT MERGE Make Telecom/InCallUI APIs public

2015-04-15 14:42:24 -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

DO NOT MERGE Unfinal getPhone.

2015-04-16 17:27:45 -07:00

Log.java

…

ParcelableCall.aidl

…

ParcelableCall.java

DO NOT MERGE Remove connection substate

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

ParcelableConference.aidl

…

ParcelableConference.java

resolve merge conflicts of edc625f to m-wireless-dev.

2015-04-16 13:11:55 -07:00

ParcelableConnection.aidl

…

ParcelableConnection.java

DO NOT MERGE Remove connection substate

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

Phone.java

DO NOT MERGE Unfinal getPhone.

2015-04-16 17:27:45 -07:00

PhoneAccount.aidl

…

PhoneAccount.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

PhoneAccountHandle.aidl

…

PhoneAccountHandle.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

RemoteConference.java

DO NOT MERGE Make Telecom/InCallUI APIs public

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

RemoteConnection.java

DO NOT MERGE Remove connection substate

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

RemoteConnectionManager.java

…

RemoteConnectionService.java

DO NOT MERGE Remove connection substate

2015-04-16 15:05:05 -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

DO NOT MERGE Change hasVoicemailNumber to getVoicemailNumber

2015-04-16 12:40:23 -07:00

VideoCallbackServant.java

IMS-VT: Upgrade/Downgrade change

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

VideoCallImpl.java

DO NOT MERGE Rename Call*Listener to Call*Callback.

2015-04-16 17:11:35 -07:00

VideoProfile.aidl

…

VideoProfile.java

IMS-VT: Upgrade/Downgrade change

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

Voicemail.java

DO NOT MERGE Hide Voicemail APIs

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