04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc - SHIFTPHONES/android_frameworks_base

commit	04e71b3db84fd5f7fc4eefb49a33154ea91ec9fc	[log] [tgz]
author	Wink Saville	Thu Apr 02 11:00:54 2009 -0700
committer	The Android Open Source Project <initial-contribution@android.com>	Thu Apr 02 11:00:54 2009 -0700
tree	1e96e55835f059a7b4b7b89a62ca0a9d7f0a5c17
parent	3afdd56470d6d4dcb20fe0f68ec9e54a167a9d74 [diff]

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245

Android.mk[diff]
api/current.xml[diff]
core/java/android/net/MobileDataStateTracker.java[diff]
core/java/android/provider/Checkin.java[diff]
core/java/android/provider/Settings.java[diff]
core/java/android/provider/Telephony.java[diff]
core/java/android/webkit/gears/AndroidRadioDataProvider.java[diff]
core/res/res/drawable/stat_sys_data_connected_1xrtt.png[Added - diff]
core/res/res/drawable/stat_sys_data_connected_evdo.png[Added - diff]
core/res/res/drawable/stat_sys_data_in_1xrtt.png[Added - diff]
core/res/res/drawable/stat_sys_data_in_evdo.png[Added - diff]
core/res/res/drawable/stat_sys_data_inandout_1xrtt.png[Added - diff]
core/res/res/drawable/stat_sys_data_inandout_evdo.png[Added - diff]
core/res/res/drawable/stat_sys_data_out_1xrtt.png[Added - diff]
core/res/res/drawable/stat_sys_data_out_evdo.png[Added - diff]
core/res/res/drawable/stat_sys_r_signal_0_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_r_signal_1_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_r_signal_2_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_r_signal_3_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_r_signal_4_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_ra_signal_0_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_ra_signal_1_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_ra_signal_2_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_ra_signal_3_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_ra_signal_4_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_signal_0_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_signal_1_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_signal_2_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_signal_3_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_signal_4_cdma.png[Added - diff]
core/res/res/drawable/stat_sys_tty_mode.png[Added - diff]
core/res/res/drawable/stat_sys_vp_phone_call.png[Added - diff]
core/res/res/drawable/stat_sys_vp_phone_call_on_hold.png[Added - diff]
core/res/res/values/public.xml[diff]
core/res/res/values/strings.xml[diff]
location/java/com/android/internal/location/CellState.java[diff]
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java[diff]
preloaded-classes[diff]
services/java/com/android/server/status/StatusBarPolicy.java[diff]
telephony/java/android/telephony/CellLocation.java[diff]
telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java[diff]
telephony/java/android/telephony/PhoneStateListener.java[diff]
telephony/java/android/telephony/ServiceState.aidl[diff]
telephony/java/android/telephony/ServiceState.java[diff]
telephony/java/android/telephony/SmsManager.java[Added - diff]
telephony/java/android/telephony/SmsMessage.java[Added - diff]
telephony/java/android/telephony/TelephonyManager.java[diff]
telephony/java/android/telephony/cdma/CdmaCellLocation.java[Added - diff]
telephony/java/android/telephony/cdma/package.html[Added - diff]
telephony/java/android/telephony/gsm/GsmCellLocation.java[diff]
telephony/java/android/telephony/gsm/SmsManager.java[diff]
telephony/java/android/telephony/gsm/SmsMessage.java[diff]
telephony/java/com/android/internal/telephony/ATResponseParser.java[diff]
telephony/java/com/android/internal/telephony/AdnRecord.aidl[Renamed from telephony/java/com/android/internal/telephony/gsm/AdnRecord.aidl - diff]
telephony/java/com/android/internal/telephony/AdnRecord.java[Added - diff]
telephony/java/com/android/internal/telephony/AdnRecordCache.java[Renamed from telephony/java/com/android/internal/telephony/gsm/AdnRecordCache.java - diff]
telephony/java/com/android/internal/telephony/AdnRecordLoader.java[Added - diff]
telephony/java/com/android/internal/telephony/BaseCommands.java[Added - diff]
telephony/java/com/android/internal/telephony/Call.java[diff]
telephony/java/com/android/internal/telephony/CallForwardInfo.java[Renamed from telephony/java/com/android/internal/telephony/gsm/CallForwardInfo.java - diff]
telephony/java/com/android/internal/telephony/CallTracker.java[Added - diff]
telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java[diff]
telephony/java/com/android/internal/telephony/CommandException.java[Renamed from telephony/java/com/android/internal/telephony/gsm/CommandException.java - diff]
telephony/java/com/android/internal/telephony/CommandsInterface.java[Renamed from telephony/java/com/android/internal/telephony/gsm/CommandsInterface.java - diff]
telephony/java/com/android/internal/telephony/Connection.java[diff]
telephony/java/com/android/internal/telephony/DataConnection.java[Added - diff]
telephony/java/com/android/internal/telephony/DataConnectionTracker.java[Added - diff]
telephony/java/com/android/internal/telephony/DataLink.java[Renamed from telephony/java/com/android/internal/telephony/gsm/DataLink.java - diff]
telephony/java/com/android/internal/telephony/DataLinkInterface.java[Renamed from telephony/java/com/android/internal/telephony/gsm/DataLinkInterface.java - diff]
telephony/java/com/android/internal/telephony/DefaultPhoneNotifier.java[diff]
telephony/java/com/android/internal/telephony/DriverCall.java[Renamed from telephony/java/com/android/internal/telephony/gsm/DriverCall.java - diff]
telephony/java/com/android/internal/telephony/EncodeException.java[Renamed from telephony/java/com/android/internal/telephony/gsm/EncodeException.java - diff]
telephony/java/com/android/internal/telephony/GsmAlphabet.java[Renamed from telephony/java/com/android/internal/telephony/gsm/GsmAlphabet.java - diff]
telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl[Renamed from telephony/java/com/android/internal/telephony/gsm/ISimPhoneBook.aidl - diff]
telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl[diff]
telephony/java/com/android/internal/telephony/ISms.aidl[Renamed from telephony/java/com/android/internal/telephony/gsm/ISms.aidl - diff]
telephony/java/com/android/internal/telephony/ITelephony.aidl[diff]
telephony/java/com/android/internal/telephony/IccCard.java[Renamed from telephony/java/com/android/internal/telephony/SimCard.java - diff]
telephony/java/com/android/internal/telephony/IccCardApplication.java[Added - diff]
telephony/java/com/android/internal/telephony/IccCardStatus.java[Added - diff]
telephony/java/com/android/internal/telephony/IccConstants.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SimConstants.java - diff]
telephony/java/com/android/internal/telephony/IccException.java[Copied from telephony/java/com/android/internal/telephony/gsm/SimFileTypeMismatch.java - diff]
telephony/java/com/android/internal/telephony/IccFileHandler.java[Added - diff]
telephony/java/com/android/internal/telephony/IccFileNotFound.java[Copied from telephony/java/com/android/internal/telephony/gsm/SimFileTypeMismatch.java - diff]
telephony/java/com/android/internal/telephony/IccFileTypeMismatch.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SimFileTypeMismatch.java - diff]
telephony/java/com/android/internal/telephony/IccIoResult.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SimIoResult.java - diff]
telephony/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java[Added - diff]
telephony/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java[Added - diff]
telephony/java/com/android/internal/telephony/IccProvider.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SimProvider.java - diff]
telephony/java/com/android/internal/telephony/IccRecords.java[Added - diff]
telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java[Added - diff]
telephony/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java[Added - diff]
telephony/java/com/android/internal/telephony/IccUtils.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SimUtils.java - diff]
telephony/java/com/android/internal/telephony/IccVmFixedException.java[Copied from telephony/java/com/android/internal/telephony/gsm/SimFileTypeMismatch.java - diff]
telephony/java/com/android/internal/telephony/IccVmNotSupportedException.java[Copied from telephony/java/com/android/internal/telephony/gsm/SimFileTypeMismatch.java - diff]
telephony/java/com/android/internal/telephony/MmiCode.java[diff]
telephony/java/com/android/internal/telephony/Phone.java[diff]
telephony/java/com/android/internal/telephony/PhoneBase.java[diff]
telephony/java/com/android/internal/telephony/PhoneFactory.java[diff]
telephony/java/com/android/internal/telephony/PhoneProxy.java[Added - diff]
telephony/java/com/android/internal/telephony/PhoneStateIntentReceiver.java[diff]
telephony/java/com/android/internal/telephony/PhoneSubInfo.java[diff]
telephony/java/com/android/internal/telephony/PhoneSubInfoProxy.java[Added - diff]
telephony/java/com/android/internal/telephony/RIL.java[Renamed from telephony/java/com/android/internal/telephony/gsm/RIL.java - diff]
telephony/java/com/android/internal/telephony/RILConstants.java[Renamed from telephony/java/com/android/internal/telephony/gsm/RILConstants.java - diff]
telephony/java/com/android/internal/telephony/SMSDispatcher.java[Added - diff]
telephony/java/com/android/internal/telephony/ServiceStateTracker.java[Added - diff]
telephony/java/com/android/internal/telephony/SmsAddress.java[Added - diff]
telephony/java/com/android/internal/telephony/SmsHeader.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SmsHeader.java - diff]
telephony/java/com/android/internal/telephony/SmsMessageBase.java[Added - diff]
telephony/java/com/android/internal/telephony/SmsRawData.aidl[Renamed from telephony/java/com/android/internal/telephony/gsm/SmsRawData.aidl - diff]
telephony/java/com/android/internal/telephony/SmsRawData.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SmsRawData.java - diff]
telephony/java/com/android/internal/telephony/SmsResponse.java[Renamed from telephony/java/com/android/internal/telephony/gsm/SmsResponse.java - diff]
telephony/java/com/android/internal/telephony/TelephonyEventLog.java[Renamed from telephony/java/com/android/internal/telephony/gsm/TelephonyEventLog.java - diff]
telephony/java/com/android/internal/telephony/TelephonyIntents.java[diff]
telephony/java/com/android/internal/telephony/TelephonyProperties.java[diff]
telephony/java/com/android/internal/telephony/WapPushOverSms.java[diff]
telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/CallFailCause.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaCall.java[Copied from telephony/java/com/android/internal/telephony/gsm/GSMCall.java - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java[Copied from telephony/java/com/android/internal/telephony/gsm/CallTracker.java - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java[Copied from telephony/java/com/android/internal/telephony/gsm/GSMConnection.java - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/FeatureCode.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/RuimCard.java[Copied from telephony/java/com/android/internal/telephony/gsm/GsmSimCard.java - diff]
telephony/java/com/android/internal/telephony/cdma/RuimFileHandler.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/RuimRecords.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/TtyIntent.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/package.html[Added - diff]
telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/sms/SmsDataCoding.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/sms/UserData.java[Added - diff]
telephony/java/com/android/internal/telephony/cdma/sms/package.html[Added - diff]
telephony/java/com/android/internal/telephony/gsm/AdnRecord.java[Deleted - diff]
telephony/java/com/android/internal/telephony/gsm/BaseCommands.java[Deleted - diff]
telephony/java/com/android/internal/telephony/gsm/GSMPhone.java[diff]
telephony/java/com/android/internal/telephony/gsm/GsmCall.java[Renamed from telephony/java/com/android/internal/telephony/gsm/GSMCall.java - diff]
telephony/java/com/android/internal/telephony/gsm/GsmCallTracker.java[Renamed from telephony/java/com/android/internal/telephony/gsm/CallTracker.java - diff]
telephony/java/com/android/internal/telephony/gsm/GsmConnection.java[Renamed from telephony/java/com/android/internal/telephony/gsm/GSMConnection.java - diff]
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java[Renamed from telephony/java/com/android/internal/telephony/gsm/DataConnectionTracker.java - diff]
telephony/java/com/android/internal/telephony/gsm/GsmMmiCode.java[diff]
telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java[Added - diff]
telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java[Renamed from telephony/java/com/android/internal/telephony/gsm/ServiceStateTracker.java - diff]
telephony/java/com/android/internal/telephony/gsm/GsmSmsAddress.java[Added - diff]
telephony/java/com/android/internal/telephony/gsm/MccTable.java[diff]
telephony/java/com/android/internal/telephony/gsm/NetworkInfo.aidl[diff]
telephony/java/com/android/internal/telephony/gsm/NetworkInfo.java[diff]
telephony/java/com/android/internal/telephony/gsm/PDPContextState.java[diff]
telephony/java/com/android/internal/telephony/gsm/PdpConnection.java[diff]
telephony/java/com/android/internal/telephony/gsm/PppLink.java[diff]
telephony/java/com/android/internal/telephony/gsm/SIMFileHandler.java[diff]
telephony/java/com/android/internal/telephony/gsm/SIMRecords.java[diff]
telephony/java/com/android/internal/telephony/gsm/SMSDispatcher.java[Deleted - diff]
telephony/java/com/android/internal/telephony/gsm/SimCard.java[Renamed from telephony/java/com/android/internal/telephony/gsm/GsmSimCard.java - diff]
telephony/java/com/android/internal/telephony/gsm/SimException.java[Deleted - diff]
telephony/java/com/android/internal/telephony/gsm/SimFileNotFound.java[Deleted - diff]
telephony/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java[diff]
telephony/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java[diff]
telephony/java/com/android/internal/telephony/gsm/SimTlv.java[diff]
telephony/java/com/android/internal/telephony/gsm/SmsMessage.java[Added - diff]
telephony/java/com/android/internal/telephony/gsm/stk/BerTlv.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/CommandParams.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/CommandParamsFactory.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/ComprehensionTlv.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/IconLoader.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/ImageDescriptor.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/ResponseData.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/RilMessageDecoder.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/StkService.java[diff]
telephony/java/com/android/internal/telephony/gsm/stk/ValueParser.java[diff]
telephony/java/com/android/internal/telephony/test/SimulatedCommands.java[diff]
telephony/java/com/android/internal/telephony/test/SimulatedGsmCallState.java[diff]
telephony/jni/cdmasms/Android.mk[Added - diff]
telephony/jni/cdmasms/cdma_sms_jni.cpp[Added - diff]
telephony/jni/cdmasms/cdma_sms_jni.h[Added - diff]
tests/AndroidTests/src/com/android/unit_tests/SMSTest.java[diff]
tests/CoreTests/com/android/internal/telephony/AdnRecordTest.java[Renamed from tests/CoreTests/com/android/internal/telephony/gsm/AdnRecordTest.java - diff]
tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java[Renamed from tests/CoreTests/com/android/internal/telephony/gsm/GsmAlphabetTest.java - diff]
tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java[Renamed from tests/CoreTests/com/android/internal/telephony/gsm/SMSDispatcherTest.java - diff]
tests/CoreTests/com/android/internal/telephony/SimPhoneBookTest.java[Renamed from tests/CoreTests/com/android/internal/telephony/gsm/SimPhoneBookTest.java - diff]
tests/CoreTests/com/android/internal/telephony/SimSmsTest.java[Renamed from tests/CoreTests/com/android/internal/telephony/gsm/SimSmsTest.java - diff]
tests/CoreTests/com/android/internal/telephony/SimUtilsTest.java[Renamed from tests/CoreTests/com/android/internal/telephony/gsm/SimUtilsTest.java - diff]
tests/CoreTests/com/android/internal/telephony/TelephonyTests.java[diff]
tests/framework-tests/src/com/android/internal/policy/impl/LockPatternKeyguardViewTest.java[diff]

192 files changed

tree: 1e96e55835f059a7b4b7b89a62ca0a9d7f0a5c17