Robert Greenwalt 7ac7214b78 resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp ...

am: 1398e8e5aa

Change-Id: I187acf0aa781dcb88248e52361bcd097ced92312

2016-07-31 03:43:31 +00:00

..

cdma

…

gsm

…

CarrierConfigManager.java

Add CarrierConfig to remove hold during Ims Calls am: c8601013d5

2016-07-22 07:07:26 +00:00

CellIdentityCdma.java

…

CellIdentityGsm.java

…

CellIdentityLte.java

…

CellIdentityWcdma.java

…

CellInfo.aidl

…

CellInfo.java

…

CellInfoCdma.java

…

CellInfoGsm.java

…

CellInfoLte.java

…

CellInfoWcdma.java

…

CellLocation.java

…

CellSignalStrength.java

…

CellSignalStrengthCdma.java

…

CellSignalStrengthGsm.java

…

CellSignalStrengthLte.java

…

CellSignalStrengthWcdma.java

…

DataConnectionRealTimeInfo.aidl

…

DataConnectionRealTimeInfo.java

…

DisconnectCause.java

Finalize MEP functionality.

2016-07-11 10:33:37 -07:00

IccOpenLogicalChannelResponse.aidl

…

IccOpenLogicalChannelResponse.java

…

JapanesePhoneNumberFormatter.java

…

ModemActivityInfo.aidl

…

ModemActivityInfo.java

…

NeighboringCellInfo.aidl

…

NeighboringCellInfo.java

…

package.html

…

PcoData.aidl

Add support for UNSOL PCO Data.

2016-06-02 15:21:59 -07:00

PcoData.java

Add support for UNSOL PCO Data.

2016-06-02 15:21:59 -07:00

PhoneNumberFormattingTextWatcher.java

…

PhoneNumberUtils.java

Merge "Continued multi-endpoint work." into nyc-mr1-dev

2016-05-18 20:32:33 +00:00

PhoneStateListener.java

…

PreciseCallState.aidl

…

PreciseCallState.java

…

PreciseDataConnectionState.aidl

…

PreciseDataConnectionState.java

…

PreciseDisconnectCause.java

…

RadioAccessFamily.aidl

…

RadioAccessFamily.java

Add support for LTE CarrierAgregation

2016-06-23 11:19:03 -07:00

Rlog.java

add pii support for Rlog

2016-07-25 15:20:51 -07:00

ServiceState.aidl

…

ServiceState.java

resolve merge conflicts of 20a35b6 to nyc-mr1-dev-plus-aosp

2016-07-30 12:48:07 -07:00

SignalStrength.aidl

…

SignalStrength.java

…

SubscriptionInfo.aidl

…

SubscriptionInfo.java

cold sim clean up

2016-06-03 11:45:12 -07:00

SubscriptionManager.java

cold sim clean up

2016-06-03 11:45:12 -07:00

TelephonyHistogram.aidl

Add new TelephonyManager api to query Telephony metrics.

2016-05-18 16:51:49 -07:00

TelephonyHistogram.java

Modify TelephonyHistogram.java functions.

2016-06-15 15:59:25 -07:00

TelephonyManager.java

Merge \"Add getCdmaPrlVersion().\" into nyc-mr1-dev

2016-07-19 23:10:27 +00:00

VisualVoicemailSmsFilterSettings.aidl

Switch VVM SMS filter to Builder pattern

2016-05-24 15:25:16 -07:00

VisualVoicemailSmsFilterSettings.java

Switch VVM SMS filter to Builder pattern

2016-05-24 15:25:16 -07:00

VoLteServiceState.aidl

…

VoLteServiceState.java

…