Robert Greenwalt 7751269d37 resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp ...

am: 5f0dad0e64

Change-Id: Icbd5899dd0c8a35be4c290b3aeab29d46c64e1c0

2017-01-03 19:48:04 +00:00

..

cdma

…

gsm

…

CarrierConfigManager.java

Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902

2016-12-22 21:51:57 +00:00

CellIdentityCdma.java

…

CellIdentityGsm.java

Coerce 8-bit bsic to Integer if Invalid

2016-05-05 16:04:56 -07:00

CellIdentityLte.java

…

CellIdentityWcdma.java

…

CellInfo.aidl

…

CellInfo.java

…

CellInfoCdma.java

…

CellInfoGsm.java

…

CellInfoLte.java

…

CellInfoWcdma.java

…

CellLocation.java

…

CellSignalStrength.java

…

CellSignalStrengthCdma.java

CellInfo Parceling for Invalid Values

2016-05-05 16:04:56 -07:00

CellSignalStrengthGsm.java

Expose GSM Timing Advance, Update LTE TA docstring

2016-11-10 13:00:21 -08:00

CellSignalStrengthLte.java

Merge "Expose GSM Timing Advance, Update LTE TA docstring"

2016-11-30 18:00:35 +00:00

CellSignalStrengthWcdma.java

…

ClientRequestStats.aidl

Expose api to retrieve wakelock information per client

2016-08-31 23:33:03 +00:00

ClientRequestStats.java

Expose api to retrieve wakelock information per client

2016-08-31 23:33:03 +00:00

DataConnectionRealTimeInfo.aidl

…

DataConnectionRealTimeInfo.java

…

DisconnectCause.java

resolve merge conflicts of e6b6653da8 to nyc-mr2-dev-plus-aosp

2017-01-03 19:48:04 +00: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

Treat the mdn as an additional voicemail number

2016-12-06 22:28:30 +00:00

PhoneStateListener.java

Add createForPhoneAccountHandle() and getServicetate()

2016-11-10 12:11:56 -08:00

PreciseCallState.aidl

…

PreciseCallState.java

…

PreciseDataConnectionState.aidl

…

PreciseDataConnectionState.java

…

PreciseDisconnectCause.java

…

RadioAccessFamily.aidl

…

RadioAccessFamily.java

Add RadioAccessFamily rank

2016-09-21 23:34:31 +00:00

Rlog.java

redact PII only for non-null value and apply SHA-1

2016-08-22 11:36:16 -07:00

ServiceState.aidl

…

ServiceState.java

Merge "Get the correct operator name"

2016-12-02 03:39:30 +00:00

SignalStrength.aidl

…

SignalStrength.java

Customization of LTE Signal Bars

2016-10-12 13:56:00 +09:00

SubscriptionInfo.aidl

…

SubscriptionInfo.java

redact PII only for non-null value and apply SHA-1

2016-08-22 11:36:16 -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 VisualVoicemailService"

2016-12-28 00:33:17 +00:00

UssdResponse.aidl

Provide an API to make USSD calls and read the responses.

2016-10-31 17:13:18 -07:00

UssdResponse.java

Provide an API to make USSD calls and read the responses.

2016-10-31 17:13:18 -07:00

VisualVoicemailService.java

Add VisualVoicemailService

2016-12-16 12:17:30 -08:00

VisualVoicemailSms.java

Add VisualVoicemailService

2016-12-16 12:17:30 -08:00

VisualVoicemailSmsFilterSettings.aidl

Switch VVM SMS filter to Builder pattern

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

VisualVoicemailSmsFilterSettings.java

Add VisualVoicemailService

2016-12-16 12:17:30 -08:00

VoLteServiceState.aidl

…

VoLteServiceState.java

…