Jonathan Basseri 04c35e78db resolve merge conflicts of 4c04097 to nyc-mr1-dev ...

Change-Id: I256514588af20985108f72a5e204811904f87c9c

2016-05-26 11:41:17 -07:00

..

cdma

merge from master

2015-12-10 12:27:58 -08:00

gsm

merge from master

2015-12-10 12:27:58 -08:00

CarrierConfigManager.java

Merge "Per API review, revert the API renaming CL." into nyc-dev

2016-05-25 23:50:12 +00:00

CellIdentityCdma.java

…

CellIdentityGsm.java

Coerce 8-bit bsic to Integer if Invalid

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

CellIdentityLte.java

[DO NOT MERGE] Cellinfo: Update to version 12

2016-01-27 09:59:59 -08:00

CellIdentityWcdma.java

[DO NOT MERGE] Cellinfo: Update to version 12

2016-01-27 09:59:59 -08:00

CellInfo.aidl

…

CellInfo.java

…

CellInfoCdma.java

…

CellInfoGsm.java

…

CellInfoLte.java

…

CellInfoWcdma.java

…

CellLocation.java

merge from master

2015-12-10 12:27:58 -08:00

CellSignalStrength.java

Unhide signal strength constants used by getLevel.

2015-06-22 21:08:52 +00:00

CellSignalStrengthCdma.java

CellInfo Parceling for Invalid Values

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

CellSignalStrengthGsm.java

[DO NOT MERGE] Cellinfo: Update to version 12

2016-01-27 09:59:59 -08:00

CellSignalStrengthLte.java

CellInfo Parceling for Invalid Values

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

CellSignalStrengthWcdma.java

…

DataConnectionRealTimeInfo.aidl

…

DataConnectionRealTimeInfo.java

Make DcRtInfo Power State Constants Final

2016-01-25 17:29:10 -08:00

DisconnectCause.java

Continued multi-endpoint work.

2016-05-10 20:04:27 -07:00

IccOpenLogicalChannelResponse.aidl

…

IccOpenLogicalChannelResponse.java

…

JapanesePhoneNumberFormatter.java

…

ModemActivityInfo.aidl

Activity info and stats from modem

2015-06-05 02:10:51 +00:00

ModemActivityInfo.java

Additional checks for ModemActivityInfo.isValid()

2016-04-20 12:41:32 -07:00

NeighboringCellInfo.aidl

…

NeighboringCellInfo.java

Remove unnecessary allocation+unboxing of objects.

2016-04-18 09:55:59 +01:00

package.html

…

PhoneNumberFormattingTextWatcher.java

Add Text-to-Speech annotations for phone number displays (1/3)

2014-12-05 15:27:08 -08:00

PhoneNumberUtils.java

Continued multi-endpoint work.

2016-05-10 20:04:27 -07:00

PhoneStateListener.java

fix Memory Leak caused by PhoneStateListener

2016-03-23 14:23:20 -07:00

PreciseCallState.aidl

…

PreciseCallState.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

PreciseDataConnectionState.aidl

…

PreciseDataConnectionState.java

Remove unused imports in frameworks/base.

2015-02-28 14:47:49 -05:00

PreciseDisconnectCause.java

…

RadioAccessFamily.aidl

Radio Capability Support.

2014-10-20 10:31:05 -07:00

RadioAccessFamily.java

Add TDSCDMA family

2015-08-31 10:41:49 -07:00

Rlog.java

…

ServiceState.aidl

…

ServiceState.java

Turn down the logging a little bit.

2016-03-04 12:21:30 -08:00

SignalStrength.aidl

…

SignalStrength.java

TDSCDMA: RSSI bar moves 1 bar into no signal without going through 0 bar

2015-10-14 11:13:50 -07:00

SubscriptionInfo.aidl

Update SubscriptionManager API as per API council.

2014-11-11 11:48:04 -08:00

SubscriptionInfo.java

Cold Sim issue fix

2016-04-19 14:24:56 -07:00

SubscriptionManager.java

Cold Sim issue fix

2016-04-19 14:24:56 -07:00

TelephonyHistogram.aidl

Add new TelephonyManager api to query Telephony metrics.

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

TelephonyHistogram.java

Add new TelephonyManager api to query Telephony metrics.

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

TelephonyManager.java

resolve merge conflicts of 4c04097 to nyc-mr1-dev

2016-05-26 11:41:17 -07: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

…