fionaxu 619e5c8ecc resolve merge conflicts of 6c7ef2e8d7 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Change-Id: I6a3488f21412b17e9a6bb453bd4137abab3ae205

2017-09-07 07:01:12 +00:00

..

cdma

…

euicc

Add EuiccManager#retainSubscriptionsOnFactoryReset API.

2017-06-27 09:23:07 -07:00

gsm

…

ims

Merge changes from topic 'call-session-may'

2017-08-11 18:33:44 +00:00

mbms

Embms adjustments for 7/28

2017-08-23 10:56:09 -07:00

CarrierConfigManager.java

resolve merge conflicts of 6c7ef2e8d7 to stage-aosp-master

2017-09-07 07:01:12 +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

…

ClientRequestStats.aidl

Expose api to retrieve wakelock information per client

2017-02-09 16:44:02 -08:00

ClientRequestStats.java

Expose api to retrieve wakelock information per client

2017-02-09 16:44:02 -08:00

DataConnectionRealTimeInfo.aidl

…

DataConnectionRealTimeInfo.java

…

DisconnectCause.java

Emergency redial implementation

2017-08-25 10:08:56 -07:00

IccOpenLogicalChannelResponse.aidl

…

IccOpenLogicalChannelResponse.java

…

ImsiEncryptionInfo.aidl

Address IMSI privacy issues.

2017-06-13 00:14:36 +00:00

ImsiEncryptionInfo.java

Radio Interface changes to pass the encryption object, including the

2017-06-28 00:31:58 +00:00

JapanesePhoneNumberFormatter.java

…

MbmsDownloadManager.java

Embms adjustments for 7/28

2017-08-23 10:56:09 -07:00

MbmsStreamingManager.java

Embms API adjustments for 7/21

2017-08-22 17:07:48 -07:00

ModemActivityInfo.aidl

…

ModemActivityInfo.java

…

NeighboringCellInfo.aidl

…

NeighboringCellInfo.java

…

NetworkScan.java

Adds error codes and maximum RAN/Bands/Channels

2017-06-16 10:16:39 -07:00

NetworkScanRequest.aidl

Add API to support async network scans.

2017-05-12 15:01:02 -07:00

NetworkScanRequest.java

Adds error codes and maximum RAN/Bands/Channels

2017-06-16 10:16:39 -07:00

package.html

…

PcoData.aidl

…

PcoData.java

…

PhoneNumberFormattingTextWatcher.java

…

PhoneNumberUtils.java

Merge "Ensure null/empty phone number does not crash international number check." into oc-dev

2017-06-01 07:14:29 +00:00

PhoneStateListener.java

Mark oemhook related APIs @Deprecated.

2017-02-23 17:31:06 -08:00

PreciseCallState.aidl

…

PreciseCallState.java

…

PreciseDataConnectionState.aidl

…

PreciseDataConnectionState.java

…

PreciseDisconnectCause.java

Add new precise call fail causes and OEM causes

2017-03-16 15:43:41 -07:00

RadioAccessFamily.aidl

…

RadioAccessFamily.java

…

RadioAccessSpecifier.aidl

Add API to support async network scans.

2017-05-12 15:01:02 -07:00

RadioAccessSpecifier.java

Add API to support async network scans.

2017-05-12 15:01:02 -07:00

RadioNetworkConstants.java

Add API to support async network scans.

2017-05-12 15:01:02 -07:00

Rlog.java

Disable a phone number log for user build

2017-03-06 14:53:10 +09:00

ServiceState.aidl

…

ServiceState.java

Cleanup ServiceState.toString()

2017-08-14 13:27:44 -07:00

SignalStrength.aidl

…

SignalStrength.java

Support Signal strength offset

2017-03-15 15:59:56 -07:00

SmsManager.java

Merge "Add new error code in SmsManager"

2017-08-25 18:01:18 +00:00

SmsMessage.java

Telephony: Fix the failure of copying SMS to SIM card for sub2

2017-05-11 11:50:44 +05:30

SubscriptionInfo.aidl

…

SubscriptionInfo.java

Define APIs for listing embedded subscriptions.

2017-05-14 10:55:40 -07:00

SubscriptionManager.java

Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4

2017-06-06 15:48:24 +00:00

Telephony.java

Add new column user_editable to Carriers table in telephony db.

2017-07-18 16:58:52 +00:00

TelephonyHistogram.aidl

…

TelephonyHistogram.java

…

TelephonyManager.java

Merge changes I325b13d5,I89719fe7 am: 23868e9c09 am: 9335d2d0b1

2017-08-19 03:38:10 +00:00

TelephonyScanManager.java

Use Bundle for inter-process message

2017-06-28 10:58:31 -07:00

UiccAccessRule.aidl

Squashed merge of master-sim into master.

2017-04-03 11:17:53 -07:00

UiccAccessRule.java

Define APIs for listing embedded subscriptions.

2017-05-14 10:55:40 -07:00

UssdResponse.aidl

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

2017-04-24 18:46:12 +00:00

UssdResponse.java

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

2017-04-24 18:46:12 +00:00

VisualVoicemailService.java

Add VisualVoicemailService

2017-04-25 01:23:37 +00:00

VisualVoicemailSms.java

Update VVM API

2017-04-27 16:47:48 -07:00

VisualVoicemailSmsFilterSettings.aidl

…

VisualVoicemailSmsFilterSettings.java

Update VVM API

2017-04-27 16:47:48 -07:00

VoLteServiceState.aidl

…

VoLteServiceState.java

…