johnwang 01ae863611 resolved conflicts for merge of 696b912e to eclair ...

modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

	modified:   telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

2009-08-17 19:20:07 -07:00

..

cdma

Fix CDMA to startup/shutdown based on apn en/disab

2009-08-17 15:20:14 -07:00

gsm

resolved conflicts for merge of 696b912e to eclair

2009-08-17 19:20:07 -07:00

test

Add technology and authentication type in setupDataCall.

2009-07-31 01:31:12 -07:00

AdnRecord.aidl

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

AdnRecord.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

AdnRecordCache.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

AdnRecordLoader.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

ATParseEx.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ATResponseParser.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

BaseCommands.java

Support SMS cell broadcasting for GSM in RIL.java

2009-06-11 15:43:29 -07:00

Call.java

Add a DISCONNECTING call state.

2009-08-04 11:30:09 -07:00

CallerInfo.java

Cleanup whitespace.

2009-06-09 10:30:03 -07:00

CallerInfoAsyncQuery.java

Cleanup whitespace.

2009-06-09 10:30:03 -07:00

CallForwardInfo.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

CallStateException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CallTracker.java

Motorola changes from 090602 through 090605

2009-06-07 12:09:18 -07:00

CommandException.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

CommandsInterface.java

Add technology and authentication type in setupDataCall.

2009-07-31 01:31:12 -07:00

Connection.java

Fix for missing call drop notice in CDMA mode

2009-07-25 21:28:20 -07:00

DataCallState.java

Teleca 2b changes

2009-05-18 21:47:50 -07:00

DataConnection.java

Add PDP Reject causes.

2009-06-15 21:34:31 -07:00

DataConnectionTracker.java

Fix CDMA to startup/shutdown based on apn en/disab

2009-08-17 15:20:14 -07:00

DataLink.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

DataLinkInterface.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

DefaultPhoneNotifier.java

Add net type to mobile for mobile-required traffic

2009-08-12 16:08:25 -07:00

DriverCall.java

Changes for new ril.h.

2009-04-22 14:52:11 -07:00

EncodeException.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

GsmAlphabet.java

Make GSM 7-bit encoding properly deal with initial padding.

2009-08-10 14:12:35 +08:00

IccCard.java

Changes 203 and 225 from partner repo.

2009-07-10 11:34:33 -07:00

IccCardApplication.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccCardStatus.java

Remove duplicate code in Sim/Ruim card, handle IccCardStatus.

2009-07-08 15:15:47 -07:00

IccConstants.java

Teleca 2b changes

2009-05-18 21:47:50 -07:00

IccException.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccFileHandler.java

Send the path of the EF file for ICC IO

2009-04-24 11:52:40 -07:00

IccFileNotFound.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccFileTypeMismatch.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccIoResult.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccPhoneBookInterfaceManager.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccPhoneBookInterfaceManagerProxy.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccProvider.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccRecords.java

frameworks/base: CDMA voicemail support

2009-06-24 21:29:52 -07:00

IccSmsInterfaceManager.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccSmsInterfaceManagerProxy.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IccUtils.java

Rename bcdByteToInt to gsmBcdByteToInt and beBcdByteToInt to cdmaBcdByteToInt.

2009-08-13 11:11:46 -07:00

IccVmFixedException.java

Cleanup whitespace.

2009-06-09 10:30:03 -07:00

IccVmNotSupportedException.java

Cleanup whitespace.

2009-06-09 10:30:03 -07:00

IExtendedNetworkService.aidl

Cleanup whitespace.

2009-06-09 10:30:03 -07:00

IIccPhoneBook.aidl

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

IPhoneStateListener.aidl

Teleca 2b changes

2009-05-18 21:47:50 -07:00

IPhoneSubInfo.aidl

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

ISms.aidl

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

ITelephony.aidl

frameworks/base: CDMA voicemail support

2009-06-24 21:29:52 -07:00

ITelephonyRegistry.aidl

Add net type to mobile for mobile-required traffic

2009-08-12 16:08:25 -07:00

MmiCode.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Phone.java

Add net type to mobile for mobile-required traffic

2009-08-12 16:08:25 -07:00

PhoneBase.java

Fix CDMA to startup/shutdown based on apn en/disab

2009-08-17 15:20:14 -07:00

PhoneFactory.java

Add a method to get the PhoneType in CellLocation.

2009-05-19 17:15:22 -07:00

PhoneNotifier.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PhoneProxy.java

Touch activation screen shown up fix

2009-08-07 10:35:11 -07:00

PhoneStateIntentReceiver.java

Teleca 2b changes

2009-05-18 21:47:50 -07:00

PhoneSubInfo.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

PhoneSubInfoProxy.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

RetryManager.java

Allow max_retires to be set to infinite.

2009-08-13 14:18:00 -07:00

RIL.java

Add technology and authentication type in setupDataCall.

2009-07-31 01:31:12 -07:00

RILConstants.java

Add technology and authentication type in setupDataCall.

2009-07-31 01:31:12 -07:00

ServiceStateTracker.java

Replace loop-delay in setPowerStateToDesired() with async approach

2009-08-15 13:01:52 -07:00

SmsAddress.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

SMSDispatcher.java

Bubble up SMS send fail error code to the app.

2009-08-06 13:23:04 -07:00

SmsHeader.java

added SmsMessage ConcatRef parsing validation

2009-05-22 13:38:35 +08:00

SmsMessageBase.java

Second word lost when SMS is received from email

2009-07-30 17:25:23 -07:00

SmsRawData.aidl

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

SmsRawData.java

AI 144185: Integrate cdma into the main code base.

2009-04-02 01:37:02 -07:00

SmsResponse.java

Add additional parameters to SETUP_DATA_CALL and SMS response.

2009-06-10 11:02:57 -07:00

TelephonyEventLog.java

add additional CdmaDataConnectionTracker event logging

2009-05-20 09:34:02 +08:00

TelephonyIntents.java

resolved conflicts for merge of 889c2d37 to master

2009-07-10 16:05:59 -07:00

TelephonyProperties.java

Add ro.telephony.disable-call check in dialing.

2009-08-10 17:10:32 -07:00

WapPushOverSms.java

Fix SMS Ack.

2009-06-25 13:08:08 -07:00

WspTypeDecoder.java

Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that

2009-06-30 11:50:50 -07:00