Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

Logging

[telecom] system_server should not call non forUser Settings.Secure.get* methods

2020-09-03 22:59:14 +00:00

AudioState.aidl

…

AudioState.java

…

AuthenticatorService.java

…

BluetoothCallQualityReport.java

Add an event and a parcelable to receive bluetooth framework call

2020-11-30 11:52:02 -08:00

Call.java

Update docs for RttCall#write

2020-10-29 16:25:05 -07:00

CallAudioState.aidl

…

CallAudioState.java

…

CallbackRecord.java

…

CallerInfo.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

CallerInfoAsyncQuery.java

Use TelephonyManager#isEmergencyNumber() instead

2020-10-14 02:31:14 +00:00

CallRedirectionService.java

…

CallScreeningService.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

Conference.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

Conferenceable.java

…

ConferenceParticipant.aidl

…

Connection.java

Declare audio codec bitrate and bandwidth

2020-11-11 00:55:52 +08:00

ConnectionRequest.aidl

…

ConnectionRequest.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

ConnectionService.java

Use phoneAccountHandle based on connection

2020-10-19 11:14:35 +09:00

ConnectionServiceAdapter.java

Add new @hide API to pass call direction changes through Telecom

2020-04-20 12:14:33 -07:00

ConnectionServiceAdapterServant.java

Add new @hide API to pass call direction changes through Telecom

2020-04-20 12:14:33 -07:00

DefaultDialerManager.java

Tighten up Binder.clearCallingIdentity() usage.

2020-10-06 11:18:09 -06:00

DisconnectCause.aidl

…

DisconnectCause.java

API tweaks in response to feedback

2020-10-22 14:07:32 -07:00

GatewayInfo.aidl

…

GatewayInfo.java

Fix parceling and unparceling for URIs in Telecom.

2020-05-11 12:55:29 -07:00

InCallAdapter.java

Update language to comply with Android's inclusive language guidance

2020-07-29 10:23:07 -07:00

InCallService.java

Suppress all hidden abstract methods in constructable classes.

2020-11-13 02:56:20 +00:00

Log.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

OWNERS

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:27 -07:00

package-info.java

…

ParcelableCall.aidl

…

ParcelableCall.java

Fix parceling and unparceling for URIs in Telecom.

2020-05-11 12:55:29 -07:00

ParcelableCallAnalytics.java

…

ParcelableConference.aidl

…

ParcelableConference.java

Add a new call direction parameter to conferences for multiparty

2020-04-20 12:19:34 -07:00

ParcelableConnection.aidl

…

ParcelableConnection.java

…

ParcelableRttCall.aidl

…

ParcelableRttCall.java

…

Phone.java

…

PhoneAccount.aidl

…

PhoneAccount.java

Add CAPABILITY_CALL_COMPOSER in PhoneAccount for enriched calling.

2020-11-25 17:58:26 +00:00

PhoneAccountHandle.aidl

…

PhoneAccountHandle.java

…

PhoneAccountSuggestion.aidl

…

PhoneAccountSuggestion.java

…

PhoneAccountSuggestionService.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

RemoteConference.java

Add adhoc conference APIs to RemoteConnection and

2020-08-11 19:26:33 +00:00

RemoteConnection.java

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

2020-08-31 21:21:38 -07:00

RemoteConnectionManager.java

Add adhoc conference APIs to RemoteConnection and

2020-08-11 19:26:33 +00:00

RemoteConnectionService.java

Merge "Add adhoc conference APIs to RemoteConnection and RemoteConnectionService."

2020-08-13 18:06:19 +00:00

Response.java

…

StatusHints.aidl

…

StatusHints.java

…

TelecomAnalytics.aidl

…

TelecomAnalytics.java

…

TelecomManager.java

Add Call Composer API extras in TelecomManager

2020-12-03 04:51:57 +00:00

TimedEvent.java

…

VideoCallbackServant.java

…

VideoCallImpl.java

…

VideoProfile.aidl

…

VideoProfile.java

…

Voicemail.java

…