• Home
  • History
  • Annotate
  • only in /frameworks/opt/telephony/
History log of /frameworks/opt/telephony/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
567ea1111c8a2f730f269ebe76c7da1ba1708852 03-Dec-2013 Jake Hamby <jhamby@google.com> Fix OOBE crash/DoS after receiving 0-byte WAP push.

Add a try/catch block around the code in WapPushOverSms.dispatchWapPdu(),
so we don't get into a reboot trap on receiving weirdly formed messages.
Only catch ArrayIndexOutOfBoundsException, which is difficult to
prevent inside dispatchWapPdu() for 0-byte PDUs or other unusual
contents. The caller should probably catch any unhandled exceptions of other types and log them with stack traces.

Bug: 11967705
Change-Id: Iabfec68d2564dd438d45c80cdba877bf19fa0397
rc/java/com/android/internal/telephony/WapPushOverSms.java
449cbf85380bd1d6716b7ab002da1efb9493bb02 15-Nov-2013 Wink Saville <wink@google.com> if provisioning apn conditionally restart the radio.

Some radios need a swift kick in the butt after provisioning.

Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
a28a290b5747609a71ccb689ce1937e5787bb3e8 14-Nov-2013 Wink Saville <wink@google.com> Merge "Telephony: unchange SIM info from CDMAPhone when SIM exists" into klp-dev
98003f87d01a98d3fd2a0561d0cfa45912ba2325 14-Nov-2013 David Braun <dabraun@google.com> Merge "Do not attempt to configure null preferred activity" into klp-dev
d8fb3ddda34db44297cf4b0f970b01bf58598960 14-Nov-2013 David Braun <dabraun@google.com> Do not attempt to configure null preferred activity

On non-phone devices the default SMS app is null. During the set/get paths
we would not try to configure the activity, but during the package update
path we called 'getDefaultSendToApplication" and configured it without
validating that it is non-null. This change adds the null check.

Bug: 11482259 When default SMS app changes we need to update the default app for the SEND intent
Change-Id: I227cfd803fd0667d78918a720b5a6eae9d57ea9d
rc/java/com/android/internal/telephony/SmsApplication.java
ce06370fc58f59abda3cb072326e9425da3d755d 13-Nov-2013 Wink Saville <wink@google.com> Telephony: unchange SIM info from CDMAPhone when SIM exists

This change is to prevent for updating the properties of 3GPP SIM
from the CDMAPhone when the 3GPP SIM exists on the card.

Bug: 11189478
Bug: 11360679
Change-Id: If849f8e0d6d6a1750cae045e35f3f92d73db4a20
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
088822a20462b9f364c22c88dbba2091000e2f4b 13-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Use settings DB only when mcc/mnc matches SIM" into klp-dev
4f7d3a536463db34dd6613685eb27593596377ef 13-Nov-2013 David Braun <dabraun@google.com> Merge "Update preferred activity for SMS related SENDTO intents" into klp-dev
ff51a1e0381b303e5bb7e4e0a8a6ad7d124437bd 12-Nov-2013 Sungmin Choi <sungmin.choi@lge.com> Use settings DB only when mcc/mnc matches SIM

Bug: 11600521
Change-Id: Iaeb1f279bf454ad0e7b933b8ac97d6384d599b59
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
8a4c72815186db4187587d4fc62125540a0e42a8 12-Nov-2013 David Braun <dabraun@google.com> Update preferred activity for SMS related SENDTO intents

Updates the preferred SENDTO activity for sms/mms schemes so that the user
will not see an intent disambiguation dialog for SENDTO sms/mms.

- Update preferred activity on set default SMS app
- Update preferred activity on "secure" get default SMS app
- Update preferred activity on package install/uninstall

Bug:11482259 When default SMS app changes we need to update the default app for the SEND intent
Change-Id: Ib2752fe84389f1c50cf2aa5841e75c3913b94e18
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/SmsApplication.java
53a0a7fd4954c3fd140e1123fcb0ac65d9e6c6c3 12-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> Notify all ApnContexts on a conn of Disconnect

Without this you can end up with default thinking
it's connected when it's actually not.

bug:10212445
Change-Id: Iffe3bf2064ac6c9f8e68ddb0d2b5115deaac2033
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
1795b863255a10f7734b4beb1fdfce9012857a26 09-Nov-2013 Wink Saville <wink@google.com> Fix documenation IMS registration state.

Bug: 11599127
Change-Id: Id0016bca45ea84983c9280f55b0b1ccdcececc03
rc/java/com/android/internal/telephony/CommandsInterface.java
38c4118a1a5bd8f4075063baa7b93244fa4f0263 09-Nov-2013 Wink Saville <wink@google.com> Merge "SMS over IMS bug fixes" into klp-dev
c0384e80b55813054add7904c78a583a180ffa76 09-Nov-2013 Jake Hamby <jhamby@google.com> Merge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev
64d73fe12011cb43fb85c722d26abcedceb6bb9a 08-Nov-2013 Ed Heyl <edheyl@google.com> merge in release branch changes (no-op).
2ad65b760c52976fe3aa8740934f9cfa108ad4fc 08-Nov-2013 Jake Hamby <jhamby@google.com> Fix GSMPhone.getServiceState() when mSST is null.

Prevent NPE when getServiceState() is called on GSMPhone after
removeReferences() is called on it.

Bug: 11561165
Change-Id: I77c3638dc33b24711db2d8541b067e17e30255a1
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
ace9a749c5a2a5e07527f728b7331423d16c36cd 30-Oct-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> SMS over IMS bug fixes

This change includes the following:
1) SMS over IMS remaining patches which address review comments

2) Fix for Bug:11378993
For MT SMS over IMS, if an application uses the createFromPdu(byte[] pdu) API
instead of createFromPdu(byte[] pdu,String format) API, we first try to create
SmsMessage from raw PDU with the format of active phone. That either returns a
valid SmsMessage object or throws a RuntimeException causing the correct format
to be used the next time. If GsmSmsAddress is not valid, we should throw
a RuntimeException which is handled by createFromPdu(byte[] pdu)

3) Fix for Bug:11424054
Register for ICC changes and handle new SMS on ICC

Bug: 11378993, 11424054
Change-Id: I94bcfcf93d8205c2916997091617899c6ebdd5e5
rc/java/android/telephony/SmsManager.java
rc/java/android/telephony/SmsMessage.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/ImsSMSDispatcher.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
52fa204952fa9b041d614e2bba5568362f79eb36 06-Nov-2013 The Android Automerger <android-build@google.com> merge in klp-mr1-release history after reset to klp-dev
a500ee7fd60949cc1f5646442a95c4c4edc721c4 06-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Add single-pdn arbitration." into klp-dev
64d4822073f42857ee378e55d99ce642480fc223 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "problem to send SMS message by bluetooth MAP profile." into klp-dev
3162ee6dd59a205ce2f50bacc7793d59d33a5a81 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "add SMS write permission for bluetooth package to support MAP profile." into klp-dev
3fad7daba62dcb7aafc4adc7f8cc123726ed5a7c 31-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Add single-pdn arbitration.

If a device or network can only support a single data connection
then we need to tear down lower priority connections in favor
of higher priority requests.

bug:10212445
Change-Id: I5ff38ae3be993aee51b6716045e6857b4f2942af
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
69601e4456a458ccad67429cb7462e33d0a9ef13 05-Nov-2013 Wink Saville <wink@google.com> Merge "Do not display dialog when PUK attempts remaining is 0." into klp-dev
cfd8384fe6419bdd177a109676db8edf8bf49ed6 05-Nov-2013 The Android Automerger <android-build@google.com> merge in klp-mr1-release history after reset to klp-dev
8409d93cf9f3ed23db12f24b4f49063ea416b30b 05-Nov-2013 Jake Hamby <jhamby@google.com> Use new PhoneNumberUtils method for CDMA MO SMS formatting.

For CDMA networks, convert "+" prefix to "011" if the home network
is using the North American Numbering Plan (NANP). Previously the
roaming network numbering plan was also checked, but for MO SMS,
only the home network numbering plan is relevant.

Bug: 11360679
Change-Id: Ia54f00c0ff2012622003ed4003b7fb59451b0bea
rc/java/com/android/internal/telephony/cdma/CdmaServiceCategoryProgramHandler.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
6d3c836bb8991e9cf7ffb322ebabf48c2446126d 04-Nov-2013 Wink Saville <wink@google.com> Do not display dialog when PUK attempts remaining is 0.

When using MMI codes to set a new pin and the attempts remaining becomes
zero the lock screen, KeyguardSimPukView, will be handling resetting the
PIN using the PUK. Therefore we set the MmiCode state to CANCELLED which
causes the dialog to be dismissed. If we don't do this then after setting
the new PIN from the lock screen the dialog will still be present
indicating the user still needs to set the PIN.

Bug: 9928717
Change-Id: Ic7dc51ba684a1fd623f2cab0a89f40ef8ff491d5
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
3ba048e25c35806cfeca3a5419565e64c9c5deef 31-Oct-2013 Wink Saville <wink@google.com> When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.

Without this change for devices where the phone can change, for instance
on N5 with Sprint the phone will change from a GSMPhone to a CDMALTEPhone
and messages will not be sent to the appropriate handler.

For Sprint this was most readily seen when the voice mail notification
wasn't sent to the notification manager.

Bug: 11254397
Change-Id: Ia0e764cf6fa04208a7e194a35435f251a177309f
rc/java/com/android/internal/telephony/CellBroadcastHandler.java
rc/java/com/android/internal/telephony/ImsSMSDispatcher.java
rc/java/com/android/internal/telephony/InboundSmsHandler.java
rc/java/com/android/internal/telephony/WakeLockStateMachine.java
rc/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceCategoryProgramHandler.java
rc/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
rc/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
4931e2c19616ab5985f61f343b231efb33692241 01-Nov-2013 Zhihai Xu <zhihaixu@google.com> problem to send SMS message by bluetooth MAP profile.

Currently SMSDispatcher will add the message to Sms.Sent database
for all non default SMS application.
This won't work for Bluetooth MAP profile.
In the bluetooth MAP spec, at 5.8 PushMessageFunction,
there are a parameter to control how to send the message by Bluetooth MAP.
Transparent:This parameter may be used to indicate to the MSE(phone)
that no copy of the message shall be kept in the 'Sent' folder
after the message was sent. This is especially useful for telematics applications,
e.g., frequent sending of car's speed and position for traffic measurements
(floating car data).
This application parameter is optional. The value of this parameter is "OFF"
(keep messages in 'Sent' folder) and "ON" (don't keep messages in Sent' folder).
If Transparent is "ON", we shouldn't put the message in Sent folder.
SMSDispatcher always put the message in Sms.Sent
which is mapped to the Sent folder in bluetooth MAP.
Prefer to let bluetooth to decide whether put the message in Sms.Sent based
on Transparent parameter value.

bug:11454636
Change-Id: I2e6c8deb5c4ed8bc9a3d90d492f4d4eb7dac7e5c
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/SmsApplication.java
a3cfd73ab9b464c93624839d2415981a00a44299 31-Oct-2013 Wink Saville <wink@google.com> Merge "When phone changes update InBoundSmsHandlers and CellBroadcastHandlers." into klp-dev
9382b17d503c107b38610b217ba7c93525be206a 30-Oct-2013 Zhihai Xu <zhihaixu@google.com> add SMS write permission for bluetooth package to support MAP profile.

bug:11415002
Change-Id: I177210e4139560b066ae40f100ca09ea35805359
rc/java/com/android/internal/telephony/SmsApplication.java
d2feaf918ab0c1173d4ada182532e48d0c0d3f77 31-Oct-2013 Wink Saville <wink@google.com> When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.

Without this change for devices where the phone can change, for instance
on N5 with Sprint the phone will change from a GSMPhone to a CDMALTEPhone
and messages will not be sent to the appropriate handler.

For Sprint this was most readily seen when the voice mail notification
wasn't sent to the notification manager.

Bug: 11254397
Change-Id: Ia0e764cf6fa04208a7e194a35435f251a177309f
rc/java/com/android/internal/telephony/CellBroadcastHandler.java
rc/java/com/android/internal/telephony/ImsSMSDispatcher.java
rc/java/com/android/internal/telephony/InboundSmsHandler.java
rc/java/com/android/internal/telephony/WakeLockStateMachine.java
rc/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceCategoryProgramHandler.java
rc/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
rc/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
2a374a4abef88e4cf7c6030ff831e3e0b9f658e3 26-Oct-2013 duho.ro <duho.ro@lge.com> Telephony: set default language of Canada as 'en'

The Canada SIM cards have the dual-IMSI functionality for the roaming
service. If it is working and the default system language is not set,
the system language can be changed by the MCC of the 2nd IMSI. So, the
default language should not be 'null'. This patch fills in the default
language of Canada as English.

Bug: 11361337
Change-Id: Iea6213e3ceca4a1cf054ebd9a13bb1d5574013b1
rc/java/com/android/internal/telephony/MccTable.java
3522c54a64f577f2b657a775dae9b4eb2d8003d5 25-Oct-2013 Wink Saville <wink@google.com> Few PIN/PUK fixes

Following changes have been made as part of this:
-> Changes done to display retry counter on wrong entry of
PIN1,and message to indicate Code accepted/PIN1 blocked
during PIN1 verification as per certain carrier requirements.
-> The current APIs that are used to verify the PIN and PUK only convey
whether the operation succeeded or failed. As a result on ANY failure
clients ask the user to re-enter the PIN.
Add 2 new APIs that report the actual error code and returns the
number of attempts remaing in case of failure.
-> FDN Service state was derived based on the state of PIN2. Update the
state of FDN service based on the FACILTY_LOCK messages instead.
-> Change the default value of function getIccLockEnabled to false.
When sim is deactivated/absent & user navigates to
Settings->Security->Set up SIM/RUIM card lock,
checkbox for "Lock Sim Card" option should be
unchecked by default.
-> PIN1 can be changed only after enabling SIM lock. RIL returns
REQUEST_NOT_SUPPORTED error if user tries to change PIN1 without
enabling SIM lock.
Handle the error and display appropriate message when trying to
change PIN1 using MMI code.
-> Added MMI support for change PIN1/PIN2 and unblocking PIN2

Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/uicc/IccCardProxy.java
rc/java/com/android/internal/telephony/uicc/UiccCardApplication.java
755e85a84a1bc8d243e45b8e237d0f79ebd7bd89 24-Oct-2013 Scott Main <smain@google.com> Merge "more sms provider docs" into klp-dev
404180e42c280437ddd14018ac948c9901186e73 23-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Fix bug in isOperatorConsideredNonRoaming

Mistakenly exits if the first check of many doesn't match.

bug:11136023
Change-Id: I04883d75f32214def360292c90b2f628c4e60991
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
29305a0d8e45e8b6731ab91e59fcba7a4d6ff766 21-Oct-2013 Scott Main <smain@google.com> more sms provider docs

Change-Id: I1967446a9709d88625cbcbc89b70228744dbf38a
rc/java/android/provider/Telephony.java
rc/java/android/telephony/SmsManager.java
rc/java/android/telephony/SmsMessage.java
07a8295c39cae39ff2b11100fe750d24abf9ad47 18-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Change how we use provisioning url so post works" into klp-dev
c8dc0c8244aac9f3985a53bc94b8ec2e295db430 17-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Change how we use provisioning url so post works

Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser. The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
218c5c362e47d943a98813bac9e1eeae6f366434 17-Oct-2013 Wei Huang <weih@google.com> Merge "Do not allow SMS event receivers to abort the broadcast" into klp-dev
49c9c9f29092dfab12e455847e30bb77724064f5 17-Oct-2013 Wei Huang <weih@google.com> Merge "Persist SMS messages sent by other than the default SMS app" into klp-dev
43ea072095dfc9208bd7af66d1702fba32d6c039 17-Oct-2013 Ed Heyl <edheyl@google.com> merge in klp-release (no-op)
ffe6e68213ae3220497188fed814e271b472292a 16-Oct-2013 Jake Hamby <jhamby@google.com> Clear CDMA latitude/longitude when location setting is off.

Clear CDMA base station latitude/longitude when returning
cell locations if user's location setting is disabled.

Bug: 11104404
Change-Id: I120c236ee57e37417ba7db3356678d33a087cc3d
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
5bc59fe360f396811723ce8f0fbb462504edda2a 17-Oct-2013 David Braun <dabraun@google.com> Do not allow SMS event receivers to abort the broadcast

This prevent apps from aborting the SMS related broadcasts so that all
apps interested in seeing them will now receive the broadcast.

Bug: 11259375 Do not allow apps to abort SMS/MMS broadcasts
Change-Id: I2620899b580b8861efebcc39408c875b4033cc53
rc/java/com/android/internal/telephony/InboundSmsHandler.java
0217e2d6e60f7edd95407c7b385a627da9f1c1e3 17-Oct-2013 David Braun <dabraun@google.com> Persist SMS messages sent by other than the default SMS app

Bug: 11256715 SmsManger.sendTextMessage() and SmsManager.sendMultiPartTextMessage() need to store the message in SmsProvider if called from non-default SMS app
Change-Id: I9f08435edd767f39863d018d59ec1d44e3d2128b
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
dd9bd1bb24ef4b81812956051179e8e274bee0db 16-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
5eee0d4d68b2a768aa5d27875cd0f2e44c2bd272 16-Oct-2013 Wink Saville <wink@google.com> telephony: Fix "R" icon displayed when device is searching or in LTE

Bug: 10745813, 10771508
Change-Id: I6741e14785484fe6af19d60487f4d545e568ccf9
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
e3f6e6a186ac6efe15faa0aa9f1df0333e114ed7 15-Oct-2013 Wink Saville <wink@google.com> Fix b10864885

Created getLocaleForLanguageCountry so that only one updateConfiguration
was needed to update Configuration.mcc/mnc/locale/userSetLocale. Previously
it took two updates, this streamlines the update making it more efficient.

Removed the conditional that was in setLocalFromMccIfNeeded on
getLteOnCdmaModeStatic which causes world phones that support cdma on
lte as well as gsm to not set the locale. This condiational was add to
support the multi logical SIMs for Verizon which has NV, RUIM and CSIM.

The intent of the conditional was to allow the EFpl/EFli fields of the
CSIM to be used to set the locale. But it doesn't work because of the
technique of using reading the current configuration, modifying it and
then writing it back would cause the current mode to be persisted because
of bug 11171996.

In short, bug 11171996 set the userSetLocale flag to true so when the
mcc/mnc is updated it also caused the current locale, en_US, to be
persisted not the "new" locale based on the mcc/mnc. Thus later, when the
CSIM was loaded it wouldn't be persisted anyway, because en_US was
already persisted.

Added the "persist.always.persist.locale" system property so that
you can test MccTable.updateMccMncConfiguration being called after
SetupWizard starts. Typically when starting a device that has been wiped
MccTable.updateMccMncConfigration is called before SetupWizard starts.
This means SetupWizard has the "proper" locale rather than en_US, the
default setup, when ActivityManagerService is constructed.

But, if you set persist.always.persist.locale to 1, persist.sys.language
to "en" and persist.sys.country to "US" and then reboot without wiping
SetupWizard will start first. As such SetupWizard will start with en_US
as its locale. A short time later MccTable.updateMccMncConfiguration will
be called and it will set the locale to the "proper" value based on the
mcc/mnc if you've set persist.always.persist.locale to 1. This allows the
testing of SetupWizard running first.

Finally I'm using Slog for logging as it makes it easier to debug the
interaction of MccTable, SetupWizard and ActivityManagerService.

Bug: b10864885
Change-Id: I19709ebf18f6d32af1b1b16ced511d331e145cf7
rc/java/com/android/internal/telephony/MccTable.java
640cb7e91fce37e910da8e46a83bbeaf5738abcc 14-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
76e1ee73bd112e78361e659dc97afb01ed9c7ca0 14-Oct-2013 David Braun <dabraun@google.com> Merge "Make SmsApplication checks more defensive" into klp-dev
c67761d00a25bd095364e3ff4e4cb8e88b2e974c 13-Oct-2013 David Braun <dabraun@google.com> Make SmsApplication checks more defensive

When SmsApplication::getApplication is called it will check to see if the
configured default SMS app and the phone package have the needed app ops
to work properly. If the call was made from a privilidged caller where
updateIfNeeded == true then the issue will be corrected, if the call was
made from an insecure caller we will return null indicating no default SMS
app which will cause client apps to know that they are not properly set
as the default SMS app. Either way we log an error.

When SmsApplication::setDefaultApplication is called we will ensure that
even if the previous app is no longer enabled or no longer set up as a
valid SMS app, we will still revoke it's OP_WRITE_SMS permission.

Bug: 11071837 Hangouts on KLP lost the WRITE_SMS permission
Change-Id: Ifea39a3d63e4ec3a30a6a1fa5834878dcc9ccfa0
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/SmsApplication.java
5a6b7bd85e2e51ac9e772d1bfa338da037f90b70 13-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
21fe62acc2d11ace0410b2b6d83263a96081c092 27-Sep-2013 duho.ro <duho.ro@lge.com> telephony: redirect call barring MMI code to other purpose

Some operators redirect call barring MMI codes to other purpose.
For instance, *333# should be processed as USSD code with Indonesia
Axis SIM and Indonesia Hutchison SIM. This change is adding an array
for call barring MMI code to config.xml. So, we can redefine the array
for redirecting the call barring MMI codes. The MMI code is compared
with the call barring MMI codes from config.xml.

Bug: 10101303

Change-Id: Ib21540a90c64e105cd4bc1864238329d594cd056
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
b6ed835ae59b8f7de1add27e67b20ee26b4e18ca 07-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Set profile DATA_PROFILE_TETHERED when DUN type

Bug: 11152852
Change-Id: I018e3dfb9c8183b11faedc83cc40be658173c4a3

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
1260f1c6c909f2940989b72afe1b91fd83845eaa 14-Sep-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> Support SMS over IMS

ImsSMSDispatcher is part of IccSmsInterfaceManager.
It always receives calls to send sms first and decides
whether to use ims call flow or gsm/cdma based on response
to REQUEST_IMS_REGISTRATION_STATE.

When ims is registered and sms is supported, the request also returns
sms format to use.

In case of sms over ims failure, RIL_REQUEST_IMS_SEND_SMS sets
messageRef from RIL_SMS_RESPONSE of corresponding failed MO SMS, and
sets retry field to non-zero. If voice is available, sends
RIL_REQUEST_IMS_SEND_SMS retries with data encoded based on voice tech
available. If voice is not available, sets retry counter to max and
skips retries and sends failure to client.

Bug: 9626411

Change-Id: I4c63c8fc0eb2191847b509e66772e3de27d491ed
Signed-off-by: Ed Tam <etam@google.com>

Conflicts:
src/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/android/telephony/SmsManager.java
rc/java/android/telephony/SmsMessage.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/ImsSMSDispatcher.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
6f2a3e1ea86ae7ae2e04eb95582e54eec7a2f864 14-Sep-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> Reorganize IccSmsInterfaceManager

Move duplicate functionality of RuimSmsInterfaceManager and
SimSmsInterfaceManager to the parent IccSmsInterfaceManager.
Earlier IccSmsInterfaceManagerProxy could only support RUIM
on CDMALTEPhone and SIM on GSMPhone.New architecture allows
for RUIM and SIM support for both GSMPhone and CDMALTEPhone

Change-Id: I8a3046fd0e8c366beefea267a79e14e4b1941d09
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
45df26444864daad60afdd4d121ab4043da3834b 07-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Set profile DATA_PROFILE_TETHERED when DUN type

Bug: 11152852
Change-Id: I018e3dfb9c8183b11faedc83cc40be658173c4a3

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
fa5c44e9d2a21d069fb166ce799bcba972062b67 09-Oct-2013 Ed Heyl <edheyl@google.com> merge in KQS81M
ec7a7807741172af981694735bffeef609d32dc4 08-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
002b8c6f5095a36bd09f2b6de6c4b3e1125c6158 07-Oct-2013 David Braun <dabraun@google.com> Merge "Do not allow default SMS application to be set or get on non-phone devices" into klp-dev
f9b1f2e2b45049d6f8cb455f379f2e36f5642b6a 07-Oct-2013 Wink Saville <wink@google.com> am bffd2117: am ef3149f4: Fix build.

* commit 'bffd2117a84bec9cfadef300177efe3b2ac4d89d':
Fix build.
df87bf5ff4929499d17a1a51995d95aded0f2a27 07-Oct-2013 Wink Saville <wink@google.com> am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.

* commit '7351fdfb5b61da990f72cdc18dead250a9e5379c':
Hipri should not be enabled by default. DO NOT MERGE.
13f55c54f7e5959d53daad8dbc708fc77032f34f 07-Oct-2013 Wink Saville <wink@google.com> am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

* commit 'e3e070ec720cceb3f12d9c720e42519797aff583':
Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.
5cae974f106dcd8fe84023afd9c4b1ffb7df3c52 07-Oct-2013 Wink Saville <wink@google.com> am e065bce5: (-s ours) am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.

* commit 'e065bce5478efc479d37466fd8923e0e2422ec5d':
Fix NPE when exiting DcDefaultState. DO NOT MERGE.
0cdd3c100d5c53bdeae7b474bebbabb10d14b4fc 07-Oct-2013 Wink Saville <wink@google.com> am 16758906: (-s ours) am f02d966c: Handling data registration and radio technology changing. DO NOT MERGE.

* commit '1675890645834ed5d9aee23b8de2c0d5d66d6d15':
Handling data registration and radio technology changing. DO NOT MERGE.
8c9c5332766412bbb2561ea19c1147243f3fa0a4 07-Oct-2013 Wink Saville <wink@google.com> am 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.

* commit '2f25f74592dcc0d13035f8adfdb90b7bc6a54e06':
Change DcTracker to not connect or retry if detached. DO NOT MERGE.
cca7f8a4db05ab1d9a757cb48bb64f84b5156876 07-Oct-2013 Wink Saville <wink@google.com> am 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict

* commit '74abae3576f9ae6f8ad96762851d880d3853e553':
Change DcTracker construction so only initialization is preformed. DO NOT MERGE.
bffd2117a84bec9cfadef300177efe3b2ac4d89d 07-Oct-2013 Wink Saville <wink@google.com> am ef3149f4: Fix build.

* commit 'ef3149f4e736344e55f0fc8ceb419edf66119969':
Fix build.
7351fdfb5b61da990f72cdc18dead250a9e5379c 07-Oct-2013 Wink Saville <wink@google.com> am 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.

* commit '1b8d3498dde73d31c8d6e48050b6240164a8fcc1':
Hipri should not be enabled by default. DO NOT MERGE.
e3e070ec720cceb3f12d9c720e42519797aff583 07-Oct-2013 Wink Saville <wink@google.com> am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

* commit '59986fee9e72a2298e08d118d51f22f3c86be3b4':
Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.
e065bce5478efc479d37466fd8923e0e2422ec5d 07-Oct-2013 Wink Saville <wink@google.com> am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.

* commit 'e188b6586d6683ef1fa8dc781cbf4e66ee71a4c3':
Fix NPE when exiting DcDefaultState. DO NOT MERGE.
1675890645834ed5d9aee23b8de2c0d5d66d6d15 07-Oct-2013 Wink Saville <wink@google.com> am f02d966c: Handling data registration and radio technology changing. DO NOT MERGE.

* commit 'f02d966cc7e87eaea595f05714857c4ca99a36e6':
Handling data registration and radio technology changing. DO NOT MERGE.
2f25f74592dcc0d13035f8adfdb90b7bc6a54e06 07-Oct-2013 Wink Saville <wink@google.com> am ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.

* commit 'ec56ef5d31886afbae233e5cccb8fbf78cfa01c4':
Change DcTracker to not connect or retry if detached. DO NOT MERGE.
74abae3576f9ae6f8ad96762851d880d3853e553 07-Oct-2013 Wink Saville <wink@google.com> Merge commit '89518902' into merge-conflict

* commit '89518902':
Change DcTracker construction so only initialization is preformed. DO NOT MERGE.
29569c31ed24dd8f48be3f898047d4d7b5665052 05-Oct-2013 David Braun <dabraun@google.com> Do not allow default SMS application to be set or get on non-phone devices

Bug: 11072894 People app should not launch into default SMS app on tablets
Change-Id: I9cedf3840f46bbc135f535b60659e5527f79a5aa
rc/java/com/android/internal/telephony/SmsApplication.java
129558a324bb68aa237bfd9b70222a78d91c59d4 03-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Revert "Stop using the sim mnc/mcc to set wifi country."

This reverts commit 78d801a78087b6a2419f0820628d0273df53203f.

bug:11064682
Change-Id: I46f5b90de417636d03bfa5932684f0ace68a3f6e
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/PhoneBase.java
e595a18f15d8073c8657ef7fa3da34986acb1a6d 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Revert "Stop using the sim mnc/mcc to set wifi country."" into klp-dev
ef3149f4e736344e55f0fc8ceb419edf66119969 04-Oct-2013 Wink Saville <wink@google.com> Fix build.

The merge conflicts I'd resolved internally got overwritten when pushed
up the other changes.

Change-Id: I6a3cd569e6cf1a0fb09a19379d65724d43c11bdf
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
e0695876e8a7084cf4eaa8e6c71808f238a853a7 03-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Revert "Stop using the sim mnc/mcc to set wifi country."

This reverts commit 78d801a78087b6a2419f0820628d0273df53203f.

bug:11064682
Change-Id: I46f5b90de417636d03bfa5932684f0ace68a3f6e
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/PhoneBase.java
1b8d3498dde73d31c8d6e48050b6240164a8fcc1 16-Aug-2013 Wink Saville <wink@google.com> Hipri should not be enabled by default. DO NOT MERGE.

This can cause it to become to become the default connection
which it is not and get started instead of default.

Change-Id: I3a223099c53423856e6adfaef4abc0274f9d4c2a
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
59986fee9e72a2298e08d118d51f22f3c86be3b4 16-Aug-2013 Wink Saville <wink@google.com> Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

Bug: 9040003
Change-Id: I749d502529fc5542b910f4e49460730070b3e4b9
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
e188b6586d6683ef1fa8dc781cbf4e66ee71a4c3 16-Aug-2013 Wink Saville <wink@google.com> Fix NPE when exiting DcDefaultState. DO NOT MERGE.

Bug: 9263045
Change-Id: Ib3b599b2502130af248a0cffc226d8916047dc6d
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
f02d966cc7e87eaea595f05714857c4ca99a36e6 16-Aug-2013 Wink Saville <wink@google.com> Handling data registration and radio technology changing. DO NOT MERGE.

When the DataRegistrationState (aka DRS) or RilDataRadioTechnology changes
aka Radio Access Technology or RAT) while retrying the DataConnection
StateMachine will return the connection as lost immediately. This allows
the connection to be retried with the correct handling of the changed
DRS or RAT quickly, rather than having to wait until retires are exhausted.

Changes:

- Pass RAT in bringUp
- Add the capability to register for DRS/RAT changes with SST
- When DRS/RAT changes in DcRetryState return LOST_CONNECTION to DcTracker

Bug: 9069568
Change-Id: I897168baf17ecaedd0f1df4ef3c2263066d70ece
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcAsyncChannel.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
ec56ef5d31886afbae233e5cccb8fbf78cfa01c4 16-Aug-2013 Wink Saville <wink@google.com> Change DcTracker to not connect or retry if detached. DO NOT MERGE.

If we're detached than there is no possibility of connecting
so fail early. Upon attaching enabled connections will be retried.

Bug: 9024828
Change-Id: I7b3f8f872ae9b205cf0a71a9bc4ac73df664f48d
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
89518902fe52a162864b2b641462150002ee8b07 02-Oct-2013 Wink Saville <wink@google.com> Change DcTracker construction so only initialization is preformed. DO NOT MERGE.

In initApnContexts applyNewState and onSetDependency met could cause
calls to trySetupData which can send notifications or even try to
bring up a connection. This can cause problems as not all objects are
initialized. In particular when I tried to change ApnContext#isReady
to be false it caused a call to mPhone.notifyDataConnection but mPhone
wasn't completely initialized and an NPE occurred.

Bug: 9022095
Change-Id: Ie817db2c0c1b381b1f58e87817f4b2336c7a3159
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
a7a3ece9b322cef5b959c0254677b920667651ee 01-Oct-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
98cad5c9c31f82eadaeada775937632a2a508147 30-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Stop using the sim mnc/mcc to set wifi country." into klp-dev
5408ebae1011f71ed821c7fea1ad24fa429e2520 30-Sep-2013 Jake Hamby <jhamby@google.com> Merge "Add Telephony intent class to public API." into klp-dev
78d801a78087b6a2419f0820628d0273df53203f 28-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Stop using the sim mnc/mcc to set wifi country.

bug:10513734
Change-Id: Idac32892db8ff9b5ca4c5bde4f3f3b12f0df1196
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/PhoneBase.java
4e58395d0fc3da669b8c08836285c3573dcbd2b9 27-Sep-2013 Wink Saville <wink@google.com> Handle SIGNAL_LOST(-3) as a retryable error.

Qualcomm reports SIGNAL_LOST when a signal is lost temporarily
and should be retired. If a radio technology changes then the
DataConnection will stop retrying and the DcTracker will get a
new configuration and setup a new data call. If the rat doesn't
change then DataConnection will reestablish the call on the next
retry attempt.

Bug: 10804691
Change-Id: I4d310e7f2ea2dc46c7bcdd2b8687d1ef6b901e01
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
3441daee83adc0f6870c43bf5d4fe408aebe50e5 29-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
1ec85a29a26bfab4e21ad68000afc637e0cf171c 27-Sep-2013 Wink Saville <wink@google.com> Handle SIGNAL_LOST(-3) as a retryable error.

Qualcomm reports SIGNAL_LOST when a signal is lost temporarily
and should be retired. If a radio technology changes then the
DataConnection will stop retrying and the DcTracker will get a
new configuration and setup a new data call. If the rat doesn't
change then DataConnection will reestablish the call on the next
retry attempt.

Bug: 10804691
Change-Id: I4d310e7f2ea2dc46c7bcdd2b8687d1ef6b901e01
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
a1a02608bdc7ab7248d8a7ae7cf45e0900e53c34 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "Revert "telephony: Set roam though same named operator""" into klp-dev
1110f0fd89337adc1b09fe866750b8721ef882cf 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Revert "Revert "telephony: Set roam though same named operator""

This reverts commit cd338fdb16422f47788c3bc3cdf6391f1268bbfe.

Change-Id: Ib7aa6ce911a22098461c76b5e0be191852d34bb1
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
81d0c210c9ffec188ec94afb2fe6dfe20add4b3c 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "telephony: Set roam though same named operator"" into klp-dev
cd338fdb16422f47788c3bc3cdf6391f1268bbfe 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Revert "telephony: Set roam though same named operator"

This reverts commit ce0eb1a929a8abb9a99b042813e403b0d6f74fdd.

Change-Id: I324343a218e155ece9f8243cdc44ce9fffe8e5d5
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
14134b84407227c6be23ce927397433fa34907b8 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "telephony: Set roam though same named operator" into klp-dev
ce0eb1a929a8abb9a99b042813e403b0d6f74fdd 23-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Set roam though same named operator

Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
fa79534c04dfd11ccbd0daa4687fb0b470f22598 26-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
2a48b51dc349fcfc5bedeba012d9d5bdc35e2f72 29-Aug-2013 Sungmin Choi <sungmin.choi@lge.com> wappush: Use valid index for pdu including garbages

For some operators, pdu has garbages. As a result, device does not receive
MMS or operator some requests.
To fix it, re-index pdu to use valid index for operators.

Bug: 10492745
Change-Id: Ic7262f7369403bd060d94c5da0e09f18c96ff3db
rc/java/com/android/internal/telephony/WapPushOverSms.java
21b2c1814fe47e88b3881d47983f79014682411e 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC: to avoid overwriting ICC operator numeric" into klp-dev
8469152d2c6bdaf4632a07880bd1bcd6af78d10b 16-Sep-2013 duho.ro <duho.ro@lge.com> UICC: to avoid overwriting ICC operator numeric

When the SIM card is inserted and the radio tech is CDMA,
init() of CDMAPhone overwrites the ICC operator numeric as
CDMA_HOME_OPERATOR_NUMERIC. It makes some abnormal state when the
CDMA_HOME_OPERATOR_NUMERIC has a wrong value or empty.
This change is skipping the overwriting ICC operator numeric when UICC
card has a SIM/USIM application because the application has its own
operator numeric.

Bug: 10774885
Change-Id: I0171000ef38fad23858f7266ab0cae3bd314b6b1
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
13fa971b6c6eab1578f4732c8de6fa2ba3b57ce6 29-Aug-2013 Sungmin Choi <sungmin.choi@lge.com> wappush: Use valid index for pdu including garbages

For some operators, pdu has garbages. As a result, device does not receive
MMS or operator some requests.
To fix it, re-index pdu to use valid index for operators.

Bug: 10492745
Change-Id: Ic7262f7369403bd060d94c5da0e09f18c96ff3db
rc/java/com/android/internal/telephony/WapPushOverSms.java
b47af9b263628c00b1c890f102091098a31463c0 13-Sep-2013 Jake Hamby <jhamby@google.com> Add Telephony intent class to public API.

Remove @hide from android.provider.Telephony for K release for
SMS and MMS related tables, and APN database (for MMSC info).
Helper methods are hidden except for two that use non-public APIs.

Bug: 10653081
Change-Id: I3509b122ae4e762c1c44e6b4aa8b36c8d0b62224
rc/java/android/provider/Telephony.java
a756bfb42e1f5658cd24076390a08307870f557c 25-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
d1b11a349bb6310fb7902280856daf09cac20647 25-Sep-2013 David Braun <dabraun@google.com> Merge "Update the requirements for being an SMS app in KLP" into klp-dev
041cfe21bd66c8cb002435e7dc54177db2e927aa 25-Sep-2013 David Braun <dabraun@google.com> Update the requirements for being an SMS app in KLP

SMS applications need to handle repsond-via-message (for rejecting a phone
call with an SMS message) and SENDTO with the smsto Uri scheme so that
contact applications can direct the user to the right app. This change also
adds permission requirements for the existing intents that SMS apps
implement.

Bug: 10870624 System should direct "SENDTO" intent with "sms" and "mms" schemes to the default SMS app
Bug: 10818880 Telephony needs to direct RESPOND_VIA_MESSAGE intent only to the default SMS app
Change-Id: I373268bb694f155fb08e2864ae86af345a85c4ff
rc/java/com/android/internal/telephony/SmsApplication.java
6eecb29d2af7d54e63a0136f97b6badad2120d23 06-Jun-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Add Explicit Call Transfer (ECT) feature

Use ECT as "4 + Send".

Bug: 9745857
Change-Id: If94d7ad33eb72dede86030c26e8a8c1b5b8125e3
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
536eeeb053efe3f1f60e61ff24bf1a8093d3c879 11-Jul-2013 duho.ro <duho.ro@lge.com> UICC : fix read EF Image Instance

The EFs(4Fxx) path under DF Graphics are not distinguish with
the EFs(4Fxx) path under DF Phonebook. So, getEFPath(EF_IIDF)
is not able to return correct path. Because getEFPath(EF_IMG)
is correct path, DF graphics, getEFPath(EF_IMG) is used instead of getEFPath(EF_IIDF),

EF_IMG is a linear fixed EF. The result of loading EF_IMG should be
processed as a LoadLinearFixedContext. So, it is needed to calculate the
number of EF_IMG records. If those changes are added, the changes are
duplicated with the codes of EVENT_GET_RECORD_SIZE_DONE. The codes
of EVENT_GET_RECORD_SIZE_IMG_DONE are removed and the event is treated
by the logic of the EVENT_GET_RECORD_SIZE_DONE. And then remove incorrect handler
events(EVENT_READ_IMG_DONE and EVENT_READ_ICON_DONE) are moved to the handler
events which have the procedure for loading same type EFs (EVENT_READ_RECORD_DONE
and the EVENT_READ_BINARY_DONE).

Bug: 9767739

Change-Id: I754ec5c40cff99adef11a9dfdc31b8e0446befbb
rc/java/com/android/internal/telephony/uicc/IccFileHandler.java
rc/java/com/android/internal/telephony/uicc/RuimFileHandler.java
e3600ea1edbe9c9c1935bbb2afc47691a93a3374 24-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
79d07f7e6df0b91f3042e412a3d538ebff34a680 23-Sep-2013 Wink Saville <wink@google.com> Move RIL_REQUEST_SET_INITIAL_ATTACH_APN to RILConstants.java

Bug: 9626411
Change-Id: I0c278d9f4c6fd7e12c495c2411ab94ac87e1f316
rc/java/com/android/internal/telephony/RIL.java
68b1cdcce7ac53015c8b5ecbcfb9ce9d1ad5d172 23-Sep-2013 David Braun <dabraun@google.com> Update API used to determine default SMS app.

In order to direct intents that make sense to send only to the default SMS
app, we need to update the API to return the package rather than just
having it check the package name.

Bug: 10870624 System should direct "SENDTO" intent with "sms" and "mms" schemes to the default SMS app
Change-Id: I1aa44a8a1113c42a13b4cb1f813fcaed347c1f47
rc/java/android/provider/Telephony.java
1f1a892c0fb2e655a634e4a0ef999bb8847e79d6 22-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
9c9341ecba5312a4a5be5f9fee3ffe1b582b65ce 20-Sep-2013 David Braun <dabraun@google.com> Add config setting for default sms app.

Different devices can have different default SMS apps.

Bug: 10818725 Allow OEM to specify or override a default SMS app (package)
Change-Id: I11c9832d2246677231e6a54cb03eb76650c85c98
rc/java/com/android/internal/telephony/SmsApplication.java
f25a13461afe9c95249003d3d3a61ea38a260c3a 19-Sep-2013 David Braun <dabraun@google.com> Ensure that a default SMS app is configured at boot

Make sure that two things are true on boot so that SMS/MMS will work
properly:
1) We have selected a default SMS/MMS app that will have write permission
to the SMS database
2) The Phone app always has permission to the database because it needs
to write to the raw tables when delivering MMS messages.

Note: If you change the default app explicitly the problems sending SMS
and MMS messages in Messaging will still happen. Preventing this requires
a larger change to prevent Mms from trying to send when it is not the
default app.

Bug: 10819150 Messaging App crashes while sending MMS
Bug: 10837862 Unable to send messages in Messaging app
Change-Id: Ie920e308b9b4067f0bbe1b6b2184c22aaf663065
rc/java/com/android/internal/telephony/PhoneFactory.java
a316d77b726f6d210169c9c6079ac08312a0bd75 19-Sep-2013 Wink Saville <wink@google.com> Merge "Fix potential NPE in ApnContext.isProvisioningApn" into klp-dev
33ab7bad1f2ccb5dea26d0def6e43a4f2d1b9cb9 19-Sep-2013 David Braun <dabraun@google.com> Ensure that a default SMS app is configured at boot

Make sure that two things are true on boot so that SMS/MMS will work
properly:
1) We have selected a default SMS/MMS app that will have write permission
to the SMS database
2) The Phone app always has permission to the database because it needs
to write to the raw tables when delivering MMS messages.

Note: If you change the default app explicitly the problems sending SMS
and MMS messages in Messaging will still happen. Preventing this requires
a larger change to prevent Mms from trying to send when it is not the
default app.

Bug: 10819150 Messaging App crashes while sending MMS
Bug: 10837862 Unable to send messages in Messaging app
Change-Id: Ie920e308b9b4067f0bbe1b6b2184c22aaf663065
rc/java/com/android/internal/telephony/PhoneFactory.java
9f332c9a4f464b36bac30555c5cfa6431e7211f8 19-Sep-2013 Wink Saville <wink@google.com> Fix potential NPE in ApnContext.isProvisioningApn

Bug: 10839016
Change-Id: Ifa0f974c0df69928a5d1e29c215b5bcf8c4a5fb1
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
fb20209487e1e4e76e62c16919a764b40486d45a 19-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
15f6090f860dd50c6de051a2af62f1672108eb5e 19-Sep-2013 Jake Hamby <jhamby@google.com> Merge "Fix permission check for reading SMS on UICC." into klp-dev
31ae682ff511ddde4073c3f94eff15da2f7fade6 18-Sep-2013 Wink Saville <wink@google.com> Telephony: Update CF number in EF_CFIS.

When call forwarding is enabled, only status is updated in EF_CFIS.
CF number is not updated. Added support to update CF number as well.

Bug: 10642929
Change-Id: Ia764b872b7837d71ffad206e37e9b261e4db7a83
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
e5d7a8d946bf9496ffbe7533bffdeb83963489c3 18-Sep-2013 Jake Hamby <jhamby@google.com> Fix permission check for reading SMS on UICC.

When accessing SMS stored on UICC via TelephonyProvider, we need to
use the com.android.phone UID for the call to IccSmsInterfaceManager
to avoid a UID mismatch failure in the app ops check. Change the
permission check method call from enforceCallingPermission() to
enforceCallingOrSelfPermission() so the check doesn't fail.

Bug: 10131077
Change-Id: I0d7e0925be1fc69a95298865a1632a1fd953add0
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
ea7024ea73172094df33629d7e3b529561cd0289 18-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
60785ef1648dd05090b4c837dc0321e0c640f3a3 18-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
74c533d1ef7b1a456361ef0ca0fa82e5a5838467 18-Sep-2013 Wink Saville <wink@google.com> Merge "Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE" into klp-dev
a96465da72a526be749137c9d8aa3e0e19525690 18-Sep-2013 David Braun <dabraun@google.com> Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
67cf0ab822c20976ede24612be83f9ba31619e97 17-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
d62a7cecd0451592222d73995dd53074aa6f98a5 15-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Increase the MAX_CONNECTIONS to 8

The problem is that Telephony does not handle call id 2 for CDMA.
When back to back calls are made, RIL stores the previous call information
for some time as it needs to give failure reason for the last call
that failed when telephony asks for it.
So for the next call it assigns a call ID of 2.

Bug: 10355466
Change-Id: I9a4a188780bde9e66aacc7a43d54df1118b10dfb
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
5c3b6658d82f3af57161d5a34385dd95ea0f1abb 16-Sep-2013 David Braun <dabraun@google.com> Implement new method for handling SMS/MMS on the platform

Multi project change:
The changes in this project implement the actual change in the SMS related
intent behavior (defining and using the new events).

Bug: 10449618
Change-Id: Ia707ed561d89428db78203a2ed54504d867a3e43
rc/java/android/provider/Telephony.java
rc/java/com/android/internal/telephony/InboundSmsHandler.java
rc/java/com/android/internal/telephony/SmsApplication.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
fba544106298510dc3edf110ab2be92270f08c13 22-Nov-2011 Anshul Jain <anshulj@codeaurora.org> Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE

Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE as a way to exit from
Emergency Callback Mode

Bug: 10749583
Change-Id: Ia572ac5a4d5ab38166453dcdf26fb0a667bba74e
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
827af0459c7b953d8b5d3928685dcccbcd15883c 12-Sep-2013 Wink Saville <wink@google.com> In Cdma Lte SST use CssIndicator for concurrent Voice & Data.

This will break concurrent voice and data on mysid, but because
mysid is EOL and to keep this change simple we're not trying to
mitigate that using config variables.

Bug: 10100317
Change-Id: I7960a8d68258621de1fd9c140c3fefcdfcea8804
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
e593c266e759c12ed1f312b8451f82d2210c5359 12-Sep-2013 Wink Saville <wink@google.com> Add code to handle voice radio technology of LTE.

Sometimes the Voice Radio Technology is reported as LTE but Voice
over LTE (VoLte) is not currently supported and for Sprint we
should default to CDMAPhone in that case. Otherwise the could stay
as a GSMPhone and handling voice calls will fail.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
ef6952effc63096d35e44908ad2ac68ac1a87b8a 12-Sep-2013 Jake Hamby <jhamby@google.com> Fix voicemail notification for Sprint.

Sprint voicemail notification wasn't showing up because we were
looking for a CSIM application on the UICC and couldn't find it.
Added code to CDMAPhone.onUpdateIccAvailability() to load the USIM
application if we fail to get the CSIM application.

Bug: 9908333
Change-Id: I5c69c9eea6972e377b10a4057492f9ecc8233028
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
e7f126d0230b75d30bee23d1ad2ae1b73058de37 12-Sep-2013 Wink Saville <wink@google.com> Telephony: Ignore events on a destroyed phone

It is possible to receive responses from RIL after phone has released
it's references. Ignore events in such cases, since those events no
longer make sense, and some phone members have been de-initialized.

Make CallTrackers notify UI when ending calls in dispose, since
it has already unregistered, and won't receive the CALL_STATE_CHANGED

Change-Id: I5d8fd9ce3f74b9ae9b5b645565bd24d11be0aebc
CRs-Fixed: 228731, 228005, 415801, 350739
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
7edea1816641fbc6471e7cd49a60ac2aac2fde3a 13-Sep-2013 Wink Saville <wink@google.com> Merge "In Cdma Lte SST use CssIndicator for concurrent Voice & Data." into klp-dev
c4dc2a98dc57f501c6d9b829ef1bf6d1ade613ef 13-Sep-2013 Wink Saville <wink@google.com> Merge "Add code to handle voice radio technology of LTE." into klp-dev
05b2bd6d8fb038e35c51e5eab36c7dd9886b1da5 13-Sep-2013 Jake Hamby <jhamby@google.com> Merge "Fix voicemail notification for Sprint." into klp-dev
df53e221838a87a2d5d5175c1b8372e8515a822c 12-Sep-2013 Jake Hamby <jhamby@google.com> Fix voicemail notification for Sprint.

Sprint voicemail notification wasn't showing up because we were
looking for a CSIM application on the UICC and couldn't find it.
Added code to CDMAPhone.onUpdateIccAvailability() to load the USIM
application if we fail to get the CSIM application.

Bug: 9908333
Change-Id: I5c69c9eea6972e377b10a4057492f9ecc8233028
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
e4ab1fe53bfdd218f752d01311e6785ebe2ea295 12-Sep-2013 Wink Saville <wink@google.com> Merge "Telephony: Ignore events on a destroyed phone" into klp-dev
5e2000b856a7959609e8f15148a3584ec372f865 12-Sep-2013 Wink Saville <wink@google.com> Telephony: Ignore events on a destroyed phone

It is possible to receive responses from RIL after phone has released
it's references. Ignore events in such cases, since those events no
longer make sense, and some phone members have been de-initialized.

Make CallTrackers notify UI when ending calls in dispose, since
it has already unregistered, and won't receive the CALL_STATE_CHANGED

Change-Id: I5d8fd9ce3f74b9ae9b5b645565bd24d11be0aebc
CRs-Fixed: 228731, 228005, 415801, 350739
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
1785c21bf40489845fa70d8771858c1bfc124dd5 12-Sep-2013 Wink Saville <wink@google.com> In Cdma Lte SST use CssIndicator for concurrent Voice & Data.

This will break concurrent voice and data on mysid, but because
mysid is EOL and to keep this change simple we're not trying to
mitigate that using config variables.

Bug: 10100317
Change-Id: I7960a8d68258621de1fd9c140c3fefcdfcea8804
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
b54cd09892e0676d719e6df00e60c77b663f993c 12-Sep-2013 Wink Saville <wink@google.com> Add code to handle voice radio technology of LTE.

Sometimes the Voice Radio Technology is reported as LTE but Voice
over LTE (VoLte) is not currently supported and for Sprint we
should default to CDMAPhone in that case. Otherwise the could stay
as a GSMPhone and handling voice calls will fail.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
a4ac174f628244a7a89289b90af1287a8502fdb1 12-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
150b65fc3b52beab23f0d714e4c3166f90d3985e 11-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Remove special code for fake CDMA APN

revert of https://android-review.googlesource.com/#/c/62943/2

Solved the need for sprint using bearer-specific APNs instead
as the phone type is not a reliable trigger.

bug: 9315957
Change-Id: I0e5545ab4706df2c5917c7534291644c5d8797b3
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
a6c4f87089b072106e5660e86d0b9a2bf6383fd8 11-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
cfc20537a6442471fe27037e62380b29214f0f24 11-Sep-2013 Wink Saville <wink@google.com> Merge "CatService: OPEN_CHANNEL p-cmd to send event confirmation and not T.R" into klp-dev
c5a252768220b1caa01e5b62b42fd323d1f92702 21-Aug-2012 Shriram Ganesh <sganesh@codeaurora.org> CatService: OPEN_CHANNEL p-cmd to send event confirmation and not T.R

Upon handling OPEN_CHANNEL command, send User confirmation instead of
terminal response as lower layers expect confirmation information.

Bug: 10602211
Change-Id: I99ee5210ff345660559d1656e80c6ab8b0991d8e
rc/java/com/android/internal/telephony/cat/CatService.java
8b61e10b480d3a7bae41025a97f3bd27ee5ed610 11-Sep-2013 Jake Hamby <jhamby@google.com> Fix receiving multi-part CDMA WAP messages.

Fix ArrayIndexOutOfBoundsException in CDMA WAP message handling.
Add a new flag to raw DB table to indicate 3GPP2 WAP PDU messages.
Use the new flag to return the correct value for getIndexOffset()
in InboundSmsTracker.

Previously this only worked correctly for single-segment WAP PDUs
of type WAP push.

Bug: 10595053
Change-Id: I8820da124e8fa4707cbee0398690a475d26ff702
rc/java/com/android/internal/telephony/InboundSmsHandler.java
rc/java/com/android/internal/telephony/InboundSmsTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java
1fdd3ce86b71e2a3a3544bf7acabfa63a82a7608 10-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
90271d9ef1377b25b78359039fb2e87f32aba25b 04-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> sms: Add exception code instead of low memory status

Add exceptoin code, after receiving Duplicated SMS.

Bug: 10484923
Change-Id: Ic9465adeb8a09d11fdd2e5b35108410baf56a2fc
Signed-off-by: daehun.ju <daehun.ju@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
rc/java/android/provider/Telephony.java
rc/java/com/android/internal/telephony/InboundSmsHandler.java
8e416432ae310dd451f1360dfd4f70d8ef9b3903 06-Sep-2013 duho.ro <duho.ro@lge.com> UICC: get ICCID from SIM for CDMAPhone state

If the phone state is CDMAPhone and the UICC does not have a CDMA application,
getIccSerialNumber() can not read the ICCID from SIM.
This changes are changing the reference of the card application object
from RUIMRecords to SIMRecords. So, this method is able to get the ICCID
from SIMRecords, if the UICC has a SIM/USIM.

Bug: 10564873
Change-Id: Id55f794828f1f1a89905298776500df90088b17e
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
65d0f4567741f7dc080735f7a19701f1f87e7500 09-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
a23d86f400fe029aa05592b963b2c10988545a55 05-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Fix roaming icon setting

Currently, if data roaming is true and gsm roaming is true,
roaming icon is always true.
But, in this case, roamin icon shoould depends on other condition,
i.e., same named operators or operator considered non-roaming.

Bug: 10642211
Change-Id: Ia98ffeec5dc013cf045b15c9a7c53c4a24f2eeb5
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
46ccf9f192b263456e76dae0c86e36f4fc1ae7f7 05-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
2d973cc97744549277b1c433c092dcb15efd694b 05-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC : Add MCC MNC codes having 3 digits MNC" into klp-dev
79391c0b55b4dbff55c2963bf7c56af0351dd274 05-Sep-2013 Wink Saville <wink@google.com> Merge commit 'ebca826a' into manualmerge

* commit 'ebca826a':
Add provisioning apn timeout.

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

Change-Id: Ic89a22167b91e05068160a6ef0a194215913bfe7
ebca826a2b78a8542146ad1600df1cb4275a0823 05-Sep-2013 Wink Saville <wink@google.com> am e9063f69: Add provisioning apn timeout.

* commit 'e9063f6973039d66e12d0d930af03906d377969e':
Add provisioning apn timeout.
e9063f6973039d66e12d0d930af03906d377969e 05-Sep-2013 Wink Saville <wink@google.com> Add provisioning apn timeout.

Bug: 10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
0530f592d89c1eceea7ee5bccb2359061a04f968 03-Sep-2013 duho.ro <duho.ro@lge.com> UICC : Add MCC MNC codes having 3 digits MNC

Old Rogers, Fido, TMUS and Malaysia cards having incorrect MNC length.

Bug: 9892341

Change-Id: I4bc24bd929e3822732e88282d0a64f59623a4c41
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
a0d02d50aa0fd7cf1c2d9f4d811efd2e4bfb7d4a 05-Sep-2013 Jake Hamby <jhamby@google.com> Fix receiving class 2 SMS messages.

SIMRecords class was creating the wrong type of SmsMessage object
for class 2 messages, causing a ClassCastException error. Verified
that this change fixes the bug using MD8475A call box.

Bug: 9578184
Change-Id: Ia325c6b1594d625237dc0966c05f56f586bb4baf
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
dd6e67fb45fa3ce0d43f8d874cd7ffaeddf0926f 04-Sep-2013 Lorenzo Colitti <lorenzo@google.com> Don't prefer APNs with no type for initial attach.

When choosing an APN for initial attach, we currently treat an
APN with no type the same as an APN that explicitly sets a type
of "ia". Such an APN will take priority over the preferred APN,
and will even take priority over APNs with the type explicitly
set to "ia".

This breaks attach on networks where there are multiple
MVNOs with the same MCC/MNC and one or more of them has an APN
with no type.

This seems to be unintentional, because the comments say that
APNs with a type of "ia" are preferred over default APNs. Fix it
by only considering an APN to be an initial attach APN if it
explicitly specifies a type of "ia".

Bug: 10614153
Change-Id: I8ed81ab3b58ae2aab2c76b644b653bb2c08da163
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
a36be029de18a3752a81a9a93db1c9557821f1f9 02-Sep-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
59e1a46b345ec68f9c2201d149d98edb3c704168 31-Aug-2013 Ed Tam <etam@google.com> am 7cc3a309: (-s ours) am c55cf066: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

* commit '7cc3a309e6833d854fc41f0e53f32f5a6cbbe08b':
Telephony: SMS over IMS, DO NOT MERGE
7cc3a309e6833d854fc41f0e53f32f5a6cbbe08b 30-Aug-2013 Ed Tam <etam@google.com> am c55cf066: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

* commit 'c55cf0666ebbd4c00fb8092f40dc26e77c56273e':
Telephony: SMS over IMS, DO NOT MERGE
c55cf0666ebbd4c00fb8092f40dc26e77c56273e 30-Aug-2013 Ed Tam <etam@google.com> Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
8f88bf2ec0435ff47b71c76cefc022adb274496d 29-Aug-2013 Wink Saville <wink@google.com> Add support for a provisioning apn.

When there is a provisioning apn, such as lwaactivate from AT&T it is
not necessary nor desireble to try to make network connections as
they will be no TCP ACK's to SYN messages, except for a limited set
of operator white listed addresses.

This is implemented by adding two commands CMD_IS_PRVISIONING_APN
and CMD_ENABLE_MOBILE_PROVISIONING. These are used by ConnectivityService
CheckMp and to know when we are connected to a provisioning apn and to
turn actually bring up the connection when the user needs to provision.

Also, incorporate the sEnableFailFastRefCounter change from klp to make
a singleton and remove the RuntimeException.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
614b3bb0238f025664c792fd8a0b69a0cc166eed 30-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't show roaming icon for specific operators" into klp-dev
1c40f771b37bc33b8b210864871166faa4466cac 30-Aug-2013 Wink Saville <wink@google.com> am 25cebe4f: (-s ours) Merge commit \'43c93591\' into manualmerge

* commit '25cebe4f95bfee61477d4048219a6644aa0aa03b':
Add support for a provisioning apn.
a08decf911ab55f06a0972a2ecb1995c46d9ac1e 30-Aug-2013 Wink Saville <wink@google.com> Merge "Add support for a provisioning apn." into klp-dev
c9b81a0c05128694c617fcdd67e73821895822fe 29-Aug-2013 Wink Saville <wink@google.com> Add support for a provisioning apn.

When there is a provisioning apn, such as lwaactivate from AT&T it is
not necessary nor desireble to try to make network connections as
they will be no TCP ACK's to SYN messages, except for a limited set
of operator white listed addresses.

This is implemented by adding two commands CMD_IS_PRVISIONING_APN
and CMD_ENABLE_MOBILE_PROVISIONING. These are used by ConnectivityService
CheckMp and to know when we are connected to a provisioning apn and to
turn actually bring up the connection when the user needs to provision.

Also, incorporate the sEnableFailFastRefCounter change from klp to make
a singleton and remove the RuntimeException.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
2d3ade1cb225f07b1dea71cc92b1fd4afad025cf 02-Jul-2013 duho.ro <duho.ro@lge.com> UICC : add support empty alpha id for BIP

"If the alpha identifier is provided by the UICC and is a null data
object (i.e. length = '00' and no value part), this is an indication
that the terminal should not give any information to the user
or ask for user confirmation;"
- 6.4.27.2 OPEN CHANNEL related to packet data service bearer, ETSI TS 102.223

Bug: 9671401
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/ValueParser.java
b48c51eb1e895ec899b53f1847ad0a5b9a45a085 29-Aug-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC : add support empty alpha id for BIP" into klp-dev
7ed57239eb9eff4a4afa722948db93ea288f0505 19-Jul-2013 Sungmin Choi <sungmin.choi@lge.com> Don't show roaming icon for specific operators

Bug: 9896815
Bug: 10100304
Bug: 10097969
Bug: 10101601
Change-Id: I81b988376dd61a30bc92bb9666510abbcc47788e
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
25cebe4f95bfee61477d4048219a6644aa0aa03b 29-Aug-2013 Wink Saville <wink@google.com> Merge commit '43c93591' into manualmerge

* commit '43c93591':
Add support for a provisioning apn.

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java

Change-Id: If78b4af0c466c6ca6939ef475726ad7a9688386a
9894b3fb2f35e21d9cfd45f233ed093589e14c26 24-Aug-2013 sy.yun <sy.yun@lge.com> fix trysetupdata when mAutoAttachOnCreation true

mAutoAttachOnCreation=true means that device can attach PS network
automatically. To do this, DCT should setup data call even PS is detached.
but when mAttached is false (PS detached) It blocks to setup data call
regardless of mAutoAttachOnCreation value. So changed to allow setup
data call when mAutoAttachOnCreation is true and mAttached is false.

Bug: 10196651
Change-Id: Ia121eb75cbbe932b94efe4c09eb3cb26f1ca1c52
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
d7e83ff0591580603e6d6adfca085140d1d53bd2 02-Jul-2013 duho.ro <duho.ro@lge.com> UICC : add support empty alpha id for BIP

"If the alpha identifier is provided by the UICC and is a null data
object (i.e. length = '00' and no value part), this is an indication
that the terminal should not give any information to the user
or ask for user confirmation;"
- 6.4.27.2 OPEN CHANNEL related to packet data service bearer, ETSI TS 102.223

Bug: 9671401
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/ValueParser.java
43c93591d6261be6dad375979e98b0f6ad2771fd 29-Aug-2013 Wink Saville <wink@google.com> Add support for a provisioning apn.

When there is a provisioning apn, such as lwaactivate from AT&T it is
not necessary nor desireble to try to make network connections as
they will be no TCP ACK's to SYN messages, except for a limited set
of operator white listed addresses.

This is implemented by adding two commands CMD_IS_PRVISIONING_APN
and CMD_ENABLE_MOBILE_PROVISIONING. These are used by ConnectivityService
CheckMp and to know when we are connected to a provisioning apn and to
turn actually bring up the connection when the user needs to provision.

Also, incorporate the sEnableFailFastRefCounter change from klp to make
a singleton and remove the RuntimeException.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
850665a367489cce0b83431fa0e6e543b24062e0 21-Dec-2010 Rika Brooks <rbrooks@codeaurora.org> Telephony: SMS over IMS, DO NOT MERGE

ImsSMSDispatcher is part of IccSmsInterfaceManager.
It always receives calls to send sms first and decides
whether to use ims call flow or gsm/cdma based on response
to REQUEST_IMS_REGISTRATION_STATE.
When ims is registered and sms is supported, the request also returns sms format
to use.
In case of sms over ims failure, RIL_REQUEST_IMS_SEND_SMS sets messageRef from RIL_SMS_RESPONSE
of corresponding failed MO SMS, and sets retry field to non-zero. If voice is available, sends
RIL_REQUEST_IMS_SEND_SMS retries with data encoded based on voice tech available.
If voice is not available, sets retry counter to max and skips retries and sends failure
to client.
Bug: 9626411
Change-Id: I87ca9841b4ace931c55e2d379fe6d7589b2dc8a5
rc/java/android/telephony/SmsManager.java
rc/java/android/telephony/SmsMessage.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/ImsSMSDispatcher.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
62c6fc83e7abcc102b68c29f310887711f64a4a6 26-Aug-2013 Wink Saville <wink@google.com> am a6855ef9: am 876763e9: Make EnableFailFastRefCounter a singleton.

* commit 'a6855ef9a8cfcbe9ee01a437d5b35804c29fa5b5':
Make EnableFailFastRefCounter a singleton.
a6855ef9a8cfcbe9ee01a437d5b35804c29fa5b5 26-Aug-2013 Wink Saville <wink@google.com> am 876763e9: Make EnableFailFastRefCounter a singleton.

* commit '876763e93ad0fa8006d290cc122f12d5e614efa2':
Make EnableFailFastRefCounter a singleton.
876763e93ad0fa8006d290cc122f12d5e614efa2 26-Aug-2013 Wink Saville <wink@google.com> Make EnableFailFastRefCounter a singleton.

Since there is only one DCT the mEnableFailFastRefCounter can be a
static/singleton and thus properly refcount the
CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA. There is still one problem
and that is if the PhoneApp crashes the singleton will be reinstantiated
and we'll have the same problem, but the frequency of this is small.
Also, the consequence of this is the DCT will be behaving "normally"
in that it will be attempting to do data-stall recovery although we
might like it not to it is the "normal" behavior.

Bug: 10304904
Change-Id: I4197c4236a402aa247f775e480e747620fd189bd
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
c028e50c651388b8fcb0420797c06bac43231299 26-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
b256cf8dcb3a478bd0b47a74a5e355c6f4c03d85 23-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "fix mvno_match_data OutOfBounds Exception" into klp-dev
b4121161911b014ff2a3c75cdd94280683d0d8dc 23-Aug-2013 Wink Saville <wink@google.com> Merge "Properly notify of precise call state change after connection hangup." into klp-dev
368e873b65e60268521b3c74110a9b2abe8086ac 02-Aug-2013 Danny Baumann <dannybaumann@web.de> Properly notify of precise call state change after connection hangup.

When disconnecting connections via Connection.hangup(), previously no
precise call state notification was sent out.

Change-Id: I4439d7d8ed47e72da9d061b885ec9a0e6e1b784d
rc/java/com/android/internal/telephony/cdma/CdmaCall.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/gsm/GsmCall.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
6d76ecc8302f20c663561bfa91a651b5949b7900 22-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
59a71354e0169c7877ffd56d476ddd65ecf5a88d 19-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> fix mvno_match_data OutOfBounds Exception

When the length of mvno_match_data is greater than GID from IccRecord,
it will generate StringIndexOutOfBoundsException.
Threrefore, codes are changed to use startsWith() instead of subString().

Bug: 10171336
Change-Id: I827b1d3b861d74e736875bbec1ba5bd28c6c3941
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
7ab10e4710bdb54c6d9a5ee01cd443a42a2689f5 14-Aug-2013 Sungmin Choi <sungmin.choi@lge.com> Change set position of mAttached

When re-attach network after detaching, mAttached.get() is always false.
Although network is attached in modem side and state is connected,
phone cannot know whether connection state or not.
Because nobody notifies to phone.
So before notifyDataConnection(Phone.REASON_DATA_ATTACHED), set mAttached true

Bug: 10070685
Change-Id: Id1356e1c7e188bd484d892dc4255c3aefc81a032
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
a5063bf837bcf40efac09d91370409dbb3768208 14-Aug-2013 Wink Saville <wink@google.com> Make EnableFailFastRefCounter a singleton.

Since there is only one DCT the mEnableFailFastRefCounter can be a
static/singleton and thus properly refcount the
CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA. There is still one problem
and that is if the PhoneApp crashes the singleton will be reinstantiated
and we'll have the same problem, but the frequency of this is small.
Also, the consequence of this is the DCT will be behaving "normally"
in that it will be attempting to do data-stall recovery although we
might like it not to it is the "normal" behavior.

Bug: 10304904
Change-Id: I38ff37445788ec952ca26be45b0374bc0a7ae34d
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
82be30d9983834ed010fceaff7ef5b05796de786 14-Aug-2013 Wink Saville <wink@google.com> Merge "Make EnableFailFastRefCounter a singleton." into klp-dev
16a01fe85457587ad5fd02ea06aa2882baf3535b 14-Aug-2013 Wink Saville <wink@google.com> Make EnableFailFastRefCounter a singleton.

Since there is only one DCT the mEnableFailFastRefCounter can be a
static/singleton and thus properly refcount the
CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA. There is still one problem
and that is if the PhoneApp crashes the singleton will be reinstantiated
and we'll have the same problem, but the frequency of this is small.
Also, the consequence of this is the DCT will be behaving "normally"
in that it will be attempting to do data-stall recovery although we
might like it not to it is the "normal" behavior.

Bug: 10304904
Change-Id: I38ff37445788ec952ca26be45b0374bc0a7ae34d
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
cb36ce5cb0f940b2da055631f32de8fccaf7957e 13-Aug-2013 The Android Open Source Project <initial-contribution@android.com> am af532402: (-s ours) Reconcile with jb-mr2-zeroday-deb-release - do not merge

* commit 'af532402a56c845c39bcfd77a3dc4312e1b62ab0':
Add mEnableFailFastRefCounter.
Restart, cleanup or retry inactve connections.
DataConnection should not retry permanent errors.
af532402a56c845c39bcfd77a3dc4312e1b62ab0 13-Aug-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-zeroday-deb-release - do not merge

Change-Id: I3ec5004207ab6c9ff30793e840a5010c4c4ba015
8088cce970d3b425550aa69219d32168e14f1fd5 12-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
5016947ebeeb99d2f9cc2d902b46e9850b8b747b 09-Aug-2013 Wink Saville <wink@google.com> am d1eb383d: am a76fa595: Merge "Add mEnableFailFastRefCounter." into jb-mr2-dev

* commit 'd1eb383d9bd58140607f212e46db64559f408780':
Add mEnableFailFastRefCounter.
4dbcf752298487d3af0ab778bfa804462ea24271 09-Aug-2013 Wink Saville <wink@google.com> am bc42667e: am 97978662: Restart, cleanup or retry inactve connections.

* commit 'bc42667e465b7dfacfe4592390b14c5518a05e41':
Restart, cleanup or retry inactve connections.
2d14e155b4624122e30219f48a6d2273e5f10a74 09-Aug-2013 Wink Saville <wink@google.com> am 585e9609: am 2ae42257: DataConnection should not retry permanent errors.

* commit '585e96097525e593c2ae7edb9fcf62526ab958ae':
DataConnection should not retry permanent errors.
16d5219e366fb9da5ba3d5dea4d1261dac2727cc 07-Aug-2013 Wink Saville <wink@google.com> Add mEnableFailFastRefCounter.

Use a reference counter to control enabling fail fast
as there are now two entities which control failing fast:
ConnectifityService.checkProvisioningUrl and
MobileDataStateTracker.captivePortalCheckComplete.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
ea16d1a039aee0ec4465f143a8ce5da3eff3ff88 06-Aug-2013 Wink Saville <wink@google.com> Restart, cleanup or retry inactve connections.

Instead of retrying all inactive connections, restart radio on very bad
errors, clean those that are permanent failures and retry
the others.

Bug: 10131736
Change-Id: I2527b18d6cda52c55fb94be58fbb1a7a86818ef9
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcController.java
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
f3b64faeb225b69fcd27389d7ecf5e9b6a5a09da 21-May-2013 Wink Saville <wink@google.com> DataConnection should not retry permanent errors.

Update DcFailCause with the "no retry" info from ril.h

Bug: 9040015
Change-Id: Ib94af9996c79800322251a45349b117e1f913269
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
d1eb383d9bd58140607f212e46db64559f408780 09-Aug-2013 Wink Saville <wink@google.com> am a76fa595: Merge "Add mEnableFailFastRefCounter." into jb-mr2-dev

* commit 'a76fa59574734cd1528dff2937231b78ea96e8f3':
Add mEnableFailFastRefCounter.
bc42667e465b7dfacfe4592390b14c5518a05e41 09-Aug-2013 Wink Saville <wink@google.com> am 97978662: Restart, cleanup or retry inactve connections.

* commit '979786625e7ceacf4a545a25704ef8a15338a854':
Restart, cleanup or retry inactve connections.
585e96097525e593c2ae7edb9fcf62526ab958ae 09-Aug-2013 Wink Saville <wink@google.com> am 2ae42257: DataConnection should not retry permanent errors.

* commit '2ae42257ebafdbb0470cedeab41c2f1b418b285c':
DataConnection should not retry permanent errors.
a76fa59574734cd1528dff2937231b78ea96e8f3 09-Aug-2013 Wink Saville <wink@google.com> Merge "Add mEnableFailFastRefCounter." into jb-mr2-dev
02a7b6bd0ddad774e17ff5d43019010715c71126 08-Aug-2013 Wink Saville <wink@google.com> am 7982f3e5: Merge "Initialize RIL with the correct CDMA subscription mode setting"

* commit '7982f3e57aaa53699ff3a00071280a88a5ac0c82':
Initialize RIL with the correct CDMA subscription mode setting
b7724722330afd6ed25a5e3c40c0abacc7f4e4b7 08-Aug-2013 The Android Automerger <android-build@google.com> merge in klp-release history after reset to klp-dev
ad8f2bf7d229f442ecd00c2d74547191dde21c23 07-Aug-2013 Wink Saville <wink@google.com> Unregistering a null receiver is now fatal.

This causes user builds to break, so only unregister
if we are actually registered.

Bug: 9657468
Change-Id: Ie801e6db37962e9de7559c8451806de1972cf430
rc/java/com/android/internal/telephony/TelephonyTester.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java
28cb5ee3ff4fe6b57039732a9268a385ad5db3d7 07-Aug-2013 William Luh <williamluh@google.com> Merge "Change the SMS event logging to "packages" aggregation, which requires the app uid."
d54f9906ce6218a0a9e7a274342082901e7d5d18 07-Aug-2013 Wink Saville <wink@google.com> Add mEnableFailFastRefCounter.

Use a reference counter to control enabling fail fast
as there are now two entities which control failing fast:
ConnectifityService.checkProvisioningUrl and
MobileDataStateTracker.captivePortalCheckComplete.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
57da4aa945252ebed6b505387145f99be8ad5d72 07-Aug-2013 Wink Saville <wink@google.com> Unregistering a null receiver is now fatal.

This causes user builds to break, so only unregister
if we are actually registered.

Bug: 9657468
Change-Id: Ie801e6db37962e9de7559c8451806de1972cf430
rc/java/com/android/internal/telephony/TelephonyTester.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java
979786625e7ceacf4a545a25704ef8a15338a854 06-Aug-2013 Wink Saville <wink@google.com> Restart, cleanup or retry inactve connections.

Instead of retrying all inactive connections, restart radio on very bad
errors, clean those that are permanent failures and retry
the others.

Bug: 10131736
Change-Id: I2527b18d6cda52c55fb94be58fbb1a7a86818ef9
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcController.java
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
b9f8b35a79580692c7c2c2d143389ad38aee719b 06-Aug-2013 Wink Saville <wink@google.com> Merge "Initialize RIL with the correct CDMA subscription mode setting"
16d259bfedada60d6b772ee0c640df58830527df 06-Aug-2013 Wink Saville <wink@google.com> When disposing only unbind if actually bound.

Change-Id: Icef7f050088d648fdf60f9a1ed690af46deb36e0
rc/java/com/android/internal/telephony/WapPushOverSms.java
5ceae6074e0729fbbc422db2f263bf7cf453bf1a 29-Aug-2012 Naveen Kalla <nkalla@codeaurora.org> Initialize RIL with the correct CDMA subscription mode setting

Users choice of CDMA Subscription Source is stored in CDMA_SUBSCRIPTION_MODE
setting in database.
If telephony restarts after a crash, use CDMA_SUBSCRIPTION_MODE instead
of PREFERRED_CDMA_SUBSCRIPTION in PhoneFactory to prevent
mismatch with the value in the settings database chosen by the user.

Also, remove the Setting PREFERRED_CDMA_SUBSCRIPTION from the database.
With this change the special treatment for LTE on CDMA will not be needed.
The correct value can be set in the database for CDMA_SUBSCRIPTION_MODE
and that will be taken on power-up by this code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
7982f3e57aaa53699ff3a00071280a88a5ac0c82 06-Aug-2013 Wink Saville <wink@google.com> Merge "Initialize RIL with the correct CDMA subscription mode setting"
d5fc65e2ca1ed72a936b497681784146449fe20b 06-Aug-2013 Ying Wang <wangying@google.com> Fix build.

Reference:
https://android-review.googlesource.com/#/c/61723/5

Change-Id: I327733be1c2ab3cda933b9f0c7c0a63332223ae8
rc/java/com/android/internal/telephony/PhoneFactory.java
7400cfc039e6982134ee852d01f1ff4939601f8b 06-Aug-2013 Dianne Hackborn <hackbod@google.com> Merge "Stop using implicit intents with bindService()."
ec125af4306f1be2c829c3a1d7adbf9b8cd7e659 06-Aug-2013 William Luh <williamluh@google.com> Change the SMS event logging to "packages" aggregation, which requires the app uid.

Change-Id: Ic3927b5764909b4ec8dc64fc41118f9057814656
rc/java/com/android/internal/telephony/SMSDispatcher.java
dbb49dd094fbf33730830bab02eeb6250d8ae893 05-Aug-2013 Wink Saville <wink@google.com> am f6dced1a: Merge "Telephony: Fix issue in handling null alpha identifier"

* commit 'f6dced1ac15dc219bb87658a242d74abb9fb5ae2':
Telephony: Fix issue in handling null alpha identifier
f6dced1ac15dc219bb87658a242d74abb9fb5ae2 05-Aug-2013 Wink Saville <wink@google.com> Merge "Telephony: Fix issue in handling null alpha identifier"
7d3118aa708e4d02bf65514ab3feda10cd05a619 05-Aug-2013 Dianne Hackborn <hackbod@google.com> Stop using implicit intents with bindService().

The behavior of this case is not defined.

Change-Id: I6e858190d7b0c3b8976a1657de81a682cd989eee
rc/java/com/android/internal/telephony/WapPushOverSms.java
2ae42257ebafdbb0470cedeab41c2f1b418b285c 21-May-2013 Wink Saville <wink@google.com> DataConnection should not retry permanent errors.

Update DcFailCause with the "no retry" info from ril.h

Bug: 9040015
Change-Id: Ib94af9996c79800322251a45349b117e1f913269
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
78cc92ec740934603a9bda2de5a4745c049cfde1 02-Aug-2013 Elliott Hughes <enh@google.com> am a1915f28: Merge "If telephony wants ASCII casing, it needs to ask for it."

* commit 'a1915f289fbada7f7c716eed0078098bbb40adc1':
If telephony wants ASCII casing, it needs to ask for it.
11a8314b443c1f1fefa0636f40127f98449846d7 02-Aug-2013 Wink Saville <wink@google.com> am 4ce0e815: Merge "Create ApnSetting if none are found in database."

* commit '4ce0e815f8b0a796685fbc931cd6760c27172a0f':
Create ApnSetting if none are found in database.
a1915f289fbada7f7c716eed0078098bbb40adc1 02-Aug-2013 Elliott Hughes <enh@google.com> Merge "If telephony wants ASCII casing, it needs to ask for it."
4ce0e815f8b0a796685fbc931cd6760c27172a0f 02-Aug-2013 Wink Saville <wink@google.com> Merge "Create ApnSetting if none are found in database."
b3537f8ffac71d6c4c263ae6e68d2722febf4622 02-Aug-2013 Elliott Hughes <enh@google.com> If telephony wants ASCII casing, it needs to ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I5c2721f36861694928101c771ec6699424cf9aa3
rc/java/com/android/internal/telephony/MccTable.java
f46817da20f9628b7e55d1bb6ff0493f82dd9d85 18-Jun-2013 Alex Yakavenka <ayakav@codeaurora.org> Create ApnSetting if none are found in database.

Bug: 9315957
Change-Id: I0cf0debb703f6a4cad35300315922a5566871f85
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
1584a5054fb2a66ee05703b395172c73f784bb27 29-Aug-2012 Naveen Kalla <nkalla@codeaurora.org> Initialize RIL with the correct CDMA subscription mode setting

Users choice of CDMA Subscription Source is stored in CDMA_SUBSCRIPTION_MODE
setting in database.
If telephony restarts after a crash, use CDMA_SUBSCRIPTION_MODE instead
of PREFERRED_CDMA_SUBSCRIPTION in PhoneFactory to prevent
mismatch with the value in the settings database chosen by the user.

Also, remove the Setting PREFERRED_CDMA_SUBSCRIPTION from the database.
With this change the special treatment for LTE on CDMA will not be needed.
The correct value can be set in the database for CDMA_SUBSCRIPTION_MODE
and that will be taken on power-up by this code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
e356d9a99d41a9350aee7d52ad20fa979463d42c 31-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> am 06f093f7: Merge "Mobile network type is not updated when the network mode is switched."

* commit '06f093f728861837c54a96666ece5dc1853787c1':
Mobile network type is not updated when the network mode is switched.
06f093f728861837c54a96666ece5dc1853787c1 31-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Mobile network type is not updated when the network mode is switched."
c4161078eff3305894f1f9f1b2f00952ea0e83d8 18-Mar-2013 Kazuya Ohshiro <kazuya.x.ohshiro@sonymobile.com> Mobile network type is not updated when the network mode is switched.

Because ServiceStateTracker doesn't handle the change of ServiceState
after switching of Telephony FW, SystemProperty used for displaying
the mobile network type does not become to Unknown. To fix this issue,
when the network mode is switched, the SystemProperty should be
initialized to Unknown in the constructor of ServiceStateTracker.

Change-Id: I903ba855b9fe22530db8494a9d2615959970c5a4
rc/java/com/android/internal/telephony/ServiceStateTracker.java
f219f2f4bc9de14787e1b3e3dc3cbfcb0f101a50 30-Jul-2013 Wink Saville <wink@google.com> am 793fb83c: Merge "Add support for MNC=00"

* commit '793fb83c41d26c84f4430885aafc7a8daeffffeb':
Add support for MNC=00
793fb83c41d26c84f4430885aafc7a8daeffffeb 30-Jul-2013 Wink Saville <wink@google.com> Merge "Add support for MNC=00"
1b5fe200e47f40f82f0e28502a5f40bce64a82e6 27-Jul-2013 Wink Saville <wink@google.com> Add support for an initial APN

Add PhoneConstants.APN_TYPE_IA, DctConstants.APN_IA_ID and enhance
setInitialAttachApn to use the new Initial Attach apn.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
e64327265b40cbc52e6c07381bc0a80d7e031018 07-Oct-2011 Mattias Petersson <mattias.petersson@sonyericsson.com> Add support for MNC=00

This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
rc/java/com/android/internal/telephony/MccTable.java
e238e8d7cb48961817c993dc83f7aaaf84cf2d1c 26-Jul-2013 Jake Hamby <jhamby@google.com> Merge "Add prefix to SMS event tag"
bbcd0e4257ad545a6466697088fc4ddec3464547 23-Jul-2013 Wink Saville <wink@google.com> Hipri should not be enabled when we initialize.

Without this fix hipri starts at boot mobile data won't be shutdown
as refCount won't go to zero.

Bug: 9475300
Change-Id: If9587fa5360d777328fda59bbea61a2cbd9fe804
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
634a24f56f54b5d2911649288147c750b67c7ae4 23-Jul-2013 William Luh <williamluh@google.com> Add prefix to SMS event tag

Legal requires user consent for logging these in production (non-dogfood).
We will be filtering based on the specific tag prefix of exp_det_.

Change-Id: Id3d869c1b31716cee3e6ae98d3b840ef7f948e42
rc/java/com/android/internal/telephony/EventLogTags.logtags
rc/java/com/android/internal/telephony/SMSDispatcher.java
e7b819f9c02355115840cab47c9ba0896a4476d3 19-Jul-2013 Wink Saville <wink@google.com> am b8127144: Merge commit \'3f4415e3\' into fix-merge-conflict

* commit 'b8127144de8d55c590ed537bdcb7a1afe5666b28':
telephony: Fix typo
b8127144de8d55c590ed537bdcb7a1afe5666b28 19-Jul-2013 Wink Saville <wink@google.com> Merge commit '3f4415e3' into fix-merge-conflict

* commit '3f4415e3':
telephony: Fix typo
3f4415e31c8c407e0397511fdc2d5906361295fa 19-Jul-2013 Wink Saville <wink@google.com> Merge "telephony: Fix typo"
9a4619dbca4b2c8836ea71eb794366bcccef5e56 09-Jul-2013 Wink Saville <wink@google.com> am 0c432e05: am 9c430a4d: Only show "Emergency calls only" if a GSM device is voice capable.

* commit '0c432e0512f69df06282741af23839db54e5d585':
Only show "Emergency calls only" if a GSM device is voice capable.
0c432e0512f69df06282741af23839db54e5d585 09-Jul-2013 Wink Saville <wink@google.com> am 9c430a4d: Only show "Emergency calls only" if a GSM device is voice capable.

* commit '9c430a4d72c8c962caefb916e82a4c82eca7068c':
Only show "Emergency calls only" if a GSM device is voice capable.
9c430a4d72c8c962caefb916e82a4c82eca7068c 09-Jul-2013 Wink Saville <wink@google.com> Only show "Emergency calls only" if a GSM device is voice capable.

This fix uses the config_voice_capable compile time switch to be
sure GsmServiceStateTracker.mEmergencyOnly is false if the device
isn't voice capable. Thus GsmServiceStateTracker.updateSpnDisplay
will not send the SPN_STRINGS_UPDATED_ACTION intent with
emergency_calls_only as the PLMN. Instead, it will aways be the
string defined by the lockscreen_carrier_default, typically
"No service".

Bug: 9422921
Change-Id: I74e89c4a29d0d8e3d5cc1726adedb0c2634cf257
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
ae0ee2f04405f059a3c186ceab4ddfb789e6f641 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 299f0785: am 4b361fe2: am d254ff60: Merge "Telephony: remove the useless variable."

* commit '299f07852601bb735296646c9587bf72169d1476':
Telephony: remove the useless variable.
299f07852601bb735296646c9587bf72169d1476 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 4b361fe2: am d254ff60: Merge "Telephony: remove the useless variable."

* commit '4b361fe2f0597aae6a50012bc4fe048acd41ebbf':
Telephony: remove the useless variable.
4b361fe2f0597aae6a50012bc4fe048acd41ebbf 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am d254ff60: Merge "Telephony: remove the useless variable."

* commit 'd254ff6031ad039e93964378d604a4950d828170':
Telephony: remove the useless variable.
d254ff6031ad039e93964378d604a4950d828170 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> Merge "Telephony: remove the useless variable."
13347e89869fe1d71a75dfec3d7307d62f61796e 04-Jul-2013 Wink Saville <wink@google.com> am c8865f1d: am 0c5a2697: Allow GSMPhone#getCellLocation to report LTE location information

* commit 'c8865f1dfc810e20908f45d3eef431a81544e9f6':
Allow GSMPhone#getCellLocation to report LTE location information
c8865f1dfc810e20908f45d3eef431a81544e9f6 04-Jul-2013 Wink Saville <wink@google.com> am 0c5a2697: Allow GSMPhone#getCellLocation to report LTE location information

* commit '0c5a2697697b49228bd2e23dc8d8217877a0fd7b':
Allow GSMPhone#getCellLocation to report LTE location information
0c5a2697697b49228bd2e23dc8d8217877a0fd7b 04-Jul-2013 Wink Saville <wink@google.com> Allow GSMPhone#getCellLocation to report LTE location information

Bug: 9228974
Change-Id: I7e9b190aa67968f1f2b2b567614c35c5dd5d78fa
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
e056c8263473f67dc78630f5535c3664fabacd23 02-Jul-2013 Wink Saville <wink@google.com> Merge commit '1f95c96e' into fix-merge-conflict

* commit '1f95c96e':
Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker.

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java

Change-Id: I7c7234d1b13647a0534a77937ea51d4051043a55
1f95c96e704254857e9c2dde016b06a7d849666b 02-Jul-2013 Wink Saville <wink@google.com> am 28b99e3f: Merge "Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker." into jb-mr2-dev

* commit '28b99e3f85fa5357d536d0ae80fb70a3cd59c09a':
Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker.
28b99e3f85fa5357d536d0ae80fb70a3cd59c09a 02-Jul-2013 Wink Saville <wink@google.com> Merge "Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker." into jb-mr2-dev
6c620b6b0b1d6f1ce0a575e014a82324cbe48661 01-Jul-2013 Wink Saville <wink@google.com> am 16f8ca73: am e9070e6d: Don\'t set gsm.sim.operator.numeric to null

* commit '16f8ca73c18d2e584b6a57dc66491c1c0d40727c':
Don't set gsm.sim.operator.numeric to null
16f8ca73c18d2e584b6a57dc66491c1c0d40727c 01-Jul-2013 Wink Saville <wink@google.com> am e9070e6d: Don\'t set gsm.sim.operator.numeric to null

* commit 'e9070e6d48d1389987650fa2c3e1f90aab860684':
Don't set gsm.sim.operator.numeric to null
e9070e6d48d1389987650fa2c3e1f90aab860684 29-Jun-2013 Wink Saville <wink@google.com> Don't set gsm.sim.operator.numeric to null

Bug: 9628781
Change-Id: I80c00584535a327f9e93c8bd0980178781cae6ff
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
ec107cb8a36181fa26e61ab51f423ba862deb0fa 28-Jun-2013 Wink Saville <wink@google.com> Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker.

To fail fast we turn off data stall detection and do no retires.

Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
d084fb51297c446d4adb072089822a41820bd188 28-Jun-2013 Gao Rong <gaorong.dawn@gmail.com> Telephony: remove the useless variable.
rc/java/com/android/internal/telephony/RIL.java
46f190903e93c653b90b970c1a21159bb957575b 18-Jun-2013 Wink Saville <wink@google.com> Fix NPE when exiting DcDefaultState.

Bug: 9263045
Change-Id: I62069114d5e9f2b0e90f892d2333b27fe693294d
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
ee0808fb3fd6c19f964a9a209994b5a1d60633c1 13-Jun-2013 The Android Open Source Project <initial-contribution@android.com> am 34a9788f: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '34a9788fac68d842fa50a581a4c1f12586dbcee9':
Fail on permanent errors in DcTracker.
34a9788fac68d842fa50a581a4c1f12586dbcee9 13-Jun-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: Icfd68335ba5beec3631dfe457455f86c45e2e6a6
aa1c2d8e93160a713a0c7a1bc9a664c0a8db6eb9 11-Jun-2013 Wink Saville <wink@google.com> Fail on permanent errors in DcTracker.

This reverts the retry added when fixing bug 9240744:

https://googleplex-android-review.git.corp.google.com/#/c/315817/2

Bug: 9373372
Change-Id: I15d8dcc2c04174d54dd33f8a34813fd72764fc77
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
017166876a51eda9ae6b3254119023604e249bc5 12-Jun-2013 Wink Saville <wink@google.com> Merge commit '6aebe10f' into fix-merge

* commit '6aebe10f':
Fail on permanent errors in DcTracker.

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java

Change-Id: Icbee3d7c73fa170813e0683fb7c22dd78e08d6e8
6aebe10f9841bb3bff35d1c9912d48f742e82f91 12-Jun-2013 Wink Saville <wink@google.com> am 4a65a2c9: Fail on permanent errors in DcTracker.

* commit '4a65a2c9c5d5a46453064e7047582d9045e8addc':
Fail on permanent errors in DcTracker.
4a65a2c9c5d5a46453064e7047582d9045e8addc 11-Jun-2013 Wink Saville <wink@google.com> Fail on permanent errors in DcTracker.

This reverts the retry added when fixing bug 9240744:

https://googleplex-android-review.git.corp.google.com/#/c/315817/2


Bug: 9373372
Change-Id: I15d8dcc2c04174d54dd33f8a34813fd72764fc77
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
cd8ea9d5257d8ab8711f3ba6d11a2d90d8072a4b 06-Jun-2013 The Android Open Source Project <initial-contribution@android.com> am d5daabaa: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'd5daabaa81e8650ed601815eb8ee63c21aea89a4':
Do not retry forever in DataConnection.
d5daabaa81e8650ed601815eb8ee63c21aea89a4 06-Jun-2013 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr2-release - do not merge

Change-Id: I93cb4027630becc8ef6bfb042fa89d3d648003b8
fa503a5f16c6b93518373e5df5049311d6d0e823 03-Jun-2013 Wink Saville <wink@google.com> Do not retry forever in DataConnection.

When we are initially to connect we limit the the number of
retries so as to go through the list of waiting apns. But if retry
forever is enabled, as it is with Verizon devices, we can burn the
battery down quickly because we're retrying with short initial
timeouts.

In this change I also increase the timeout between apn retries from
5 seconds to 20 seconds to further reduce battery drain when retrying.
And added a retry with a longer timeout if to keep the contract with
ConnectivityService that when enabled we will continue to retry.

Bug: 9240744
Change-Id: I45b9ec5300d602d838dbdeacdbd1fca0c4d65ee3
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
185370a905597ab107a8f2b0455440017e661321 04-Jun-2013 Wink Saville <wink@google.com> Merge commit 'c93dfda4' into fix-mergeconflict

* commit 'c93dfda4':
Do not retry forever in DataConnection.

Change-Id: I58bed4576638a459537d6b5a4c217e1f2fdb3826
c93dfda4916f67efd91e9a83b67128c192ca51f0 04-Jun-2013 Wink Saville <wink@google.com> am fcc57e87: Do not retry forever in DataConnection.

* commit 'fcc57e87d1620ab7dc877d65e7e85dca77132054':
Do not retry forever in DataConnection.
fcc57e87d1620ab7dc877d65e7e85dca77132054 03-Jun-2013 Wink Saville <wink@google.com> Do not retry forever in DataConnection.

When we are initially to connect we limit the the number of
retries so as to go through the list of waiting apns. But if retry
forever is enabled, as it is with Verizon devices, we can burn the
battery down quickly because we're retrying with short initial
timeouts.

In this change I also increase the timeout between apn retries from
5 seconds to 20 seconds to further reduce battery drain when retrying.
And added a retry with a longer timeout if to keep the contract with
ConnectivityService that when enabled we will continue to retry.

Bug: 9240744
Change-Id: I45b9ec5300d602d838dbdeacdbd1fca0c4d65ee3
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
203e588e3c42a81aa8a56f595119c181a63b12ca 31-May-2013 Wink Saville <wink@google.com> Handling data registration and radio technology changing.

When the DataRegistrationState (aka DRS) or RilDataRadioTechnology changes
aka Radio Access Technology or RAT) while retrying the DataConnection
StateMachine will return the connection as lost immediately. This allows
the connection to be retried with the correct handling of the changed
DRS or RAT quickly, rather than having to wait until retires are exhausted.

Changes:

- Pass RAT in bringUp
- Add the capability to register for DRS/RAT changes with SST
- When DRS/RAT changes in DcRetryState return LOST_CONNECTION to DcTracker

Bug: 9069568
Change-Id: Id4f29a63421af65ce153d24d646c09f7a1e8269b
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcAsyncChannel.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
187a39f896f88eb6c5e4306d9595546654825976 29-May-2013 Wink Saville <wink@google.com> Change DcTracker to not connect or retry if detached.

If we're detached than there is no possibility of connecting
so fail early. Upon attaching enabled connections will be retried.

Bug: 9024828
Change-Id: I363cd4580aeea68d88eff0b48ce579d2f27a13f3
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
4a9b3afeb2ec4d573eca335a3706392ecf9f281e 28-May-2013 Wink Saville <wink@google.com> Change DcTracker construction so only initialization is preformed.

In initApnContexts applyNewState and onSetDependency met could cause
calls to trySetupData which can send notifications or even try to
bring up a connection. This can cause problems as not all objects are
initialized. In particular when I tried to change ApnContext#isReady
to be false it caused a call to mPhone.notifyDataConnection but mPhone
wasn't completely initialized and an NPE occurred.

Bug: 9022095
Change-Id: I6d1bf350f2803aa62fa21b6a6759685456bef6eb
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
8f184cf35fa7fbc8e5ed887beaec0d090000939b 24-May-2013 Wink Saville <wink@google.com> Merge "DataConnection should not retry permanent errors."
3703f7cd2c32ee08848b391c0c8be9bdbedd4584 23-May-2013 Wink Saville <wink@google.com> Merge "Set initial attach apn for LTE network"
5d5eea6ed231163c225144316b0d1913d48678a4 26-Apr-2013 Sungmin Choi <sungmin.choi@lge.com> Set initial attach apn for LTE network

When mobile register LTE network, APN provided by operators is needed.
If mobile does not have apn information, it could not register LTE network.
To deliver APN information which is used during LTE attach to modem chipset,
setLteAttachProfile() and RIL_REQUEST_SET_LTE_ATTACH_PROFILE command is added.

When Telephony DB is loaded or Telephony DB is changed, follow steps.
1. If preferred default ApnContext exists, this is delivered to modem chipset.
2. If preferred default ApnContext is null, find other ApnContext which can
handle default type.
3. If other ApnContext which can handle default type does not exist, any other
ApnContext delivered to modem chipset.

Then modem register LTE network with APN information delivered from AP.

Bug: 8733613

Change-Id: If84c62cddccf96a531dae0527ed1a6592ae76201
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Hyejin Kim <hyejin.kim@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
7101042e15c3646149967f3d0988e3cdcd2d3587 22-May-2013 Wink Saville <wink@google.com> am 10233ed3: am cd01fac2: Merge "Cleanup README.txt" into jb-mr2-dev

* commit '10233ed356e24118df9a8945aba2c7c614376d88':
Cleanup README.txt
10233ed356e24118df9a8945aba2c7c614376d88 22-May-2013 Wink Saville <wink@google.com> am cd01fac2: Merge "Cleanup README.txt" into jb-mr2-dev

* commit 'cd01fac297dfc7645627c471832a30ea7579500b':
Cleanup README.txt
cd01fac297dfc7645627c471832a30ea7579500b 22-May-2013 Wink Saville <wink@google.com> Merge "Cleanup README.txt" into jb-mr2-dev
943b5090958bd8a2c0877218b1c8dbc72c4f8758 21-May-2013 Wink Saville <wink@google.com> DataConnection should not retry permanent errors.

Update DcFailCause with the "no retry" info from ril.h

Bug: 9040015
Change-Id: Ib94af9996c79800322251a45349b117e1f913269
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
ee3555b687ef096490644cea009a1f4653d7df1d 21-May-2013 Wink Saville <wink@google.com> Merge "Retry even on permanent failures."
da1dd2e1bccb6141109a65d4e40253f39c405537 21-May-2013 Wink Saville <wink@google.com> Retry even on permanent failures.

The contract with ConnectivityService is that we should continue
to try to connect as long as we're ready. With this change we continue
but length the delay if there were permanent failures.

Change-Id: I83acfd2b07740d3650756aa20dad67b3c53e40d6
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
ab78c66a40cf1de4c4640601024d934dfa9c7d20 21-May-2013 Robert Greenwalt <rgreenwalt@google.com> am aba24c0e: am 6613a961: resolved conflicts for merge of d678053c to stage-aosp-master

* commit 'aba24c0e411839115840ae35caa52cd72fdf98ae':
Using a single counter for outstanding requests.
aba24c0e411839115840ae35caa52cd72fdf98ae 21-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 6613a961: resolved conflicts for merge of d678053c to stage-aosp-master

* commit '6613a961473a72c218ec505e384dad6b19049aa0':
Using a single counter for outstanding requests.
6613a961473a72c218ec505e384dad6b19049aa0 21-May-2013 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of d678053c to stage-aosp-master

Change-Id: I17029e11f1a17d1446a06f716ab40b5a7f723258
1db7da14111228a5079d2970d7d0ce34173000b5 20-May-2013 Wink Saville <wink@google.com> Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL.

Bug: 9040003
Change-Id: I49340b88fe8cfe2c7895c7950e7b9ba0f947b145
(cherry picked from commit 912a45a1c0740a33938ec9c081d9f5baa984d376)
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
e1a4f80a7dac4bb4439a40811d7f53c2a3a17da1 20-May-2013 Wink Saville <wink@google.com> am 748ec9f1: am 74672e8e: Fix setup of retry filters.

* commit '748ec9f1d8fdefb122216e1ff6368072c0ddf736':
Fix setup of retry filters.
748ec9f1d8fdefb122216e1ff6368072c0ddf736 20-May-2013 Wink Saville <wink@google.com> am 74672e8e: Fix setup of retry filters.

* commit '74672e8ee972f12406b72551261b4cc7e0651933':
Fix setup of retry filters.
d678053ce447c4ed7761f5856b52793fee6169ac 20-May-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Using a single counter for outstanding requests."
7cabec78b4c9ad40f23d8f9fd756722d33b4a639 10-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Using a single counter for outstanding requests.

Change-Id: Ie99239fbe02f4ee1528c0dc6e1a1750cad404b2c
rc/java/com/android/internal/telephony/RIL.java
74672e8ee972f12406b72551261b4cc7e0651933 18-May-2013 Wink Saville <wink@google.com> Fix setup of retry filters.

There were multiple registered filters for INTENT_RESTART_TRYSETUP_ALARM
this caused a retry not to fire and contributing to not recovering from
a RAT change error in identified by Samsung in post #22 of 8849653.

Bug: 8849653
Change-Id: I9c5cdb740d87a05dd69d72f8bc5596230b75d6f2
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
3befce9c55a0c247ad3d2168d36c5a67fe72c894 15-May-2013 Wink Saville <wink@google.com> am 14c47d88: am 9bce8bee: Merge "Fix a typo bug."

* commit '14c47d88b23fc035bed3d8625065a9157e470c36':
Fix a typo bug.
14c47d88b23fc035bed3d8625065a9157e470c36 15-May-2013 Wink Saville <wink@google.com> am 9bce8bee: Merge "Fix a typo bug."

* commit '9bce8beeeb2d55ba7f4bec67b1a174e16bdd3b53':
Fix a typo bug.
9bce8beeeb2d55ba7f4bec67b1a174e16bdd3b53 15-May-2013 Wink Saville <wink@google.com> Merge "Fix a typo bug."
64ec418c6bbf031a69f4948a115261bd1c5663ec 15-May-2013 Gao Rong <gaorong.dawn@gmail.com> Fix a typo bug.

Card state log should be correctly dispalyed as cdma_id instead of cmda_id.
rc/java/com/android/internal/telephony/uicc/IccCardStatus.java
c86f2407bce6575b63caf25d23316aebd5351ac3 14-May-2013 Wink Saville <wink@google.com> am daffa125: am 24286939: Do a disconnect if ApnContext is ready but retrying or failed.

* commit 'daffa12593f4fc2fe3cb8ab527ad2e836229e414':
Do a disconnect if ApnContext is ready but retrying or failed.
daffa12593f4fc2fe3cb8ab527ad2e836229e414 14-May-2013 Wink Saville <wink@google.com> am 24286939: Do a disconnect if ApnContext is ready but retrying or failed.

* commit '2428693913ae731d4ace3414429f5e91af24ea36':
Do a disconnect if ApnContext is ready but retrying or failed.
2428693913ae731d4ace3414429f5e91af24ea36 14-May-2013 Wink Saville <wink@google.com> Do a disconnect if ApnContext is ready but retrying or failed.

This change allows enabling of a ready ApnContext to reconnect if the
ApnContext is IDLE, FAILED or RETRYING. Without this change toggling
wifi or otherwise enabling the connection would not cause the connection
to be retried. Instead, toggling airplane mode would be required.

Bug: 8849653
Change-Id: I83f44dbfd412f4b0122a2108e22f36db94c59d18
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
0ebea55f1ac175f5752f10797c4b6bf87e42afb1 11-May-2013 Wink Saville <wink@google.com> Merge commit '08c0ce75' into fix-merge-conflict

* commit '08c0ce75':
Send notifyDataConnection on changes to data connection.

Conflicts:
src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

Change-Id: I0513bea92137b27d1c070c45f231c1391c503b88
08c0ce75f8affbfffcb46fbf039795023521aea2 10-May-2013 Wink Saville <wink@google.com> am a0f04ae3: Send notifyDataConnection on changes to data connection.

* commit 'a0f04ae3f07c686ddbc4d83edf0f1b7d8d1b4a0a':
Send notifyDataConnection on changes to data connection.
a0f04ae3f07c686ddbc4d83edf0f1b7d8d1b4a0a 10-May-2013 Wink Saville <wink@google.com> Send notifyDataConnection on changes to data connection.

Previously notification was sent only when voice radio technology
changed, but it needs to be when data RAT changed. Also send it with
there is a data registration changes.

Bug: 8786016
Change-Id: I5a53e13821efde4ebd3dbe5f062e7729f321497b
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
dae8162ec0b4b93f0d75d3b6c7ccffd0936e9caa 09-May-2013 Jake Hamby <jhamby@google.com> am 2fb61f2c: am f9c0a042: Merge "4373 & 4374 part of Severe Alerts"

* commit '2fb61f2cc25e78c9705ce5131561859382d124fb':
4373 & 4374 part of Severe Alerts
2fb61f2cc25e78c9705ce5131561859382d124fb 08-May-2013 Jake Hamby <jhamby@google.com> am f9c0a042: Merge "4373 & 4374 part of Severe Alerts"

* commit 'f9c0a042694635033704e0170d6bbc8214bd78e4':
4373 & 4374 part of Severe Alerts
030b39849e81d1b5de8ca33a718be4feea38a820 08-May-2013 Jake Hamby <jhamby@google.com> Merge "Log the correct radio states for GSM_RAT_SWITCHED."
f9c0a042694635033704e0170d6bbc8214bd78e4 08-May-2013 Jake Hamby <jhamby@google.com> Merge "4373 & 4374 part of Severe Alerts"
a71fe5191a367d376704cd642468a145ff802074 29-Apr-2013 Anju Mathapati <anjucm@codeaurora.org> 4373 & 4374 part of Severe Alerts

As per specification change 23.041 V9.6.0,
4373 & 4374 have been moved from Extreme
Alerts to Severe Alerts.

Bug: 8847901
Change-Id: I98f443dfc799da259d942f62ce66006058e5ffb1
rc/java/com/android/internal/telephony/gsm/SmsCbHeader.java
2ed9b7b8bd0d962acbd72b86a4296868aba285c8 06-May-2013 Wink Saville <wink@google.com> am 6d336fec: am 9a480819: On EVENT_CONNECT in DcRetryingState do not go inactive.

* commit '6d336feccb3f412c6623c90be2144f19838eee44':
On EVENT_CONNECT in DcRetryingState do not go inactive.
6d336feccb3f412c6623c90be2144f19838eee44 06-May-2013 Wink Saville <wink@google.com> am 9a480819: On EVENT_CONNECT in DcRetryingState do not go inactive.

* commit '9a480819c79acf31f328d254b1bb9fe6cfac2c34':
On EVENT_CONNECT in DcRetryingState do not go inactive.
9a480819c79acf31f328d254b1bb9fe6cfac2c34 03-May-2013 Wink Saville <wink@google.com> On EVENT_CONNECT in DcRetryingState do not go inactive.

Going to DcInactiveState from DcRetryingState on EVENT_CONNECT causes
us to forget we are retrying the original connection and if this is
a different connection we can disconnect completely when we shouldn't.

For example, when we're retrying the default connection and we get a
request to connect to supl or mms which are short lived connections
we'll become completely disconnected.

Bug: 8770139
Change-Id: Id271bc7f88d12e6d9fe9451b09f9c9412e6959f4
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
385051afecde7a16a08b2aebb2025c3a2bbac279 02-May-2013 Jake Hamby <jhamby@google.com> Log the correct radio states for GSM_RAT_SWITCHED.

In GsmServiceStateTracker.pollStateDone(), we were recording the
incorrect radio states when logging GSM_RAT_SWITCHED. Specifically,
we were using the new voice radio technology for "network_from" and
STATE_OUT_OF_SERVICE for "network_to".

To avoid confusion when analyzing logs from different devices,
add a new event log tag, GSM_RAT_SWITCHED_NEW, to use for logging
the correct radio states, and add comments to indicate that
GSM_RAT_SWITCHED should be considered obsolete.

Bug: 8781951
Change-Id: I858d3f5044d7fb2560a4e21b8a5b4b14b4689a61
rc/java/com/android/internal/telephony/EventLogTags.logtags
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
281fc7bd23b9ce9dc90b18c4e66916016318244e 02-May-2013 Wink Saville <wink@google.com> Cleanup README.txt

Change-Id: I372dc2777f36bae615602f8da0c2346d94c27a82
EADME.txt
55032f7787e2bc447249d3f2cdf4998dfb6e26cc 01-May-2013 Wink Saville <wink@google.com> am f6f1abbe: am 0f94d3ae: Add synchronized to toString.

* commit 'f6f1abbe04cf92da5412d20f194e5a023c61f42d':
Add synchronized to toString.
f6f1abbe04cf92da5412d20f194e5a023c61f42d 01-May-2013 Wink Saville <wink@google.com> am 0f94d3ae: Add synchronized to toString.

* commit '0f94d3aebcf0daf154bf0876164844d09067f904':
Add synchronized to toString.
0f94d3aebcf0daf154bf0876164844d09067f904 30-Apr-2013 Wink Saville <wink@google.com> Add synchronized to toString.

If toString is called at the same time removeWaitingApn we can
get a ConncurrentModificationException.

Bug: 8727610
Change-Id: I95c2181a1a5abc1a28a9e4eb337b674e49847103
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
0e57bf12b5f4ea53427d7a7f1f875ec744dd1828 24-Apr-2013 Wink Saville <wink@google.com> am 26830d76: am 815af95f: Support WiFi only device at runtime.

* commit '26830d76df08a9830decdb758845ba67f5bac044':
Support WiFi only device at runtime.
26830d76df08a9830decdb758845ba67f5bac044 24-Apr-2013 Wink Saville <wink@google.com> am 815af95f: Support WiFi only device at runtime.

* commit '815af95fb1568fd7b1ab8e6a610189821de99c81':
Support WiFi only device at runtime.
3c9d82364525c955bf6501775f90026090c160e9 24-Apr-2013 Jake Hamby <jhamby@google.com> Merge "Refactor inbound (MT) SMS handling into new handler classes."
815af95fb1568fd7b1ab8e6a610189821de99c81 23-Apr-2013 Wink Saville <wink@google.com> Support WiFi only device at runtime.

Now that ConnectivityService determines if TYPE_MOBILE is supported at
runtime don't need the special code in RIL.java.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
rc/java/com/android/internal/telephony/RIL.java
0b814795afa3f0f2a26557ae179ceeb1d3dfef37 23-Apr-2013 Wink Saville <wink@google.com> am 6b101639: am 30961e36: Merge "On data only devices use data registration state." into jb-mr2-dev

* commit '6b101639870202d3e387d8edc0fc1a50d6c23266':
On data only devices use data registration state.
6b101639870202d3e387d8edc0fc1a50d6c23266 23-Apr-2013 Wink Saville <wink@google.com> am 30961e36: Merge "On data only devices use data registration state." into jb-mr2-dev

* commit '30961e36e424641b8cd0496888112d3ac748e306':
On data only devices use data registration state.
0d4bcdf379842af4b6304809156971e926f374f0 18-Mar-2013 Jake Hamby <jhamby@google.com> Refactor inbound (MT) SMS handling into new handler classes.

Moved all MT SMS handling to separate StateMachine classes, which
save all incoming PDUs in the SmsProvider "raw" table, previously
used only for storing PDUs of concatenated messages. Then we ACK the
message, before starting the ordered broadcast as usual. If a receiver
of the broadcast sets the status to failure, we ignore it, but in the
future we could provide a mechanism to redeliver the broadcast.

New classes are (without com.android.internal.telephony prefix):
- CellBroadcastHandler
- InboundSmsHandler
- InboundSmsTracker
- SmsBroadcastUndelivered
- WakeLockStateMachine
- cdma.CdmaInboundSmsHandler
- cdma.CdmaServiceCategoryProgramHandler
- gsm.GsmCellBroadcastHandler
- gsm.GsmInboundSmsHandler

This fixes a bug in the SMS dispatcher. Previously we delivered
incoming SM's as ordered broadcasts and then sent an acknowledgment
to the SMSC after the broadcast completed. It was possible for the
ordered broadcast to take over 20 seconds to complete, causing SMS
retransmissions because we didn't ACK quickly enough. Also, a
broadcast receiver could set the result code to failure (the AOSP
MMS app never does this), causing us to negatively acknowledge the
SMS, potentially leading to many retries and a backlog on the SMSC.

The reason for saving all PDUs in the raw table before ACKing is so
InboundSmsHandler can handle the failure case of a device crash or
power failure in between ACKing the message and the delivery of the
ordered broadcast to receivers. This is handled when the Phone class
starts, creating a new thread to run SmsBroadcastUndelivered.
This Runnable scans the raw table once, finding all complete
PDUs and sending IncomingSmsTrackers to the state machine to
broadcast them again to receivers. In the worst case, a message might
be added twice to the MMS inbox, but it won't be lost.

However, due to the current MMS app implementation, which immediately
acknowledges the ordered broadcast before starting a new Service to
process the message, there is a very short window of time when a
message could potentially be lost, if the MMS app or device crashed
after the ordered broadcast returns and the message is deleted from
the raw table, but before the MMS service has added the message to
its own tables. To fix this will probably require API changes.

Another improvement from this change: SmsBroadcastUndelivered also
deletes PDUs for incomplete multipart messages that are older than
30 days. We've never garbage collected this table in the past, so
it's possible for a phone to accumulate a number of old PDUs in the
raw table if not all components arrived successfully.

The wake lock handling is also improved in this version, as we now
acquire a wakelock when the state machine leaves the Idle state,
releasing it 3 seconds after returning to the idle state, instead
of the previous 5-second timeout. If a new SMS arrives while a
broadcast is being delivered, we add it to the raw table and ACK the
new PDU immediately, then send the InboundSmsTracker as a message to
handle when the previous broadcast completes.

In order to keep track of whether a PDU is in 3GPP or 3GPP2 format,
the destination port column of the raw table is extended with three
flags: 3GPP format, 3GPP2 format, and no destination port present.
Because the destination port is a 16-bit value in both 3GPP and
3GPP2, the upper bits of the destination port can be used for flags.
This saves us from having to modify the SMS provider to update the
DB version and to add extra columns to keep track of these flags.

Bug: 7099232
Change-Id: Ibbc01ccb83320f4b6112fe3dd31355eb6f570b67
rc/java/com/android/internal/telephony/CellBroadcastHandler.java
rc/java/com/android/internal/telephony/InboundSmsHandler.java
rc/java/com/android/internal/telephony/InboundSmsTracker.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/SmsBroadcastUndelivered.java
rc/java/com/android/internal/telephony/SmsStorageMonitor.java
rc/java/com/android/internal/telephony/WakeLockStateMachine.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaInboundSmsHandler.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceCategoryProgramHandler.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java
rc/java/com/android/internal/telephony/gsm/GsmInboundSmsHandler.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
30961e36e424641b8cd0496888112d3ac748e306 22-Apr-2013 Wink Saville <wink@google.com> Merge "On data only devices use data registration state." into jb-mr2-dev
f1317a4b3492218ac2e449ee990948bac0295b65 20-Apr-2013 Wink Saville <wink@google.com> On data only devices use data registration state.

Some operators may report that the voice registration state is
not in service on a data only device. So use the Data registration
state for data only devices.

Bug: 8213254
Change-Id: Ieb6eef65fa5afb3d2c1a39b32a5bc5825ccc7f1c
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
a66d6d9608e8879883cefdcbc51af7cb897cabc4 19-Apr-2013 Jake Hamby <jhamby@google.com> am fd23eac7: am e17fb5a1: Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.

* commit 'fd23eac7aafed4fba96deb62cc0816b2c12d2bf3':
Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.
fd23eac7aafed4fba96deb62cc0816b2c12d2bf3 19-Apr-2013 Jake Hamby <jhamby@google.com> am e17fb5a1: Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.

* commit 'e17fb5a149610484b4bcda31cde04abfd4e5d4ec':
Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.
e17fb5a149610484b4bcda31cde04abfd4e5d4ec 18-Apr-2013 Jake Hamby <jhamby@google.com> Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.

After loading EF_CFF_CPHS, use it to set mCallForwardingEnabled flag
if EF_CFIS record is missing or invalid.

Also fixes a few typos and updates an incorrect Javadoc comment.

Bug: 8554894
Change-Id: I3dfe3c915ad15b65781cd4e4d65cfa5c71a46ad6
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
d37527412ccd17bc52bf1d066dd3a4e97855249e 18-Apr-2013 Wink Saville <wink@google.com> am 3b9a6509: am 66c86c83: Merge "Default CellInfoListRate to off, Integer.MAX_VALUE." into jb-mr2-dev

* commit '3b9a650912f5032754502085c3ee5a7e6f64f5a8':
Default CellInfoListRate to off, Integer.MAX_VALUE.
3b9a650912f5032754502085c3ee5a7e6f64f5a8 18-Apr-2013 Wink Saville <wink@google.com> am 66c86c83: Merge "Default CellInfoListRate to off, Integer.MAX_VALUE." into jb-mr2-dev

* commit '66c86c834e26d143f5b0b822ba12a37948ef0528':
Default CellInfoListRate to off, Integer.MAX_VALUE.
66c86c834e26d143f5b0b822ba12a37948ef0528 18-Apr-2013 Wink Saville <wink@google.com> Merge "Default CellInfoListRate to off, Integer.MAX_VALUE." into jb-mr2-dev
121c056d398b68e2bd2d35e6f5c2730fa7fb81c9 17-Apr-2013 Wink Saville <wink@google.com> Default CellInfoListRate to off, Integer.MAX_VALUE.

For now be sure CellInfoListRate is off.

Bug: 8621996
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
rc/java/com/android/internal/telephony/RIL.java
82194d8cd99871b206ce722dd7dd1e11a2401516 17-Apr-2013 Jake Hamby <jhamby@google.com> am 5bbf966d: am d34aceac: Enable CMAS alert tone and alert dialog for AMBER alerts.

* commit '5bbf966da6a941af0f8f3e99f3ba9ae36bced3b9':
Enable CMAS alert tone and alert dialog for AMBER alerts.
5bbf966da6a941af0f8f3e99f3ba9ae36bced3b9 17-Apr-2013 Jake Hamby <jhamby@google.com> am d34aceac: Enable CMAS alert tone and alert dialog for AMBER alerts.

* commit 'd34aceac4d82e00972663d0d97274428f0465dec':
Enable CMAS alert tone and alert dialog for AMBER alerts.
d34aceac4d82e00972663d0d97274428f0465dec 16-Apr-2013 Jake Hamby <jhamby@google.com> Enable CMAS alert tone and alert dialog for AMBER alerts.

The CMAS UI did not play the CMAS alert tone for AMBER alerts,
showing them as a regular notification instead. Carrier requirements
state that the CMAS alert tone should play for all CMAS alerts.
Remove the AMBER alert exception from
CellBroadcastMessage.isEmergencyAlertMessage().

Bug: 7417676
Change-Id: If24f6b4ebd4633f671beebbe7784b6cc012c358a
rc/java/android/telephony/CellBroadcastMessage.java
a154f119fc0007de358e82d288e8a8249a0196d8 11-Apr-2013 Wink Saville <wink@google.com> am 7cf770f7: am 5fce53ac: (-s ours) Merge "Telephony: Return \'null\' as per TelephonyManager need"

* commit '7cf770f72e7538d5da11d0fc7e8dbfc5655e61ec':
Telephony: Return 'null' as per TelephonyManager need
7cf770f72e7538d5da11d0fc7e8dbfc5655e61ec 11-Apr-2013 Wink Saville <wink@google.com> am 5fce53ac: (-s ours) Merge "Telephony: Return \'null\' as per TelephonyManager need"

* commit '5fce53ac6610d7b301cb70a6433307b822c41c30':
Telephony: Return 'null' as per TelephonyManager need
5a1e8ffd7e7ba53a4d6c8ecd335e2a68b56b5a6f 11-Apr-2013 Jake Hamby <jhamby@google.com> am a1965147: am 151274cf: Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev

* commit 'a19651474756577931768df2b88578fde14d9487':
Fix some frameworks-telephony test compile errors.
a19651474756577931768df2b88578fde14d9487 11-Apr-2013 Jake Hamby <jhamby@google.com> am 151274cf: Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev

* commit '151274cffffb518748a291504dd26fc8d816bd50':
Fix some frameworks-telephony test compile errors.
151274cffffb518748a291504dd26fc8d816bd50 11-Apr-2013 Jake Hamby <jhamby@google.com> Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev
5fce53ac6610d7b301cb70a6433307b822c41c30 11-Apr-2013 Wink Saville <wink@google.com> Merge "Telephony: Return 'null' as per TelephonyManager need"
85c9bba0f4053cb78ea21688cd9ee8b10ac99922 11-Apr-2013 Ajay Nambi <anambi@codeaurora.org> am f43d1a5d: am 3c6bdec2: Telephony: Return \'null\' as per TelephonyManager need

* commit 'f43d1a5d56f36fadc5e8cbb7270c128030fda731':
Telephony: Return 'null' as per TelephonyManager need
f43d1a5d56f36fadc5e8cbb7270c128030fda731 11-Apr-2013 Ajay Nambi <anambi@codeaurora.org> am 3c6bdec2: Telephony: Return \'null\' as per TelephonyManager need

* commit '3c6bdec23af42aba1168303cdefc20525b0ec1d0':
Telephony: Return 'null' as per TelephonyManager need
3c6bdec23af42aba1168303cdefc20525b0ec1d0 11-Apr-2013 Ajay Nambi <anambi@codeaurora.org> Telephony: Return 'null' as per TelephonyManager need

Return 'null' instead of "" (empty string) when Line1AlphaTag,
IccSerialNumber and Msisdn are unavailable.

Bug: 8449375
Change-Id: I5d8052922363f4b3b900bcdea490afe22fedce4f

Change-Id: Iaa77764af8f2c12c11c990c6c23152ba1dac84cb
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
7667e7abe11b94b5573b565e25adbffdf7d65141 11-Apr-2013 Jake Hamby <jhamby@google.com> Fix some frameworks-telephony test compile errors.

Fix some frameworks-telephony test case compile errors due to
package name change for ApnSetting and additional methods added
to BaseCommands.

Change-Id: I72a9caabd6b7d09e9d0f1e39ab7bd24fa0e60594
ests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
cc5ac3f42f6c6d02a951de4b7ad84b7bc53112ff 10-Apr-2013 Wink Saville <wink@google.com> am 1eb16e1c: am 94354e82: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev

* commit '1eb16e1ce7e5dc59d04815397e7e434bb9311953':
Add FW support for CellInfo RIL commands.
1eb16e1ce7e5dc59d04815397e7e434bb9311953 10-Apr-2013 Wink Saville <wink@google.com> am 94354e82: Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev

* commit '94354e82d1e0cc5fa21dec803d089dd066689174':
Add FW support for CellInfo RIL commands.
94354e82d1e0cc5fa21dec803d089dd066689174 10-Apr-2013 Wink Saville <wink@google.com> Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
22586e492a8fff4d321eece3e52ea022113950aa 09-Apr-2013 Wink Saville <wink@google.com> am 8206c65c: am c76db118: Merge "Telephony: Send complete path for EF-IMG(4F20) for RUIM cards."

* commit '8206c65c656e6cfa3d84ed3759a2b14f95506711':
Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.
a218a0b9cfc9cce997608e688b69037b8c5afe64 09-Apr-2013 Shriram Ganesh <sganesh@codeaurora.org> am 80768659: Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.

* commit '807686598ce4da5d1cb05eaaad4c71f867fe2131':
Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.
8206c65c656e6cfa3d84ed3759a2b14f95506711 09-Apr-2013 Wink Saville <wink@google.com> am c76db118: Merge "Telephony: Send complete path for EF-IMG(4F20) for RUIM cards."

* commit 'c76db118626ef47a8deee6fbd9c20dff1473d896':
Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.
807686598ce4da5d1cb05eaaad4c71f867fe2131 22-Jul-2012 Shriram Ganesh <sganesh@codeaurora.org> Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.

When retrieving the EF_IMG from an RUIM the icon load fails
because the path to the EF is incorrectly specified as "img"

Bug: 8443193
Change-Id: I76f981d5334274b34e2e1a752fd0a550458e4e86
rc/java/com/android/internal/telephony/uicc/RuimFileHandler.java
c76db118626ef47a8deee6fbd9c20dff1473d896 09-Apr-2013 Wink Saville <wink@google.com> Merge "Telephony: Send complete path for EF-IMG(4F20) for RUIM cards."
5fb811ff076aa6b4a9ceca6edaf504a4c6d9ad20 09-Apr-2013 Wink Saville <wink@google.com> Add FW support for CellInfo RIL commands.

Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
4fbaa3c6bd5e3262b34d51e21ab38f1e39c4f33f 08-Apr-2013 Wink Saville <wink@google.com> am e3366ce3: Fix SignalStrength response.

* commit 'e3366ce305cf679bed0270db09938567d0e4d6d2':
Fix SignalStrength response.
e3366ce305cf679bed0270db09938567d0e4d6d2 08-Apr-2013 Wink Saville <wink@google.com> Fix SignalStrength response.

Use the new SignalStrength constructor with gsmFlag.

Also, remove code in responseStrings which would cause
it to return an empty array if RILJ_LOGV was true.

Bug: 8561333
Change-Id: Ie6eb3b0335e8d7ea114ec70b3fb72e917094632e
rc/java/com/android/internal/telephony/RIL.java
10d832b620afef9c4bb3e5bd1f1cacc60e886bbe 03-Apr-2013 Wink Saville <wink@google.com> am f50b1bea: Merge "IccCardApplicatonStatus should not throw exceptions." into jb-mr2-dev

* commit 'f50b1bea2553ccd7b528f225bb7edc1504959db7':
IccCardApplicatonStatus should not throw exceptions.
f50b1bea2553ccd7b528f225bb7edc1504959db7 03-Apr-2013 Wink Saville <wink@google.com> Merge "IccCardApplicatonStatus should not throw exceptions." into jb-mr2-dev
c99e7c34aaca14bb1d8f9962f79d9465ccc04575 03-Apr-2013 Wink Saville <wink@google.com> IccCardApplicatonStatus should not throw exceptions.

Change from throwing exception to logging an error and mapping
to an XXXX_UKNOWN value.

Bug: 7449696
Change-Id: Iebed1c7893d120fb02821017643ee070d634bb19
rc/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java
298ecaf332b94ab8c4a9acf7b3a86fc99a426d38 02-Apr-2013 Robert Greenwalt <rgreenwalt@google.com> am 6651da75: Merge "make new API to retrieve group identifier level1" into jb-mr2-dev

* commit '6651da75a59ee54f154b2a82c76392a3385108bb':
make new API to retrieve group identifier level1
6651da75a59ee54f154b2a82c76392a3385108bb 02-Apr-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "make new API to retrieve group identifier level1" into jb-mr2-dev
2079885b9f6cd953654176c9c84266fc480169e4 29-Mar-2013 Wink Saville <wink@google.com> am 4750c8c1: Fix TODO in ApnContext#setDataConnectionAc.

* commit '4750c8c11836338b024e159f04f0cbd13c7444b9':
Fix TODO in ApnContext#setDataConnectionAc.
62b4dd49d1c2c8edb8b7640c0c2157488c3c46f3 29-Mar-2013 Wink Saville <wink@google.com> am 1f8e6cac: Merge "Add fix and add some debugging." into jb-mr2-dev

* commit '1f8e6cacec886736414f3b7d750ad1fa973ab20d':
Add fix and add some debugging.
6a044b412b759368c5f01006d08c1bdcb7dd2976 29-Mar-2013 Wink Saville <wink@google.com> am c6bbea82: Map DcConstants.RETRYING to PhoneConstants.State.DISCONNECTED.

* commit 'c6bbea82bf74ebb492508199b6f3e172b7ce860a':
Map DcConstants.RETRYING to PhoneConstants.State.DISCONNECTED.
4750c8c11836338b024e159f04f0cbd13c7444b9 29-Mar-2013 Wink Saville <wink@google.com> Fix TODO in ApnContext#setDataConnectionAc.

Callers that really need to tearDown should call it directly
rather than as a side effect of setDataConnectionAc. The fixes
a "DcActiveState ERROR no such apnContext=" message caused by
an unnecssary tearDown when disconnecting.

Change-Id: I11321d098444659d99dec97b59041cefebb3285e
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
1f8e6cacec886736414f3b7d750ad1fa973ab20d 29-Mar-2013 Wink Saville <wink@google.com> Merge "Add fix and add some debugging." into jb-mr2-dev
c3b7c73fd6a494483e941adddcb3c0c23f4f0a70 28-Mar-2013 Wink Saville <wink@google.com> Add fix and add some debugging.

Bug: 8492574
Change-Id: I9cb1ab4ec3efb8186a4dd83736781835e1847720
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
c6bbea82bf74ebb492508199b6f3e172b7ce860a 28-Mar-2013 Wink Saville <wink@google.com> Map DcConstants.RETRYING to PhoneConstants.State.DISCONNECTED.

Previously RETRYING was mapped to CONNECTING this means that
ConnectivityService will not remove the route and a subsequent
change in IP addresses won't work because an old route has not
been removed.

By mapping to DISCONNECTED ConnectivityService will remove the
route. Another alternative would be to add PhoneConstants.State.RETRYING
but this is a simpler change so we'll try it first.

Bug: 8486114
Change-Id: I1c9946a1e441feda83f13730e835445624a87218
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
147489dd123b3bc4046619626c572e3858f1d135 28-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am 1f2a2323: Use new mechanism to get messenger to StateTracker

* commit '1f2a2323572b2f3ab18234726cc1b048c670fbab':
Use new mechanism to get messenger to StateTracker
1f2a2323572b2f3ab18234726cc1b048c670fbab 21-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Use new mechanism to get messenger to StateTracker

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
1121a25248e36e97a472c1886b5ec4b782614c5d 27-Mar-2013 Alex Yakavenka <ayakav@codeaurora.org> am f16c95f5: Merge commit \'903be2fc\' into fix-merge-conflict

* commit 'f16c95f5e7e34e7e3a51a012d172902365a3682e':
Telephony: Null check for adncache before search/update.
f16c95f5e7e34e7e3a51a012d172902365a3682e 27-Mar-2013 Alex Yakavenka <ayakav@codeaurora.org> Merge commit '903be2fc' into fix-merge-conflict

* commit '903be2fc':
Telephony: Null check for adncache before search/update.

Change-Id: I1e498b4783e6c3381c14309019420142f3b8b15d
0e4abef0d7e978d4c3dea5199f451a1c69158d03 21-Mar-2013 Sungmin Choi <sungmin.choi@lge.com> make new API to retrieve group identifier level1

For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

bug:6445254
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/PhoneSubInfoProxy.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
903be2fcd0820071ca6bee5326a796916d516908 27-Mar-2013 Wink Saville <wink@google.com> am ead6ee84: Merge "Telephony: Null check for adncache before search/update."

* commit 'ead6ee84aa6275062b64a05dafd14a0c17da8ea3':
Telephony: Null check for adncache before search/update.
ead6ee84aa6275062b64a05dafd14a0c17da8ea3 27-Mar-2013 Wink Saville <wink@google.com> Merge "Telephony: Null check for adncache before search/update."
def8fcc38f26f121358b53f8ff43dd3a0e35787b 27-Mar-2013 Lorenzo Colitti <lorenzo@google.com> am f8768537: Merge "Allow 0.0.0.0 and :: as default gateways" into jb-mr2-dev

* commit 'f8768537438ef0517f6b11f449f9cabbea2f99ba':
Allow 0.0.0.0 and :: as default gateways
f8768537438ef0517f6b11f449f9cabbea2f99ba 27-Mar-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Allow 0.0.0.0 and :: as default gateways" into jb-mr2-dev
95005b77a237718211ee88bc86df5ada1ecebe10 27-Mar-2013 Wink Saville <wink@google.com> am 652fe674: Merge commit \'310b322d\' into fix-merge-conflict

* commit '652fe674a597e221274a3746118f15cf40c7dbb9':
Telephony: Delay SIM IO until SIM_READY
652fe674a597e221274a3746118f15cf40c7dbb9 27-Mar-2013 Wink Saville <wink@google.com> Merge commit '310b322d' into fix-merge-conflict

* commit '310b322d':
Telephony: Delay SIM IO until SIM_READY

Change-Id: I50618a1fb06a7eb465f7a0d9b4b8d6fb53ad1339
310b322dc0a45b3b122f65dfdccbfc7d0b1d9d8d 26-Mar-2013 Wink Saville <wink@google.com> am f57fcc91: Merge "Telephony: Delay SIM IO until SIM_READY"

* commit 'f57fcc91426dfa4c3efe2f8ee64a6a39bf708a97':
Telephony: Delay SIM IO until SIM_READY
f57fcc91426dfa4c3efe2f8ee64a6a39bf708a97 26-Mar-2013 Wink Saville <wink@google.com> Merge "Telephony: Delay SIM IO until SIM_READY"
64bfd98578babdd437f1a83d2d5e1fc92c76e729 21-Mar-2013 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Delay SIM IO until SIM_READY

When SIM_REFRESH with SIM_INIT is received we need to
reread EFs but only if and when app is ready.

Bug: 8445450
Change-Id: I066a1e6547cfdcba91230f5fbfa8050864327c5d
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
ebc8af719102a64a2ae17cc2a836e23e2dbc3838 25-Mar-2013 Lorenzo Colitti <lorenzo@google.com> Allow 0.0.0.0 and :: as default gateways

On point-to-point interfaces, some RILs return the unspecified
address (0.0.0.0 or ::) as the gateway. This is correct, as
routes pointing at point-to-point interfaces don't need
gateways. Currently, telephony ignores these routes, causing
loss of connectivity (for example, when using an IPv6 APN on
Galaxy Nexus). Allow these routes to be set.

Bug: 8475171
Bug: 8276725
Change-Id: I3a770628c9717bb6e451a523417401b56ba55763
rc/java/com/android/internal/telephony/dataconnection/DataCallResponse.java
33662b94d9fbace4100a5ca229d5ae27fbef3966 26-Mar-2013 Jake Hamby <jhamby@google.com> am 4e9ed041: resolved conflicts for merge of 4eede890 to jb-mr2-dev

* commit '4e9ed0410d72180872d59b14cb375c1c2ed94788':
Telephony: Fix IntRangeManager
4e9ed0410d72180872d59b14cb375c1c2ed94788 26-Mar-2013 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 4eede890 to jb-mr2-dev

Change-Id: I7ee1d93d832275ad04d4e6bbae68d22ae86322ac
4eede89017a05b8180835d61632af312a9573a5f 25-Mar-2013 Jake Hamby <jhamby@google.com> am 3ab6a16a: Merge "Telephony: Fix IntRangeManager"

* commit '3ab6a16ab4d9c6fd842a46ed02aee25391e1b8fa':
Telephony: Fix IntRangeManager
2095c8fc5e7244b2d2c6161857f992a5eaee0e61 25-Mar-2013 Wink Saville <wink@google.com> am 1b21c4e9: Merge "Use Build.IS_DEBUGGABLE" into jb-mr2-dev

* commit '1b21c4e9ebaba1af72ae6fa18e98d6863c888aca':
Use Build.IS_DEBUGGABLE
3ab6a16ab4d9c6fd842a46ed02aee25391e1b8fa 25-Mar-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix IntRangeManager"
1b21c4e9ebaba1af72ae6fa18e98d6863c888aca 25-Mar-2013 Wink Saville <wink@google.com> Merge "Use Build.IS_DEBUGGABLE" into jb-mr2-dev
2cc8c148fa4cb6cba5deac6b011268b4174a0b02 25-Mar-2013 Wink Saville <wink@google.com> Use Build.IS_DEBUGGABLE

Change-Id: I8d4a2e83b8cdcf86cafb622013868f117d0701ef
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/TelephonyTester.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DcController.java
rc/java/com/android/internal/telephony/dataconnection/DcRetryAlarmController.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java
1e18e3dcda078bbb72048f019afd7e87212afaef 25-Mar-2013 Jeff Sharkey <jsharkey@android.com> am b37b0722: Merge "Testing property to verify roaming behavior." into jb-mr2-dev

* commit 'b37b072231c579844c21e5120eb7c200ac872de1':
Testing property to verify roaming behavior.
b37b072231c579844c21e5120eb7c200ac872de1 25-Mar-2013 Jeff Sharkey <jsharkey@android.com> Merge "Testing property to verify roaming behavior." into jb-mr2-dev
60ced166cb63c35a0ebbee1fc356cddcb76b956f 25-Mar-2013 Jeff Sharkey <jsharkey@android.com> Testing property to verify roaming behavior.

Bug: 6777372
Change-Id: Ia698f0eca6f05a6327f6c8b36cfe14f51f01e6e3
EADME.txt
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
8910912c7f527c9a6a8d42b8d0233dbf0b64c005 25-Mar-2013 Wink Saville <wink@google.com> am b7881d6e: Rename a couple variables in IccRecords.

* commit 'b7881d6e7e4e79491376bedf151c3412dfdc4121':
Rename a couple variables in IccRecords.
b7881d6e7e4e79491376bedf151c3412dfdc4121 25-Mar-2013 Wink Saville <wink@google.com> Rename a couple variables in IccRecords.

Also add getIccId for use by PhoneBase.

Change-Id: I51eaf09bfc498f1f1edc3f697838978f56b7bd4e
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
6ba5e0d1c0b482a949aafdce852e99e7811dd992 25-Mar-2013 Wink Saville <wink@google.com> am 454b1dfd: Rename a few files and variables.

* commit '454b1dfd508844b42eb775e4ab2359be74d3672b':
Rename a few files and variables.
454b1dfd508844b42eb775e4ab2359be74d3672b 23-Mar-2013 Wink Saville <wink@google.com> Rename a few files and variables.

Change-Id: I4e90dbf57797b9485920f943e24fa7a4c29d070b
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionAc.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTrackerBase.java
rc/java/com/android/internal/telephony/dataconnection/DcAsyncChannel.java
rc/java/com/android/internal/telephony/dataconnection/DcController.java
rc/java/com/android/internal/telephony/dataconnection/DcTracker.java
rc/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
fce638d1cc4c30c69b5cb6b0511f93c874f34f41 22-Jul-2012 Shriram Ganesh <sganesh@codeaurora.org> Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.

When retrieving the EF_IMG from an RUIM the icon load fails
because the path to the EF is incorrectly specified as "img"

Bug: 8443193
Change-Id: I76f981d5334274b34e2e1a752fd0a550458e4e86
rc/java/com/android/internal/telephony/uicc/RuimFileHandler.java
4bf323c3a37e910dd6b3eb1ffabe508e0dff5b2a 30-Aug-2012 Venkat Ram Prakash Kotni <vkotni@codeaurora.org> Telephony: Return 'null' as per TelephonyManager need

Return 'null' instead of "" (empty string) when Line1AlphaTag,
IccSerialNumber and Msisdn are unavailable.

Bug: 8449375
Change-Id: I5d8052922363f4b3b900bcdea490afe22fedce4f
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
8430d35150b0579e13f5f6c9b9128712cfef8e46 22-Mar-2013 Wink Saville <wink@google.com> am ff4e317d: Move retrying into DC.

* commit 'ff4e317d24f0d23bdc0f306d53ddc51f2f1ecf6a':
Move retrying into DC.
ff4e317d24f0d23bdc0f306d53ddc51f2f1ecf6a 22-Mar-2013 Wink Saville <wink@google.com> Move retrying into DC.

This is the first step in refactoring for bug 4772191.

Bug: 4772191
Change-Id: Id54a20ab192783c63939158670faaf531a527640
EADME.txt
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/TelephonyTester.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/DataCallResponse.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionAc.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionBase.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTrackerBase.java
rc/java/com/android/internal/telephony/dataconnection/DcController.java
rc/java/com/android/internal/telephony/dataconnection/DcFailBringUp.java
rc/java/com/android/internal/telephony/dataconnection/DcFailCause.java
rc/java/com/android/internal/telephony/dataconnection/DcRetryAlarmController.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterDeactivateAll.java
rc/java/com/android/internal/telephony/dataconnection/DcTesterFailBringUpAll.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
fae219fd6b7c292cb8f2789cfc3f7be5faa4f87e 21-Mar-2013 Wink Saville <wink@google.com> am 6ca911a9: Merge commit \'f606e5cc\' into fix-merge-conflict

* commit '6ca911a976a277e69800249c924c8dbc8fc5d78f':
RIL: Correct the RIL_REQUEST_DIAL api missmatch
6ca911a976a277e69800249c924c8dbc8fc5d78f 21-Mar-2013 Wink Saville <wink@google.com> Merge commit 'f606e5cc' into fix-merge-conflict

* commit 'f606e5cc':
RIL: Correct the RIL_REQUEST_DIAL api missmatch

Conflicts:
src/java/com/android/internal/telephony/RIL.java

Change-Id: Ib2b477628e14ca221acad35f4a2cf9a44170a33e
f606e5ccae365aa765bf99291241d54f221c9fa4 21-Mar-2013 Wink Saville <wink@google.com> am 0f7c9029: Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"

* commit '0f7c9029877f3643824a2c3cb567f6b96f189eb5':
RIL: Correct the RIL_REQUEST_DIAL api missmatch
0f7c9029877f3643824a2c3cb567f6b96f189eb5 21-Mar-2013 Wink Saville <wink@google.com> Merge "RIL: Correct the RIL_REQUEST_DIAL api missmatch"
9ae284ab5fc779da9b03f8fd5020edc658c4bf4e 10-Oct-2012 Bjorn Andersson <bjorn.andersson@sonymobile.com> RIL: Correct the RIL_REQUEST_DIAL api missmatch

The uusPresent is written twice in dial() so it will always be
marked as absent.

Change-Id: Id50a4dc8a3eefdaf2284e410382428c52e9b5ef1
rc/java/com/android/internal/telephony/RIL.java
abc0deab197041aff2c81cb524a7b3f77299a3cc 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am 2c74d79c: am f7bf2056: am 63152045: Merge "add MVNO check routine"

* commit '2c74d79cab4eee87acf0e74c0d8bf76be8f0f4aa':
add MVNO check routine
ead26eab853598e8931678535c81761821402e87 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am c60e2c6e: am fbd959c2: am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'c60e2c6e5a3b09b2eaf6298863e5c3b0e7caefa0':
add columns of Carrier about MVNO
2c74d79cab4eee87acf0e74c0d8bf76be8f0f4aa 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am f7bf2056: am 63152045: Merge "add MVNO check routine"

* commit 'f7bf205684ca101326e57921d81963da7541e3c6':
add MVNO check routine
c60e2c6e5a3b09b2eaf6298863e5c3b0e7caefa0 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am fbd959c2: am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'fbd959c2f0e9e420d1b65f14463ba8da04e76655':
add columns of Carrier about MVNO
f7bf205684ca101326e57921d81963da7541e3c6 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am 63152045: Merge "add MVNO check routine"

* commit '631520453bea1841dbc808a051bd09eb85599b4b':
add MVNO check routine
fbd959c2f0e9e420d1b65f14463ba8da04e76655 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am ae6a4485: Merge "add columns of Carrier about MVNO"

* commit 'ae6a44857a0b3d9e37c53f2cfd42e13003c68408':
add columns of Carrier about MVNO
631520453bea1841dbc808a051bd09eb85599b4b 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "add MVNO check routine"
fd5de4dae153c57e13bf8979d6f7a8aa86e3dede 07-Feb-2013 Sungmin Choi <sungmin.choi@lge.com> add MVNO check routine

modify createApnList() API as the followings:

1.1 mvno != null (already matched mvno info)
1.2 mvno == cur_mvno_info
1.2.1 result.add
2.1 mvno == null (not yet)
2.2 mvnoMatch check
2.2.1 clear prev results.
2.2.2 result add (mvno)
2.3 mvno_type is null
2.3.1 result add (normal)

match mvno as the followings:
1. if mvno_type is spn, compare spn of SIM
2. if mvno_type is imsi, compare imsi of SIM
3. if mvno_type is gid, compare gid of SIM

Bug: 8143480
Change-Id: Idf0aa1ddf139f80c7d33b1e3315493d32dbf433a
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
ae6a44857a0b3d9e37c53f2cfd42e13003c68408 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "add columns of Carrier about MVNO"
a796ca5b3f8501630405f1ce2635dde9011b7373 07-Feb-2013 Sungmin Choi <sungmin.choi@lge.com> add columns of Carrier about MVNO

To recognize MVNO, use new fields, MVNO_MATCH_DATA and MVNO_TYPE
(SPN, IMSI, GID(Group Identifier Level 1)).

Bug: 8143480
Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819
rc/java/android/provider/Telephony.java
f656f49995d0da6b21df9dd97dbf7a56eb5072a7 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am 620c8855: Merge commit \'b21b57c0\' into manualmerge

* commit '620c8855bcaa3fe8d492e93811b0ed6e8b4f59fc':
get group identifier level1 (Gid1)
620c8855bcaa3fe8d492e93811b0ed6e8b4f59fc 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Merge commit 'b21b57c0' into manualmerge

Conflicts:
src/java/com/android/internal/telephony/uicc/SIMRecords.java

Change-Id: Ic998e70207851e7e00f56d6e8591e53834987358
b21b57c092b15952e1ad00305810ae114d27fd78 15-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am c13624a4: Merge "get group identifier level1 (Gid1)"

* commit 'c13624a4a0b63c492fa8b336ae737f831bde50eb':
get group identifier level1 (Gid1)
c13624a4a0b63c492fa8b336ae737f831bde50eb 15-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "get group identifier level1 (Gid1)"
f5775c6a5fb65b8c0c011272e06e264b7339b0b6 14-Mar-2013 keunyoung <keunyoung@google.com> am a0f3a809: fix PDK no-java build

* commit 'a0f3a809d88e871ca5298b3c7aea2f4b5fc43839':
fix PDK no-java build
a0f3a809d88e871ca5298b3c7aea2f4b5fc43839 13-Mar-2013 keunyoung <keunyoung@google.com> fix PDK no-java build

- As this component is in PDK, it should not be built when necessary
frameworks libraries are not available.
- For full platform source tree, the ...JAVA_SUPPORT_LEVEL is platform.

Change-Id: I6d37970ab7a3e5183d3a04b003ec3f81f907abc8
ndroid.mk
0b9028fe913016d55f1f03803c11c49bbb31578a 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am b037a870: (-s ours) am b9de4496: am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b037a8706d394afd803af6a20fe7cae0d9248e30':
b037a8706d394afd803af6a20fe7cae0d9248e30 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am b9de4496: am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b9de449616f5f0ab8eb6e819bb581f9c353316f9':
b9de449616f5f0ab8eb6e819bb581f9c353316f9 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 9b5a5a0f: am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2':
9b5a5a0f9dac0b5d7d540e1669bbccc74c1a37d2 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am eb69ddd4: am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eb69ddd4db1f1a421f1d27e1d42d557f0897f08e':
eb69ddd4db1f1a421f1d27e1d42d557f0897f08e 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am c2e35f33: (-s ours) am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c2e35f33ae6a31d4420672ad4dad46ca297c0db7':
c2e35f33ae6a31d4420672ad4dad46ca297c0db7 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> am 932e8e5d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '932e8e5dacd4e154d5c7b94f396a4d32de931551':
932e8e5dacd4e154d5c7b94f396a4d32de931551 11-Mar-2013 Jean-Baptiste Queru <jbq@google.com> Reconcile with jb-mr1-release - do not merge
01fdbd3285be1a8ba2143a4bc11a0f5065bb68d0 10-May-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Fix IntRangeManager

-Fix to populate SmsBroadcastConfigInfo list with all the possible
range lists upon enable and disable to match previous implementation.
-Fix ClientRange to be ordered by start id, then by end id.
-Fix enableRange to handle missing cases:
-enable exact same range, i.e. new [x, y], existing [x, y]
-enable range that is already enclosed in existing range i.e.
adding [3, 3] to existing range [1,3]
-enable (startId -1) == range.endId, i.e. new [3, y] existing [1, 2]
-Fix where range.endId is not updated correctly
-Fix disableRange to first update mRange then call updateRange.
-Add more unit test cases.

Bug: 8355035
Change-Id: I83308c76ed28c6f753326aeaac6bec1d88c01b39
rc/java/com/android/internal/telephony/IntRangeManager.java
ests/telephonytests/src/com/android/internal/telephony/IntRangeManagerTest.java
5a176f73dbb2bff2ca8b8f86af86a17be6863b87 11-Mar-2013 Wink Saville <wink@google.com> Merge commit '958e7316' into fix-merge-conflict

* commit '958e7316':
Telephony: Set TP-RD to 1 in case of retry

Change-Id: I298e588b1076686e2c7c4b3714b46d2637b04079
958e731633ccc639f78b9842abd833794173ce6d 11-Mar-2013 Wink Saville <wink@google.com> Merge "Telephony: Set TP-RD to 1 in case of retry"
454c5783e7695feec276325920550b2d4dcc3e16 07-Jun-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Set TP-RD to 1 in case of retry

per TS 23.040 Section 9.2.3.6: In the case where no response or an
RP-ERROR with an appropriate cause value (see 3GPP TS 24.011 [13]) is
received in response to an SMS-SUBMIT, then the MS shall automatically
repeat the SMS-SUBMIT but must use the same TP-MR value
and set the TP-RD bit to 1 (see 9.2.3.25)

Bug: 8323645
Change-Id: I1c7ebc67f80a6eeba456ab0dc5f6331a038d7ab2
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
6c5e8c9ef98f3ef8f87e4a5c06f730cf7d0c1536 06-Mar-2013 Wink Saville <wink@google.com> am 5779b57f: Merge "Send user confirmation instead of Terminal Response"

* commit '5779b57fe7530dfca8d814be0cbd13c7bad5d643':
Send user confirmation instead of Terminal Response
a6aedcd548ee25f4df9d86ae94eec8b2a0b61f5a 06-Mar-2013 Wink Saville <wink@google.com> Merge commit '63a6a12c' into fix-merge-conflict

* commit '63a6a12c':
Telephony: Fix for first pause DTMF digit

Change-Id: I345e0e32d8230c16c28c953de5848cd095438e34
5779b57fe7530dfca8d814be0cbd13c7bad5d643 06-Mar-2013 Wink Saville <wink@google.com> Merge "Send user confirmation instead of Terminal Response"
63a6a12c294dce9d95534d3dddf779d639a13e29 06-Mar-2013 Wink Saville <wink@google.com> Merge "Telephony: Fix for first pause DTMF digit"
37d3599e3fd89987da444ba971df98516d2ea3f5 21-Dec-2010 Shruthi Krishnan <shruthink@codeaurora.org> Telephony: Fix for first pause DTMF digit

As per 3GPP requirement first pause sequence also should maintain 3 sec
delay. Added fix to wait for 3 sec time before sending DTMF digits to
RIL.

Change-Id: I6041614b544cc9c24521bee9ad505439b810ff86
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
14957f5b0b202fc80782944c962d282ed1866837 15-Jan-2013 Abhishek Adappa <aadappa@codeaurora.org> Send user confirmation instead of Terminal Response

On certain proactive commands like Setup Call/Open Channel,
a confirmation dialog is displayed to the user to confirm or reject the
call. If the user hits the back key to dismiss the dialog or the user
hits 'No', consider that as the user rejecting the call, instead
of sending a Terminal Response.

Bug: 8302972
Change-Id: I23d57f726018a6805ef455f6069dbab8e6dd14f0
rc/java/com/android/internal/telephony/cat/CatService.java
f1b97fcff40f829cafd2fa643e8e4b788e504614 05-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Send Power-off notifications

If we update the state of the old servicestate and the new before calling done
nothing will get sent out (no change). Instead, just put the new state
in the mNewSS and call done - it'll copy it to mSS and note the diff and
notify everyone.

bug:8304092
Change-Id: I5fee4805245c547175bbd8b0e18f407edfc8c3d8
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
2f837b8058eba0bc59e983c67efbc00cd9a80eee 07-Feb-2013 Hyejin Kim <hyejin.kim@lge.com> get group identifier level1 (Gid1)

To recognize MVNO(Mobile Virtual Network Operator), need some filters,
Service Provider Name(SPN), International Mobile Subscriber ID(IMSI),
and Group Identifier Level1(Gid1).
The GID1 elementary files on the SIM are specified in GSM 11.11 (ETS 300 977)

To get Gid1, implement it.

Bug: 8143480
Change-Id: I44f9d622240a73c42ea6418d2d55e1dae23f3b81
rc/java/com/android/internal/telephony/uicc/IccConstants.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/SIMFileHandler.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
rc/java/com/android/internal/telephony/uicc/UsimFileHandler.java
cbd0db26545a7c83896b976f21d20a30bdd6438e 28-Feb-2013 Wink Saville <wink@google.com> am a6577f4b: Merge "Telephony: Return \'null\' when SubscriberId and Line1Number are unavailable"

* commit 'a6577f4b162c9f6d8084e19a6cc5792cf52e4872':
Telephony: Return 'null' when SubscriberId and Line1Number are unavailable
a6577f4b162c9f6d8084e19a6cc5792cf52e4872 28-Feb-2013 Wink Saville <wink@google.com> Merge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"
4b048b326272496b8bd6932173041280bc22c8dc 25-Jul-2012 Abhishek Adappa <aadappa@codeaurora.org> Telephony: Return 'null' when SubscriberId and Line1Number are unavailable

Return 'null' instead of "" (empty string) when Subscriber Id and
Line1Number are unavailable. This confirms to the definition of the
public API.

Bug: 8284793
Change-Id: Ie6395623cf413d51f6e10316aded71e2eaf5592c
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
6b8619728cc727e402efabd57efa22503707cdf1 27-Feb-2013 Elliott Hughes <enh@google.com> am 22c3bbde: Merge "Fix build."

* commit '22c3bbde1128029c4d4e6fe34ee0b56f530629ac':
Fix build.
e452cb2aa9236ebecb090e03a469fa68aef8d497 27-Feb-2013 Elliott Hughes <enh@google.com> Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

(cherry-pick of 96c87e2f014207dc5c55f7c8fafd1e666080d784.)

Change-Id: I52f8b3eb6e5183ba486a68820c7c3af3863ffdb5
rc/java/com/android/internal/telephony/MccTable.java
22c3bbde1128029c4d4e6fe34ee0b56f530629ac 27-Feb-2013 Elliott Hughes <enh@google.com> Merge "Fix build."
96c87e2f014207dc5c55f7c8fafd1e666080d784 27-Feb-2013 Elliott Hughes <enh@google.com> Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

Change-Id: Ia44bc852cd7f65466a97e815e3289a61ee22cb0f
rc/java/com/android/internal/telephony/MccTable.java
cfbca8ec2141b4c16d4f39d6452bac98ffd0bd03 26-Feb-2013 Wink Saville <wink@google.com> Merge commit 'b575731e' into fix-merge-conflict

* commit 'b575731e':
Update PS state when radio off or unavailable

Change-Id: I87d25d297ef455763d20b2f9b6cad920514a4f05
b575731e4aa3fb4ea361173e72c387574ae779a6 26-Feb-2013 Wink Saville <wink@google.com> Merge "Update PS state when radio off or unavailable"
f1911ab88b20323cd0e4d005d7913f2df992f158 06-Sep-2012 Ye Jingjing <jingjing.ye@sonymobile.com> Update PS state when radio off or unavailable

When radio off or unavailable, CS state has been reset,
but PS state has not updated, in fact both CS and PS
state should be out of service. So SMS will try to be
sent out when sending sms, the result is "could not send"
rather than sms being queued for sending.
This fix will reset PS state to power off or out of
service when radio off or unavailable accordingly.

Bug: 8265430
Change-Id: I46e962c30021ff1273dcc559579bdedc7f432a64
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
22d85a8e3a575a6d01d2c788587971657dfe20c6 23-Feb-2013 Wink Saville <wink@google.com> Clean up member variables.

Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6
rc/java/com/android/internal/telephony/ATResponseParser.java
rc/java/com/android/internal/telephony/Call.java
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/CallTracker.java
rc/java/com/android/internal/telephony/CommandException.java
rc/java/com/android/internal/telephony/Connection.java
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IntRangeManager.java
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/OperatorInfo.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneSubInfoProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/SmsMessageBase.java
rc/java/com/android/internal/telephony/SmsResponse.java
rc/java/com/android/internal/telephony/SmsStorageMonitor.java
rc/java/com/android/internal/telephony/UUSInfo.java
rc/java/com/android/internal/telephony/WspTypeDecoder.java
rc/java/com/android/internal/telephony/cat/CatCmdMessage.java
rc/java/com/android/internal/telephony/cat/CatResponseMessage.java
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/CommandParams.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cat/ImageDescriptor.java
rc/java/com/android/internal/telephony/cat/ResponseData.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCall.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
rc/java/com/android/internal/telephony/cdma/EriInfo.java
rc/java/com/android/internal/telephony/cdma/EriManager.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SignalToneUtil.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/dataconnection/ApnSetting.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionBase.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTrackerBase.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCall.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimTlv.java
rc/java/com/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
rc/java/com/android/internal/telephony/gsm/SmsCbHeader.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
rc/java/com/android/internal/telephony/sip/SipCallBase.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/test/ModelInterpreter.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
rc/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
rc/java/com/android/internal/telephony/uicc/AdnRecord.java
rc/java/com/android/internal/telephony/uicc/AdnRecordCache.java
rc/java/com/android/internal/telephony/uicc/AdnRecordLoader.java
rc/java/com/android/internal/telephony/uicc/IccCardProxy.java
rc/java/com/android/internal/telephony/uicc/IccFileHandler.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
rc/java/com/android/internal/telephony/uicc/SpnOverride.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java
cbaa45bbf2cab852b6c9c3a887e9f803d4e857ea 23-Feb-2013 Wink Saville <wink@google.com> Clean up

- Add @Overrides where needed.
- Update javadoc comments
- Remove extra semi-colons
- Rename DataConnection.java to DataConnectionBase.java
- Rename GsmDataConnection.java to DataConnection.java
- Add defaults to switch statements
- Remove/fix most "if (false)" statements. Fixed by using a CONSTANT
- Fix hidden variables by hoisting to base class or renaming
- Tweak some debug output

Change-Id: If38de2fdeaacafbf40cdfd7f84dc5c52030ba2a3
rc/java/android/provider/Telephony.java
rc/java/android/telephony/CellBroadcastMessage.java
rc/java/android/telephony/SmsCbCmasInfo.java
rc/java/android/telephony/SmsCbEtwsInfo.java
rc/java/android/telephony/SmsCbLocation.java
rc/java/android/telephony/SmsMessage.java
rc/java/android/telephony/gsm/SmsManager.java
rc/java/android/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/Call.java
rc/java/com/android/internal/telephony/CallForwardInfo.java
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/CallTracker.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/Connection.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/DefaultPhoneNotifier.java
rc/java/com/android/internal/telephony/DriverCall.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccUtils.java
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/OperatorInfo.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/PhoneSubInfoProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/RestrictedState.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/SmsMessageBase.java
rc/java/com/android/internal/telephony/SmsResponse.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
rc/java/com/android/internal/telephony/TelephonyCapabilities.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/cat/CatCmdMessage.java
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/CommandDetails.java
rc/java/com/android/internal/telephony/cat/CommandParams.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
rc/java/com/android/internal/telephony/cat/Duration.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cat/Input.java
rc/java/com/android/internal/telephony/cat/Item.java
rc/java/com/android/internal/telephony/cat/Menu.java
rc/java/com/android/internal/telephony/cat/ResultCode.java
rc/java/com/android/internal/telephony/cat/ResultException.java
rc/java/com/android/internal/telephony/cat/TextMessage.java
rc/java/com/android/internal/telephony/cat/Tone.java
rc/java/com/android/internal/telephony/cat/ToneSettings.java
rc/java/com/android/internal/telephony/cat/ValueParser.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCall.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
rc/java/com/android/internal/telephony/cdma/EriManager.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SignalToneUtil.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/TtyIntent.java
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/ApnSetting.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionAc.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionBase.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTrackerBase.java
rc/java/com/android/internal/telephony/dataconnection/GsmDataConnection.java
rc/java/com/android/internal/telephony/dataconnection/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCall.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmSmsAddress.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/SuppServiceNotification.java
rc/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
rc/java/com/android/internal/telephony/sip/SipCallBase.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/test/ModelInterpreter.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
rc/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
rc/java/com/android/internal/telephony/uicc/AdnRecord.java
rc/java/com/android/internal/telephony/uicc/AdnRecordCache.java
rc/java/com/android/internal/telephony/uicc/AdnRecordLoader.java
rc/java/com/android/internal/telephony/uicc/CsimFileHandler.java
rc/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java
rc/java/com/android/internal/telephony/uicc/IccCardProxy.java
rc/java/com/android/internal/telephony/uicc/IccCardStatus.java
rc/java/com/android/internal/telephony/uicc/IccFileHandler.java
rc/java/com/android/internal/telephony/uicc/IccIoResult.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/IccServiceTable.java
rc/java/com/android/internal/telephony/uicc/IccUtils.java
rc/java/com/android/internal/telephony/uicc/IsimFileHandler.java
rc/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
rc/java/com/android/internal/telephony/uicc/RuimFileHandler.java
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMFileHandler.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
rc/java/com/android/internal/telephony/uicc/SpnOverride.java
rc/java/com/android/internal/telephony/uicc/UiccCard.java
rc/java/com/android/internal/telephony/uicc/UiccCardApplication.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
rc/java/com/android/internal/telephony/uicc/UsimFileHandler.java
rc/java/com/android/internal/telephony/uicc/VoiceMailConstants.java
4918296afe1c667e9523cdfc799f558f7ebc2bfb 21-Feb-2013 Wink Saville <wink@google.com> Move DataConnection related classes to their own package.

Change-Id: I34ee9e87545e6b15ebf4d3ec101d4ed3d322f7b2
leanSpec.mk
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/ApnSetting.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/DataConnectionAc.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/dataconnection/ApnContext.java
rc/java/com/android/internal/telephony/dataconnection/ApnSetting.java
rc/java/com/android/internal/telephony/dataconnection/DataConnection.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionAc.java
rc/java/com/android/internal/telephony/dataconnection/DataConnectionTracker.java
rc/java/com/android/internal/telephony/dataconnection/GsmDataConnection.java
rc/java/com/android/internal/telephony/dataconnection/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
9f88c3516ba5e76d1fe55c2acd2bd5714b136b34 20-Feb-2013 Wink Saville <wink@google.com> am de707749: Merge "Telephony: Update Permanent Fail and Event Loggable Types"

* commit 'de70774912571d7e2d9de627a91df933b2d5f3c1':
Telephony: Update Permanent Fail and Event Loggable Types
de70774912571d7e2d9de627a91df933b2d5f3c1 20-Feb-2013 Wink Saville <wink@google.com> Merge "Telephony: Update Permanent Fail and Event Loggable Types"
0c5d5ba2a162f605a1381cca9fc21ac315ad77ec 05-Sep-2012 Chris Lei <chrislei@codeaurora.org> Telephony: Update Permanent Fail and Event Loggable Types

- Updating isPermanentFail() and isEventLoggable() to better
comply with "no retry" requirements in ril.h

Change-Id: I377eba7ec0203e41ae7689192a41f6b260a8775a
rc/java/com/android/internal/telephony/DataConnection.java
5aea02dbc2d1e743bd181a7db96625b5055ce633 13-Feb-2013 Wink Saville <wink@google.com> Merge "Partial fix for b8022095"
ce28277047b055d8420384f018ff4517c41ea1df 13-Feb-2013 Jake Hamby <jhamby@google.com> am 64f509b2: Merge "Fix for storing CPHS MWI messages with store type"

# By Björn Ekberg
# Via Gerrit Code Review (1) and Zoran Jovanovic (1)
* commit '64f509b256eccf899910a449857b095aa2cbc714':
Fix for storing CPHS MWI messages with store type
64f509b256eccf899910a449857b095aa2cbc714 12-Feb-2013 Jake Hamby <jhamby@google.com> Merge "Fix for storing CPHS MWI messages with store type"
e65a7cd00bf0022cfe24537371be78e4492636b8 12-Feb-2013 Wink Saville <wink@google.com> Partial fix for b8022095

With the changes to the DC the list of ApnContexts is cleared when
a DC disconnects. So the connectionId is invalid, instead send the
APN type information which fixes this retry problem.

A larger fix is coming where retries are done in DC but this will help
for now.

Bug: 8022095
Change-Id: I7364d1108c4be853a9d711eb8771d05a7640fe19
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
945e169166e9fd4bcb145d23dffb7c7b68cd6208 15-Aug-2012 Björn Ekberg <bjorn.ekberg.x@sonymobile.com> Fix for storing CPHS MWI messages with store type

CPHS MWI messages of store type were treated as discard type.
This resulted in that no CPHS MWI messages with text was ever
shown to the user.

Change-Id: I42f80a084c35a813933052d4a676e16b2c4e2d9d
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
8d3dfb1ac5e12b2c0a0ec50db956c8b47fcc102f 12-Feb-2013 Wink Saville <wink@google.com> Tweak LogRecord logging.

Change-Id: If948c1cdf4701c09550bd57212b9936fca6cb664
rc/java/com/android/internal/telephony/DataConnection.java
a2ccc4f16ec2f3e26b308d6f25cd4aa6a394a008 09-Feb-2013 Jake Hamby <jhamby@google.com> Add bounds checking for decoding CDMA SMS using Shift-JIS.

The test case testRandomUserData() in CdmaSmsCbTest fails since we
added support for decoding Shift-JIS messages. Change decodeShiftJis()
to call the helper method decodeCharset(), which checks the array
bounds and tries to decode as much as possible if the length extends
past the end of the PDU, instead of throwing
StringIndexOutOfBoundsException.

Bug: 8107987
Change-Id: I180e8360e391cd8276752a44a58a9c3a635dc284
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
91187d41b202273075a302a4fd4f8df719b5dee0 09-Feb-2013 Jake Hamby <jhamby@google.com> Fix test case broken by change to ISms method signature.

A recent change to move ISms.aidl from frameworks/opt/telephony to
frameworks/base caused this test case not to compile. Fixed the caller
to add the new argument containing the package name of the caller.

Bug: 8107987
Change-Id: I2b1acefbfe0588a940a506f891077b00fa026d2d
ests/telephonytests/src/com/android/internal/telephony/SimSmsTest.java
48a57c9ac6516c0f34a9593d6ffd64173fdf6953 10-Jan-2013 Jake Hamby <jhamby@google.com> Add frameworks-telephony test cases for CDMA SMS.

Add test cases to verify support for Shift-JIS encoding/decoding
for CDMA SMS BearerData. Also test whether reserved bearer data
subparameters are properly skipped.

$ runtest -c com.android.internal.telephony.cdma.sms.CdmaSmsTest \
frameworks-telephony

The original version of this patch did not merge from AOSP to the
internal tree because of changes to mock RIL files that have been
removed. This patch contains only the change to CdmaSmsTest.java.

Change-Id: Ib51d99c73c636467b970327e5c6af2d6a289c651
ests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
1c81e1353dc3ccc8347f65c424a993b7648b2808 08-Feb-2013 Wink Saville <wink@google.com> Merge "Move a few files from frameworks/opt/telephony to frameworks/base."
a78a6aaffa5e3e13ca617bb1f114e1c31ff7c7af 08-Feb-2013 Wink Saville <wink@google.com> Move a few files from frameworks/opt/telephony to frameworks/base.

Because ISms.aidl imports PendingIntent we couldn't easily
make opt/telephony part of the PDK. So this change moves
ISms.aidl and SmsRawData.*, which ISms.aidl also imports,
back to frameworks/base.

Change-Id: Ia64c6e771d5a292d9bfebb413a43f3745df55c85
leanSpec.mk
rc/java/com/android/internal/telephony/ISms.aidl
rc/java/com/android/internal/telephony/SmsRawData.aidl
rc/java/com/android/internal/telephony/SmsRawData.java
e4dbb0bdbbfc3155171c0ca9fbbb8d1177fa2886 07-Feb-2013 Jeff Sharkey <jsharkey@android.com> Merge "Use TCP interface statistics for data stall."
a869bfaecddd0a5772cdcd84c992be315f45eb69 06-Feb-2013 Wink Saville <wink@google.com> am c95d086f: am fc354419: Merge "Telephony: Fix NPE in CdmaConnection"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and others
* commit 'c95d086fdaac610430b69b4b19914cb24e49f308':
Telephony: Fix NPE in CdmaConnection
c95d086fdaac610430b69b4b19914cb24e49f308 06-Feb-2013 Wink Saville <wink@google.com> am fc354419: Merge "Telephony: Fix NPE in CdmaConnection"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and Gerrit Code Review (1)
* commit 'fc354419d48b1ded8ce951670c4069780f22e273':
Telephony: Fix NPE in CdmaConnection
fc354419d48b1ded8ce951670c4069780f22e273 06-Feb-2013 Wink Saville <wink@google.com> Merge "Telephony: Fix NPE in CdmaConnection"
a914a2429cb352f1f294e15dc236b3721e81a823 06-Feb-2013 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix NPE in CdmaConnection

When card is removed and call gets terminated
getUiccCardApplication will return null

Change-Id: Ic861e5b5ee8515de431c33152fd11d2c45a2a353
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
db9c8ee5f0c88306063fcbbbc430cb5e2e894e21 06-Feb-2013 Jeff Sharkey <jsharkey@android.com> Use TCP interface statistics for data stall.

Bug: 7903145
Change-Id: Ia90ba964a26ded119ac0394b719b567fb9971caf
rc/java/com/android/internal/telephony/DataConnectionTracker.java
7fce994eb223105829becb6c26e3af7a9739752c 05-Feb-2013 Dianne Hackborn <hackbod@google.com> Add new app ops for sending/receiving SMS messages.

There are a variety of new app ops for various kind of
SMS operations: reading, writing, sending, receiving, on
ICC card, MMS, etc. These are instrumented in the telephony
framework; the controls for access to these features are
rolled up to either sending or receiving SMS.

Change-Id: Ie18b09d77fac555aaa169eb6fdfba44dd8078976
rc/java/android/telephony/SmsManager.java
rc/java/com/android/internal/telephony/ISms.aidl
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
6387253f9b0eb8bec049115498ec1f2bfd6d991d 05-Feb-2013 Jake Hamby <jhamby@google.com> am 9eef81ce: am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '9eef81ce80e72d68a8349fd84797276cb9cbe957':
Telephony: Define enable/disable APIs for Cdma CMAS
8509a1c89cdce84a30ba56775942c2d46fe6b193 05-Feb-2013 Wink Saville <wink@google.com> Merge "Fix some broken tests."
9eef81ce80e72d68a8349fd84797276cb9cbe957 05-Feb-2013 Jake Hamby <jhamby@google.com> am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

# By Rika Brooks
# Via Gerrit Code Review (1) and Rika Brooks (1)
* commit '895586961de9992a4feefc57b648e01d158a382c':
Telephony: Define enable/disable APIs for Cdma CMAS
895586961de9992a4feefc57b648e01d158a382c 04-Feb-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
a63f55cf17629426d976830429a7612387532195 24-Jul-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Define enable/disable APIs for Cdma CMAS

- Define enableCellBroadcastRange, disableCellBroadcastRange,
enableCellBroadcast, disableCellBroadcast for Cdma broadcast.
Create CdmaBroadcastRangeManager extended from existing IntRangeManager.

Change-Id: I5d70175862547475f49e08328ab3dcc5560e9096
rc/java/android/telephony/SmsManager.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/ISms.aidl
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/cdma/CdmaSmsBroadcastConfigInfo.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
38407d756e6b448de5adf2c0789d7469f48a345c 03-Feb-2013 Wink Saville <wink@google.com> Cleanstep for SmsRawData.

Change-Id: Ic3ae3a501a733508808866494b3bca0fcc819f3e
leanSpec.mk
17382a60400f4a067d15bf3fbd98bd865b73c8e5 01-Feb-2013 Wink Saville <wink@google.com> Move SmsRawData.aidl to opt/telephony.

Change-Id: I31810a667cb2c987d4a7687a825ae6da06d8e59a
rc/java/com/android/internal/telephony/SmsRawData.aidl
79555c93820b5159b25c01fff47d16fe623ce866 31-Jan-2013 Wink Saville <wink@google.com> Fix some broken tests.

Change-Id: I10d48c6597bb0c45d70a6a2d77a0afb9d295568d
ests/telephonytests/Android.mk
ests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
ests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java
babd5ede15dfced63fc5bf5a522634fd85e3e0f1 31-Jan-2013 Wink Saville <wink@google.com> am 6943a913: am 5dcd8d72: Merge "Fix failed test case when running framework auto test."

# By xiaohui wang
# Via Android Git Automerger (1) and others
* commit '6943a913f8bb044f40f94a933c1e2b24e103f59a':
Fix failed test case when running framework auto test.
6943a913f8bb044f40f94a933c1e2b24e103f59a 31-Jan-2013 Wink Saville <wink@google.com> am 5dcd8d72: Merge "Fix failed test case when running framework auto test."

# By xiaohui wang
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '5dcd8d72466272a5773bbfac251884c8e7a4300c':
Fix failed test case when running framework auto test.
5dcd8d72466272a5773bbfac251884c8e7a4300c 31-Jan-2013 Wink Saville <wink@google.com> Merge "Fix failed test case when running framework auto test."
0577de49f739f113f6e07d5539defc8d48232282 30-Jan-2013 xiaohui wang <xiaohui.wang@sonymobile.com> Fix failed test case when running framework auto test.

The method RetryManager.setRetryCount was modified in
f186b07b463447707117e2b54fc02f7ed30d6e43, However the
corresponding test cases were not updated and now fail.

The reason for failing is that setRetryCount no longer resets
the variable mRetryForever as it used to, and therefore
isRetryNeeded() returns true instead of false failing the
testcases.

Change-Id: Icbf23ada8000fab93ee34087e125d9b12d7e7897
ests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java
d79e9ba251e2e3acb2e679e52514b6f238d50cd0 29-Jan-2013 Wink Saville <wink@google.com> Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip

Change-Id: Ieaba759a0f69b45c4b8839cbed1fe757cdf190c5
ndroid.mk
a98defd468473ca430b298df0fc9bbe845088bc1 28-Jan-2013 Wink Saville <wink@google.com> Merge "Add protected log methods to StateMachine"
9e2a8da44a5fe14036950ad9a66b1b4c1ffdf344 28-Jan-2013 Wink Saville <wink@google.com> am 30f92450: am 69c5b8c7: Merge "Send correct screen state when radio available."

# By Bin Li
# Via Android Git Automerger (1) and others
* commit '30f92450d53443505ac1fa70138ddd55c91032bc':
Send correct screen state when radio available.
30f92450d53443505ac1fa70138ddd55c91032bc 28-Jan-2013 Wink Saville <wink@google.com> am 69c5b8c7: Merge "Send correct screen state when radio available."

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '69c5b8c7c41614d0d5fc131a9f26c403a9d30de0':
Send correct screen state when radio available.
69c5b8c7c41614d0d5fc131a9f26c403a9d30de0 28-Jan-2013 Wink Saville <wink@google.com> Merge "Send correct screen state when radio available."
c51e5b85def45b8214c522152fb43c409b940a02 28-Jan-2013 Wink Saville <wink@google.com> Add protected log methods to StateMachine

This allow child classes to Override the logging and
have consistent behavior across StateMachines.

Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
02a6fcee7a8e19904c53ce29c647383186b8285e 26-Jan-2013 Wink Saville <wink@google.com> am 9af36163: am 5b5a06f5: Merge "Telephony: Don\'t start RilReceiver when not needed"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and others
* commit '9af361639d89aa20748ce9e8e3d55c97e7f6b632':
Telephony: Don't start RilReceiver when not needed
6fd7b2c812a09d8bb4ffd7cfa48c570129cf4ca6 26-Jan-2013 Wink Saville <wink@google.com> am 7b3c1c39: am 44c9723a: Merge "Telephony: Mark SIM SMS as read after importing it"

# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '7b3c1c394ebb53ab6861dfc66f4326eccbcda133':
Telephony: Mark SIM SMS as read after importing it
9af361639d89aa20748ce9e8e3d55c97e7f6b632 25-Jan-2013 Wink Saville <wink@google.com> am 5b5a06f5: Merge "Telephony: Don\'t start RilReceiver when not needed"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and Gerrit Code Review (1)
* commit '5b5a06f5d63561411d04d70900b55af23c44ef10':
Telephony: Don't start RilReceiver when not needed
5b5a06f5d63561411d04d70900b55af23c44ef10 25-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Don't start RilReceiver when not needed"
c241cad754ecf27c96b09f1e585b8be341dfcb71 06-Jun-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Don't start RilReceiver when not needed

Basebandless targets don't need RilReceiver.

Change-Id: I510cc6f0100219af9479738fc4b48c7ab85ea666
CRs-Fixed: 367918
rc/java/com/android/internal/telephony/RIL.java
98437235fc30d809992c32410f02d22cc89fac8c 19-Nov-2011 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Null check for adncache before search/update.

Sometimes adncache is uninitialized leading to exceptions.
Add checking against null before using it for searching or updating
records.

Change-Id: I5b6787ce917db921d1ee35753acf890dfaf169b7
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
7b3c1c394ebb53ab6861dfc66f4326eccbcda133 24-Jan-2013 Wink Saville <wink@google.com> am 44c9723a: Merge "Telephony: Mark SIM SMS as read after importing it"

# By Rika Brooks
# Via Gerrit Code Review (1) and Rika Brooks (1)
* commit '44c9723a49d352a8bcf3051eeb1885c80fb20e44':
Telephony: Mark SIM SMS as read after importing it
44c9723a49d352a8bcf3051eeb1885c80fb20e44 24-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Mark SIM SMS as read after importing it"
cf57b29a755b0249da687201bcc726941d37d42b 23-Jan-2013 Bin Li <libin@marvell.com> Send correct screen state when radio available.

Change-Id: I098ffd06916d9d37272ee3c8c57a4d7e21e564c6
Signed-off-by: Bin Li <libin@marvell.com>
rc/java/com/android/internal/telephony/RIL.java
4a001e3bc9735735f33fe8d05f7abd3b3a567680 24-Jan-2013 Wink Saville <wink@google.com> am 0a4672f6: am c09d9845: Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"

# By Maunik Shah
# Via Android Git Automerger (1) and others
* commit '0a4672f6a60f5485dea4f8fd365afad113ef4c93':
Fixes Binder Buffer leak after crashing com.android.smspush process
5a8b17dc4ae580d78b048c5e4ce434a1bdb38f10 24-Jan-2013 Wink Saville <wink@google.com> am 581e4fbe: am 36001ade: Merge "Reset data stall watch dog after doing recovery"

# By Bin Li
# Via Android Git Automerger (1) and others
* commit '581e4fbefde83b2deaa9f2cb555d6bed8153209e':
Reset data stall watch dog after doing recovery
0a4672f6a60f5485dea4f8fd365afad113ef4c93 24-Jan-2013 Wink Saville <wink@google.com> am c09d9845: Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"

# By Maunik Shah
# Via Gerrit Code Review (1) and Maunik Shah (1)
* commit 'c09d9845ab719c8224d3f2c610a612bf9489bc6e':
Fixes Binder Buffer leak after crashing com.android.smspush process
581e4fbefde83b2deaa9f2cb555d6bed8153209e 24-Jan-2013 Wink Saville <wink@google.com> am 36001ade: Merge "Reset data stall watch dog after doing recovery"

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '36001adedf90a3a0077d36b869822643ae01ad1b':
Reset data stall watch dog after doing recovery
c09d9845ab719c8224d3f2c610a612bf9489bc6e 24-Jan-2013 Wink Saville <wink@google.com> Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"
36001adedf90a3a0077d36b869822643ae01ad1b 24-Jan-2013 Wink Saville <wink@google.com> Merge "Reset data stall watch dog after doing recovery"
8cabd3092c961f4593e3f52796b118bbd353b99f 24-Jan-2013 Wink Saville <wink@google.com> am 5eee6bd8: am 57516407: Merge "Telephony: Correct the typo in RIL.java"

# By Jiju Kinattingal
# Via Android Git Automerger (1) and others
* commit '5eee6bd8b452dcb328d3121d6f7fa8a819a5bc7a':
Telephony: Correct the typo in RIL.java
5eee6bd8b452dcb328d3121d6f7fa8a819a5bc7a 24-Jan-2013 Wink Saville <wink@google.com> am 57516407: Merge "Telephony: Correct the typo in RIL.java"

# By Jiju Kinattingal
# Via Gerrit Code Review (1) and Jiju Kinattingal (1)
* commit '575164076e184002a8545dffa5056d38f07639c2':
Telephony: Correct the typo in RIL.java
575164076e184002a8545dffa5056d38f07639c2 23-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Correct the typo in RIL.java"
e0c9d5eb0a21b1ddd0560cfb358288c029031969 23-Jan-2013 Wink Saville <wink@google.com> am 4fd4011e: am ef5afe19: Merge "Interprete mmi code *21*num# as registration."

* commit '4fd4011e9fd3903f76a0ddcc35798d435aa345aa':
Interprete mmi code *21*num# as registration.
4fd4011e9fd3903f76a0ddcc35798d435aa345aa 23-Jan-2013 Wink Saville <wink@google.com> am ef5afe19: Merge "Interprete mmi code *21*num# as registration."

* commit 'ef5afe19131035ef5b359096f1ef64f9a55795d9':
Interprete mmi code *21*num# as registration.
ef5afe19131035ef5b359096f1ef64f9a55795d9 23-Jan-2013 Wink Saville <wink@google.com> Merge "Interprete mmi code *21*num# as registration."
5f6b9345f8fe5545f576d29fb7ff9f3405d9dc05 23-Jan-2013 Bin Li <libin@marvell.com> Interprete mmi code *21*num# as registration.

Per 3GPP TS 22.030 6.5.2

A call forwarding request with a singel * would
be interpreted as registration if containing a
forwarded-to number, or an activation if not.

Change-Id: Iaf5754e49454819892fe054938ef8819f759d6bd
Signed-off-by: Bin Li <libin@marvell.com>
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
2d01df4311974279d0967846f850c693f72eca72 23-Jan-2013 Bin Li <libin@marvell.com> Reset data stall watch dog after doing recovery

Without resetting data stall watch dog, one data
stall will lead to radio reset if there is no
data traffic after doing recovery.

Change-Id: Icc7b1e7f160cd0c8910f7132d7c2fea0d29803e5
Signed-off-by: Bin Li <libin@marvell.com>
rc/java/com/android/internal/telephony/DataConnectionTracker.java
f1ac06f0498ec7cb7489c835bcd2eed568b5f6a6 23-Jan-2013 Wink Saville <wink@google.com> Add debug and some cleanup

Change-Id: I866676a1ec4a338dcfe089cbf0483e5e546ded85
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
b08797967cd0f314d8df940ecbee13ddeb3f15c4 22-Jan-2013 Wink Saville <wink@google.com> Merge "Add some debug."
072d5d580041046968dbc335c5d4418f344d2b39 22-Nov-2012 Maunik Shah <mshah@codeaurora.org> Fixes Binder Buffer leak after crashing com.android.smspush process

After many crashes of com.android.smspush process under low memory
condition, binder buffer used to get overflow as there is a leak
in buffer.
This fix restricts the leak in binder buffer by unbinding it upon
com.android.smspush process crash.

Change-Id: I0b5cd4ef282ec9f12693337001c084ce60db4555
rc/java/com/android/internal/telephony/WapPushOverSms.java
ebc3f0565ad0f9b8b7d3531afd8744843d96aadb 23-Aug-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Mark SIM SMS as read after importing it

The GCF test case 8.2.2 checks if the status byte of the SMS is marked as read
after reading the SMS from SIM. The status byte is marked as read after the
SMS is imported from the SIM if it is not already marked.
Fix to check for null IccFilehandler which can happen if card is not present.

Extract common functions from Sim/RuimSmsInterfaceManager to their parent
class IccSmsInterfaceManager.

Change-Id: I4f226bc873786904527d7d822a67dfc14f05a327
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
d04a0db0a9363d0a3681d39511f0e8efd1e8b172 17-Jan-2013 Wink Saville <wink@google.com> am 2f418724: am 135bf68d: Merge "Wrong terminal response for proactive command length errors"

* commit '2f41872415627ef35399a1f502dbfab01af89d64':
Wrong terminal response for proactive command length errors
2f41872415627ef35399a1f502dbfab01af89d64 17-Jan-2013 Wink Saville <wink@google.com> am 135bf68d: Merge "Wrong terminal response for proactive command length errors"

* commit '135bf68d7638dc5d8524ba84db80e35452772aa1':
Wrong terminal response for proactive command length errors
135bf68d7638dc5d8524ba84db80e35452772aa1 17-Jan-2013 Wink Saville <wink@google.com> Merge "Wrong terminal response for proactive command length errors"
c4d170ec2abcdf94b6242f09734d34a8dd6c5e3c 17-Jan-2013 Wink Saville <wink@google.com> Add some debug.

Bug: 8022095
Change-Id: Ic3f69389b66e6a2ecfa5fe3ae1ce32732355462b
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9edadf11a7ac700a529f49e46822e2983ed551e4 16-Jan-2013 Sanny Shang <sanny.shang@sonymobile.com> Wrong terminal response for proactive command length errors

This fix is at least reported by an internal test suite
written with the 3gpp specification as base, can not
guarantee that it exists "in the wild" however the
specification is clear.

According to 3gpp11.14, chapter 6.10.6 "Length errors",

If the total lengths of the SIMPLE-TLV data objects are not
consistent with the length given in the BER-TLV data object,
then the whole BER-TLV data object shall be rejected. The
result field in the TERMINAL RESPONSE shall have the error
condition "Command data not understood by ME".

Change-Id: I128442ea4755679b0e5524a31c01b3c690e45ab0
rc/java/com/android/internal/telephony/cat/BerTlv.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
e48f50193e1f621e02c1193118511e6eb2cbd662 15-Jan-2013 Wink Saville <wink@google.com> am 4594790b: am 58eafee3: Merge "Telephony: Unregister from UiccController when disposed"

* commit '4594790b7cfc5edb9052622f6f93a4e8b4e50e99':
Telephony: Unregister from UiccController when disposed
4594790b7cfc5edb9052622f6f93a4e8b4e50e99 15-Jan-2013 Wink Saville <wink@google.com> am 58eafee3: Merge "Telephony: Unregister from UiccController when disposed"

* commit '58eafee3bd34563621378d49d8879538c411a7c8':
Telephony: Unregister from UiccController when disposed
58eafee3bd34563621378d49d8879538c411a7c8 15-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Unregister from UiccController when disposed"
c26fb77c4e637466cf0483a4995fe82e6f68b8d3 28-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Unregister from UiccController when disposed

Change-Id: I296d3f292a72d2f8181f866bd1de7637c8333c63
rc/java/com/android/internal/telephony/ServiceStateTracker.java
86087b20a50303c5db59e1f80128f3cf77fb8ffb 14-Jan-2013 Jake Hamby <jhamby@google.com> am ad628b3d: am 367c5f28: Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"

* commit 'ad628b3df8858f9e867ce3ff3214db0983189774':
Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam
ad628b3df8858f9e867ce3ff3214db0983189774 14-Jan-2013 Jake Hamby <jhamby@google.com> am 367c5f28: Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"

* commit '367c5f28da409e05f1c853893512bdf53472c41e':
Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam
367c5f28da409e05f1c853893512bdf53472c41e 14-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"
3de1a7e5535f36e86d82da12df2b17aeeafabdc6 30-Jun-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam

Support Shift-JIS CHARi encoding type per 3GPP2 C.R1001 section 9.1.

3GPP2 C.S0015-B, v2.0, table 4.5-1 shows bearer data subparam ID
above 0x17 is reserved. Fix to skip reserved bearer data subparams
instead of throwing CodingException.

Change-Id: Ib83e7e72189a267421ba5fd77695b8f684ef00e2
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
2f48cebb0f3169da9d9325f7b4884872280599e5 28-Nov-2012 Nizar Haouati <nizar.haouati@intel.com> telephony: Fix typo

This patch fixes the typo in CatService.

Change-Id: Iff69df0ab0309e36f0a886c483f280febe5ad84e
Author: Nizar Haouati <nizar.haouati@intel.com>
Signed-off-by: Nizar Haouati <nizar.haouati@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 71115
rc/java/com/android/internal/telephony/cat/CatService.java
aff4b040b66a3273ede04519d4ab678eecd3eb83 11-Jan-2013 Wink Saville <wink@google.com> am a4e80a44: am 392afa32: Merge "Parameters length is able to be over 127 bytes."

* commit 'a4e80a44f6239926824ea7d50f845d7b74d21710':
Parameters length is able to be over 127 bytes.
5869098e0c615369340bcd1dba2a552f77326a64 11-Jan-2013 Jake Hamby <jhamby@google.com> am a6c35afc: am eabfd15c: Merge "Telephony: Don\'t ack CB messages"

* commit 'a6c35afcc0f346f3be4f1f095351c2859a0d2099':
Telephony: Don't ack CB messages
98cd16eb902d714d6eb981528408d2a5b779e353 11-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 6125afc3 to master

Change-Id: I40f57858d775b91c409532d19ea5c98ec51afb22
a4e80a44f6239926824ea7d50f845d7b74d21710 11-Jan-2013 Wink Saville <wink@google.com> am 392afa32: Merge "Parameters length is able to be over 127 bytes."

* commit '392afa3290831e856edfe16155638879c8218be6':
Parameters length is able to be over 127 bytes.
392afa3290831e856edfe16155638879c8218be6 11-Jan-2013 Wink Saville <wink@google.com> Merge "Parameters length is able to be over 127 bytes."
e72ec3f4031a24982d402bb35a7d17dc1868958d 16-Aug-2012 kyunga1.kim <kyunga1.kim@lge.com> Parameters length is able to be over 127 bytes.

When the received message has user data over 127 bytes,
occur the parse error exception because using readByte().
Therefore we use readUnsignedByte() for reading parameters length.
Signed-off-by: kyunga kim <kyunga1.kim@lge.com>
Change-Id: I195807ee59a0d9117e0d835a4b3c355635337be0
(cherry picked from commit 700e7df9a0ac480e688d37786c0c146d5d1e406d)
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
8750dac3bd5f9d1a6f5222f3dc9e46ee154843eb 11-Jan-2013 Jake Hamby <jhamby@google.com> am 4fd88fb1: am ac57a399: Merge "Telephony: Check SmsTracker\'s mSentIntent for null"

* commit '4fd88fb1daca0336657cf8a40d1c4e573f60f35b':
Telephony: Check SmsTracker's mSentIntent for null
922cbbe2a11ea0a3f92fcc5c22256713c853790b 11-Jan-2013 Jake Hamby <jhamby@google.com> am 2ac296a8: am 713f8792: Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"

* commit '2ac296a87949c75cdc7768cbb25e7bcf8f9d3e5e':
Telephony: Fix decodeCallbackNumber for Cdma CMAS
a6c35afcc0f346f3be4f1f095351c2859a0d2099 10-Jan-2013 Jake Hamby <jhamby@google.com> am eabfd15c: Merge "Telephony: Don\'t ack CB messages"

* commit 'eabfd15c321499201e9d150fe16288c2d43b7787':
Telephony: Don't ack CB messages
6125afc391426c25d6321a31635cf1909aefb3bd 10-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> am dc446013: Merge "Fix mRequestsLists -> mRequestList"

* commit 'dc4460132214aeb1b4767c0225b4595a7ae4a4d4':
Fix mRequestsLists -> mRequestList
eabfd15c321499201e9d150fe16288c2d43b7787 10-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Don't ack CB messages"
dc4460132214aeb1b4767c0225b4595a7ae4a4d4 09-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix mRequestsLists -> mRequestList"
4fd88fb1daca0336657cf8a40d1c4e573f60f35b 09-Jan-2013 Jake Hamby <jhamby@google.com> am ac57a399: Merge "Telephony: Check SmsTracker\'s mSentIntent for null"

* commit 'ac57a399534677ebfcfef530f1529d5d7f3d3c49':
Telephony: Check SmsTracker's mSentIntent for null
ac57a399534677ebfcfef530f1529d5d7f3d3c49 09-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Check SmsTracker's mSentIntent for null"
892e1fecf3c3736c4c04cf219d01034f71307065 09-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Fix mRequestsLists -> mRequestList

first of several fixes.

Change-Id: I362fbfd446aed6714e6c89204ee095d03474c26f
rc/java/com/android/internal/telephony/RIL.java
2ac296a87949c75cdc7768cbb25e7bcf8f9d3e5e 09-Jan-2013 Jake Hamby <jhamby@google.com> am 713f8792: Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"

* commit '713f879213955e734d7b092033797c0f756fd95c':
Telephony: Fix decodeCallbackNumber for Cdma CMAS
5a5f85ce9bffeded7891fd1d480d1f56b0d91041 09-Jan-2013 Wink Saville <wink@google.com> am 08b0eb5c: am cd17a8e5: Merge "Telephony: Update call timer for phantom call"

* commit '08b0eb5c29c54164c8daf7f3eebddc2a8fb6bec7':
Telephony: Update call timer for phantom call
713f879213955e734d7b092033797c0f756fd95c 09-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"
81b046d348dd3d3cba81fcb073b9cdc04fcb6b5c 27-Nov-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> Telephony: Fix issue in handling null alpha identifier

When alpha identifier is a provided by the SIM and
is a null data object, UE should not display
anything about the Sending but UE is showing
"Sending...".

As per 3GPP 11.14, if the alpha identifier is provided
by the SIM and is a null data object(i.e.length = '00'
and no value part), this is an indication that the ME
should not give any information to the user on the fact
that the ME is sending an Send SS/Send USSD/ Send DTMF.

Instead of returning null, retrieveAlphaId returns the
default message resulting in "Sending..." shown to the
user when it is not supposed to display anything.

This patch fixes the issue by returning null when alpha
identifier is provided and is a null data object.

Change-Id: Ia7bd690b8862a5df052a84bd6e7c94f4035baca7
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 60370
rc/java/com/android/internal/telephony/cat/ValueParser.java
08b0eb5c29c54164c8daf7f3eebddc2a8fb6bec7 08-Jan-2013 Wink Saville <wink@google.com> am cd17a8e5: Merge "Telephony: Update call timer for phantom call"

* commit 'cd17a8e56bf5fa1af49d4447e65dc69e4741e7bf':
Telephony: Update call timer for phantom call
cd17a8e56bf5fa1af49d4447e65dc69e4741e7bf 08-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Update call timer for phantom call"
9b41acc443e068fa3c3e547e820f710c6e2297ba 01-Dec-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Update call timer for phantom call

For phantom call, update connectTimeReal via onConnectedInOrOut().
connectTimeReal is used to calculate the call duration per
getDurationMillis().
If phantom call is in HOLDING state, update holdingStartTime via
onStartedHolding(). holdingStartTime is used to calculate hold time
per getHoldDurationMillis().

Change-Id: I716f75b7565b5e869403c48de3dd190e2b425626
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
417929d16da5a403ddd041f9e606a9885e2388c4 04-Jan-2013 Wink Saville <wink@google.com> am c00f8242: am bf358b36: Merge "Telephony: Support for LTE network modes"

* commit 'c00f8242fbb04bd2a0679dfb6284e79f14acfd39':
Telephony: Support for LTE network modes
c00f8242fbb04bd2a0679dfb6284e79f14acfd39 04-Jan-2013 Wink Saville <wink@google.com> am bf358b36: Merge "Telephony: Support for LTE network modes"

* commit 'bf358b3605c3380b7b597506d09ea129e849e1da':
Telephony: Support for LTE network modes
bf358b3605c3380b7b597506d09ea129e849e1da 04-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Support for LTE network modes"
42dee02cee627d94b4b061e5182b07fd85a18de4 04-Jan-2013 Wink Saville <wink@google.com> am 615f8baa: am e1500d9d: Merge "Telephony: Add support for SMS-SUBMIT."

* commit '615f8baa4203f82574e3c9f9bf49ae37d7b07ed9':
Telephony: Add support for SMS-SUBMIT.
615f8baa4203f82574e3c9f9bf49ae37d7b07ed9 04-Jan-2013 Wink Saville <wink@google.com> am e1500d9d: Merge "Telephony: Add support for SMS-SUBMIT."

* commit 'e1500d9d6042ca9e6f4503e82c31bd17997d70a6':
Telephony: Add support for SMS-SUBMIT.
e1500d9d6042ca9e6f4503e82c31bd17997d70a6 04-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Add support for SMS-SUBMIT."
2cbcc15677797f5879cf8c907876b366b034d433 27-Dec-2012 Bin Li <libin@marvell.com> Telephony: Add support for SMS-SUBMIT.

Change-Id: I2b0887ae6b28decb38576cac60f1314ff8b73e1d
Signed-off-by: Bin Li <libin@marvell.com>
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
3ed5b1db90314cdd57ce1a4e9727ef2cd72aa0d0 03-Jan-2013 Wink Saville <wink@google.com> am e99de8eb: am c06ff6ba: Merge "Telephony: add support for additional information"

* commit 'e99de8eba9deaef089e1dd2f838132bd6dd6d3bb':
Telephony: add support for additional information
e99de8eba9deaef089e1dd2f838132bd6dd6d3bb 03-Jan-2013 Wink Saville <wink@google.com> am c06ff6ba: Merge "Telephony: add support for additional information"

* commit 'c06ff6babf825f7215b0c17ddf4edc12a7346698':
Telephony: add support for additional information
c17767c8bd034abdfdebb880077673270c2901dc 02-Jan-2013 Wink Saville <wink@google.com> Merge commit 'eaffd605' into fix-merge-conflict

* commit 'eaffd605':
Telephony: Look for CSS indicator for voice+data

Change-Id: I612effcc253c2c9e07a3b6c82e2832dcd42bda7c
c06ff6babf825f7215b0c17ddf4edc12a7346698 03-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: add support for additional information"
1343b7ae763b3163d03bd9c4756ab4857c4658b2 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Support for LTE network modes

Change-Id: I8833fe3e56c94303f05111a94433b1b9e6568d2f
Depends-On: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
rc/java/com/android/internal/telephony/Phone.java
dac8696ffd9adabba138a0156ac0e2a553070c23 02-Jan-2013 Wink Saville <wink@google.com> am 48a768d6: am aa54f8e0: Merge "Telephony: Add uicc debug info to DebugService"

* commit '48a768d6cff6e13d138cabe7f19d3dc1bf46ec79':
Telephony: Add uicc debug info to DebugService
eaffd6052a556b22cbc84fe54710125ff225370a 02-Jan-2013 Wink Saville <wink@google.com> am ac2f6291: Merge "Telephony: Look for CSS indicator for voice+data"

* commit 'ac2f6291229c09b4e362ec42370544d9e471226e':
Telephony: Look for CSS indicator for voice+data
48a768d6cff6e13d138cabe7f19d3dc1bf46ec79 02-Jan-2013 Wink Saville <wink@google.com> am aa54f8e0: Merge "Telephony: Add uicc debug info to DebugService"

* commit 'aa54f8e0f58fad29d358693e32baa2d1e52f9b70':
Telephony: Add uicc debug info to DebugService
ac2f6291229c09b4e362ec42370544d9e471226e 02-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Look for CSS indicator for voice+data"
aa54f8e0f58fad29d358693e32baa2d1e52f9b70 02-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Add uicc debug info to DebugService"
6c1c6e491ae652d642cfec7ef984b32806c230f8 02-Jan-2013 Wink Saville <wink@google.com> am 4324e5a8: am f9905b7e: Merge "Fix telephony-common build error"

* commit '4324e5a8135b9ba8bb855ec32976c170a755a1ca':
Fix telephony-common build error
4324e5a8135b9ba8bb855ec32976c170a755a1ca 02-Jan-2013 Wink Saville <wink@google.com> am f9905b7e: Merge "Fix telephony-common build error"

* commit 'f9905b7efadf03fd9e0bd06385461ccf0bbeaed1':
Fix telephony-common build error
f9905b7efadf03fd9e0bd06385461ccf0bbeaed1 02-Jan-2013 Wink Saville <wink@google.com> Merge "Fix telephony-common build error"
05ef3b65972826780859b9acbd1fa9580d099832 28-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Add uicc debug info to DebugService

Change-Id: I03be52f97ea84808d608c48b4e6ffa2454e2a67c
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/uicc/IccCardProxy.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
rc/java/com/android/internal/telephony/uicc/UiccCard.java
rc/java/com/android/internal/telephony/uicc/UiccCardApplication.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
74f3eeef7f307a53000887b636c30db2c1339a13 18-Dec-2012 Roger Chen <cxr514033970@gmail.com> Fix telephony-common build error

Build command: make telephony-common

Build error info as below:
make: *** No rule to make target `frameworks/opt/telephony/
src/java/com/android/internal/telephony/AdnRecord.aidl',
needed by `out/target/common/obj/JAVA_LIBRARIES/
telephony-common_intermediates/src/src/java/com/android/
internal/telephony/IIccPhoneBook.java'. Stop.

Change-Id: Id836d0777a1c7f17dab0153e94054c7d20441d93
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
ndroid.mk
f481e3ec351b28a41b1cd7f870d10e34648d24ac 20-Dec-2012 Wink Saville <wink@google.com> am df89e605: am f4fa4789: Merge "telephony: Fix issue in short code ussd detection"

* commit 'df89e605a668a5eeb5d1391909456602dece16a5':
telephony: Fix issue in short code ussd detection
0f6f97d404c27e9aed7d47ab8f1cf000ab93311f 20-Dec-2012 Wink Saville <wink@google.com> am 9b624d3a: am 58be8804: Merge "Fix build error while were doing incremental build"

* commit '9b624d3aa088922c5b0b2176f18966e549a3303b':
Fix build error while were doing incremental build
df89e605a668a5eeb5d1391909456602dece16a5 20-Dec-2012 Wink Saville <wink@google.com> am f4fa4789: Merge "telephony: Fix issue in short code ussd detection"

* commit 'f4fa4789ba7ac74c157da46bc597f75739f6c44d':
telephony: Fix issue in short code ussd detection
9b624d3aa088922c5b0b2176f18966e549a3303b 20-Dec-2012 Wink Saville <wink@google.com> am 58be8804: Merge "Fix build error while were doing incremental build"

* commit '58be8804124094488dc6727223f309e2e1aaf223':
Fix build error while were doing incremental build
f4fa4789ba7ac74c157da46bc597f75739f6c44d 20-Dec-2012 Wink Saville <wink@google.com> Merge "telephony: Fix issue in short code ussd detection"
58be8804124094488dc6727223f309e2e1aaf223 20-Dec-2012 Wink Saville <wink@google.com> Merge "Fix build error while were doing incremental build"
84b1abe0484744b996702193a1ae642cc5a744c3 20-Dec-2012 Roger Chen <cxr514033970@gmail.com> Fix build error while were doing incremental build

Build command: make telephony-common

Build error info as below:
make: *** No rule to make target `frameworks/opt/telephony/
src/java/com/android/internal/telephony/AdnRecord.aidl',
needed by `out/target/common/obj/JAVA_LIBRARIES/
telephony-common_intermediates/src/src/java/com/android/
internal/telephony/IIccPhoneBook.java'. Stop.

Change-Id: I028a3d7ed94c63849bbbc5063142037f1d1ac7bf
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
leanSpec.mk
3bf7b83854f70011c426e5f59259781e53e505f0 19-Dec-2012 Jean-Baptiste Queru <jbq@google.com> am f441dde1: Merge from AOSP staging branch

* commit 'f441dde145451cdc7ea90fc030086db32eb4c309':
Telephony: Start DataStallAlarm only on Data CONNECTED state
CatService: Add support for GET_CHANNEL_STATUS p-cmd.
Telephony: Fix issue with fdn deletion
f441dde145451cdc7ea90fc030086db32eb4c309 19-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge from AOSP staging branch

Change-Id: I757d7389ccc8912dff89a76e038bab9c03d7af1a
0f69b90efdf2ad994bd2a33012bae9cffdc75bef 18-Dec-2012 Wink Saville <wink@google.com> Merge "Telephony: Start DataStallAlarm only on Data CONNECTED state"
10e574acd0992d22abce257b420d333f5a49e71d 14-Aug-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> telephony: Fix issue in short code ussd detection

According to the 3PGG TS 22.030 specification
Figure 3.5.3.2: A 1 or 2 digit "short code" is
treated as USSD if it is entered while on a call or
does not satisfy the condition (exactly 2 digits
&& starts with '1').

Following rule is already addressed in function
GsmMmiCode::newFromDialString.

If the user of the device enters one digit followed
by the #-key, phone shall initiate a USSD/SS command

Change-Id: I70795da1fb5144d1c91059f6200b74b5fd33de22
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author-tracking-BZ: 28800
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
9aaa228cbb37657d12a87b5058676e449866f2ac 05-Dec-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> Telephony: Start DataStallAlarm only on Data CONNECTED state

Telephony framework uses AlarmManager for recovery mechanism of data
stalled issue.
Framework configures the ELAPSED_REALTIME_WAKEUP alarm for every
6minutes irrespective of the data state. Due to this,quiet a few
wakeups are seen even when the device is not connected to Mobile
Data network.

Fix is to check the Data connection state before starting
this alarm.

Change-Id: I219bff9199e5ce70bbcd05c95d65731886215fe9
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 28494
rc/java/com/android/internal/telephony/DataConnectionTracker.java
0815970067d8c8c34b30a6ec0acd44396f2f95ac 18-Dec-2012 Wink Saville <wink@google.com> Merge "CatService: Add support for GET_CHANNEL_STATUS p-cmd."
8becf90afdeccbb7c65080f778bac56d262a3bf9 18-Dec-2012 Wink Saville <wink@google.com> Merge "Telephony: Fix issue with fdn deletion"
86968438e444728053137c764cc37cf9c0a15d16 09-Aug-2012 Siddartha Pothapragada <spotha@codeaurora.org> CatService: Add support for GET_CHANNEL_STATUS p-cmd.

Change-Id: Ib0782748fdbdc94e5c13cffadb40556e3f324eff
rc/java/com/android/internal/telephony/cat/AppInterface.java
rc/java/com/android/internal/telephony/cat/CatCmdMessage.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
43198cf78f564c631ef08dddb7a183d4ba5b137d 26-Nov-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> Telephony: Fix issue with fdn deletion

Deletion of FDN contact with name having the "=" character
fails.

If there is a contact with "=" as part of the name, then split
will result in 3strings instead of 2(key and value).

For eg: Contact name: "="

Result with current code: [string.split("=")]
string[0] = tag
string[1] = '
string[2] = '.

Expected result:
string[0] = tag (key)
string[1] = '=' (value)

If split function with 2 arguments variation is used,
this issue will be solved. Example: string.split("=", 2)

Change-Id: I6c2d6152f9b034cae9739cd96c2fe799784dc5be
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 10805
rc/java/com/android/internal/telephony/IccProvider.java
2d7aad7791b92186dabc779b3ab43794aceebcda 29-Nov-2012 Guillaume Lucas <guillaume.lucas@intel.com> Telephony: add support for additional information

As per ETSI 102 223 section 8.12, for some general results, it is
mandatory for the terminal to provide a specific cause value as
additional information.

This patch adds this support to the framework.

Change-Id: Ie22e60412d674e24f9ebf13d02da4b39cb2dd253
Author: Guillaume Lucas <guillaume.lucas@intel.com>
Signed-off-by: Guillaume Lucas <guillaume.lucas@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 29915
rc/java/com/android/internal/telephony/cat/CatResponseMessage.java
rc/java/com/android/internal/telephony/cat/CatService.java
6c02409c6ddf15bf1c11d222b6a2a1fa5245aaff 13-Dec-2012 Wink Saville <wink@google.com> am 75a5b803: am c93d3b14: am f08c4c89: Turn auto attach on/off when we attach/detach.

* commit '75a5b8030e08f6424ff4a3495c7623121f23b6a6':
Turn auto attach on/off when we attach/detach.
75a5b8030e08f6424ff4a3495c7623121f23b6a6 13-Dec-2012 Wink Saville <wink@google.com> am c93d3b14: am f08c4c89: Turn auto attach on/off when we attach/detach.

* commit 'c93d3b14259cd00a9d7f92e3e2dd4d9992fca94e':
Turn auto attach on/off when we attach/detach.
c93d3b14259cd00a9d7f92e3e2dd4d9992fca94e 13-Dec-2012 Wink Saville <wink@google.com> am f08c4c89: Turn auto attach on/off when we attach/detach.

* commit 'f08c4c89622ddcbc4ed9315fe6b399941dad4939':
Turn auto attach on/off when we attach/detach.
f08c4c89622ddcbc4ed9315fe6b399941dad4939 12-Dec-2012 Wink Saville <wink@google.com> Turn auto attach on/off when we attach/detach.

Some network operators will detach after a timeout period, isDataAllowed()
will not allow a data connection because mAutoAttachOnCreation is false
and gprsState is not STATE_IN_SERVICE. This change toggles
mAutoAttachOnCreation based on attach/detach events and data will be
allowed if gprsState == STATE_IN_SERVICE or mAutoAttachOnCreation.

Bug: 7491805
Change-Id: If41c2514ebdb9cd2fba88eef692f2c7160c04b0f
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
1d272b4f018e5d7a0f70b70d76398c20d33e234b 12-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove unused INITING state."
a208912485c9931d004ee0e76a45a86259447c2f 11-Dec-2012 Wink Saville <wink@google.com> am 08a4f30f: resolved conflicts for merge of 106de004 to jb-mr1-dev-plus-aosp

* commit '08a4f30f925440641561f5be7ada1992856f9979':
Set audio mode after accepting the call
08a4f30f925440641561f5be7ada1992856f9979 11-Dec-2012 Wink Saville <wink@google.com> resolved conflicts for merge of 106de004 to jb-mr1-dev-plus-aosp

Change-Id: I069420f6eb3dc40779622e929acbc368d4b7aa55
a020758235911bddc552d5d38f20375e5a1fd05d 11-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> am d0e3cf71: am 75589efa: am f2a22db8: Set audio mode after accepting the call

* commit 'd0e3cf71d7033285b2d158c719ebf7400352227c':
Set audio mode after accepting the call
d0e3cf71d7033285b2d158c719ebf7400352227c 11-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> am 75589efa: am f2a22db8: Set audio mode after accepting the call

* commit '75589efab4375a4463c1c617be227e9bbd047aad':
Set audio mode after accepting the call
75589efab4375a4463c1c617be227e9bbd047aad 11-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> am f2a22db8: Set audio mode after accepting the call

* commit 'f2a22db80d9921fae213c763f08f2800d30b5cd3':
Set audio mode after accepting the call
106de0048b83c5f3941136d147452f4c56e430fe 11-Dec-2012 Wink Saville <wink@google.com> Merge "Set audio mode after accepting the call"
f2a22db80d9921fae213c763f08f2800d30b5cd3 08-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Set audio mode after accepting the call

Set the audio mode to incall immediately after accepting the call and not wait
till call is reported as ACTIVE by RIL. This is done to speed up time taken for audio
to set up the voice path

Bug: 7612431
Change-Id: I8008edc64928016ab94aa6d770de248b5d85dc93
rc/java/com/android/internal/telephony/CallManager.java
60dc9dc311361f9fb52155ea28d383d55afa90d8 11-Dec-2012 Wink Saville <wink@google.com> Merge commit '7e4b734a' into fix-merge-conflict

* commit '7e4b734a':
Telephony: Move uicc classes into uicc package

Change-Id: Iacc7f1805500bfe55299aaedbe0241ebba8e8b23
7e4b734af72aa456b4a4a4bb217c1ca2c0f15ca7 10-Dec-2012 Wink Saville <wink@google.com> am 77b3e5a8: Merge "Telephony: Move uicc classes into uicc package"

* commit '77b3e5a85a230f8b1b384b931d830220332937b5':
Telephony: Move uicc classes into uicc package
a5d65ff9d36808aec38d60ebe30f2109fcfcb8bc 08-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Set audio mode after accepting the call

Set the audio mode to incall immediately after accepting the call and not wait
till call is reported as ACTIVE by RIL. This is done to speed up time taken for audio
to set up the voice path

Bug: 7612431
Change-Id: I8008edc64928016ab94aa6d770de248b5d85dc93
rc/java/com/android/internal/telephony/CallManager.java
77b3e5a85a230f8b1b384b931d830220332937b5 10-Dec-2012 Wink Saville <wink@google.com> Merge "Telephony: Move uicc classes into uicc package"
d720945f2be5ea5fe0faf67e67d9ea0e184eba67 01-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Move uicc classes into uicc package

Reduce constructor visibility to package where
possible

Dependent Changes:
I3b718b9aea1f21c7906c8243b4ca0db6af495a08
I80204a2f3dc57cac875abeab390bb9db7a636ff7
Ib9c19e8b157dc7ec74eb14baca5bd3b5caf08c47

Change-Id: Ib4f43374c041cb5eaf2e3883e5ea28b2eb2c9a69
rc/java/android/telephony/SmsCbEtwsInfo.java
rc/java/android/telephony/SmsManager.java
rc/java/com/android/internal/telephony/AdnRecord.aidl
rc/java/com/android/internal/telephony/AdnRecord.java
rc/java/com/android/internal/telephony/AdnRecordCache.java
rc/java/com/android/internal/telephony/AdnRecordLoader.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/CsimFileHandler.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/IIccPhoneBook.aidl
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/IccCardApplicationStatus.java
rc/java/com/android/internal/telephony/IccCardProxy.java
rc/java/com/android/internal/telephony/IccCardStatus.java
rc/java/com/android/internal/telephony/IccConstants.java
rc/java/com/android/internal/telephony/IccException.java
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/IccFileNotFound.java
rc/java/com/android/internal/telephony/IccFileTypeMismatch.java
rc/java/com/android/internal/telephony/IccIoResult.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccProvider.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/IccRefreshResponse.java
rc/java/com/android/internal/telephony/IccServiceTable.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccVmFixedException.java
rc/java/com/android/internal/telephony/IccVmNotSupportedException.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/UiccCard.java
rc/java/com/android/internal/telephony/UiccCardApplication.java
rc/java/com/android/internal/telephony/UsimFileHandler.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cat/RilMessageDecoder.java
rc/java/com/android/internal/telephony/cat/ValueParser.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimFileHandler.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMFileHandler.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/SpnOverride.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
rc/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
rc/java/com/android/internal/telephony/gsm/UsimServiceTable.java
rc/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
rc/java/com/android/internal/telephony/ims/IsimFileHandler.java
rc/java/com/android/internal/telephony/ims/IsimRecords.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/uicc/AdnRecord.aidl
rc/java/com/android/internal/telephony/uicc/AdnRecord.java
rc/java/com/android/internal/telephony/uicc/AdnRecordCache.java
rc/java/com/android/internal/telephony/uicc/AdnRecordLoader.java
rc/java/com/android/internal/telephony/uicc/CsimFileHandler.java
rc/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java
rc/java/com/android/internal/telephony/uicc/IccCardProxy.java
rc/java/com/android/internal/telephony/uicc/IccCardStatus.java
rc/java/com/android/internal/telephony/uicc/IccConstants.java
rc/java/com/android/internal/telephony/uicc/IccException.java
rc/java/com/android/internal/telephony/uicc/IccFileHandler.java
rc/java/com/android/internal/telephony/uicc/IccFileNotFound.java
rc/java/com/android/internal/telephony/uicc/IccFileTypeMismatch.java
rc/java/com/android/internal/telephony/uicc/IccIoResult.java
rc/java/com/android/internal/telephony/uicc/IccRecords.java
rc/java/com/android/internal/telephony/uicc/IccRefreshResponse.java
rc/java/com/android/internal/telephony/uicc/IccServiceTable.java
rc/java/com/android/internal/telephony/uicc/IccUtils.java
rc/java/com/android/internal/telephony/uicc/IccVmFixedException.java
rc/java/com/android/internal/telephony/uicc/IccVmNotSupportedException.java
rc/java/com/android/internal/telephony/uicc/IsimFileHandler.java
rc/java/com/android/internal/telephony/uicc/IsimRecords.java
rc/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
rc/java/com/android/internal/telephony/uicc/RuimFileHandler.java
rc/java/com/android/internal/telephony/uicc/RuimRecords.java
rc/java/com/android/internal/telephony/uicc/SIMFileHandler.java
rc/java/com/android/internal/telephony/uicc/SIMRecords.java
rc/java/com/android/internal/telephony/uicc/SpnOverride.java
rc/java/com/android/internal/telephony/uicc/UiccCard.java
rc/java/com/android/internal/telephony/uicc/UiccCardApplication.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
rc/java/com/android/internal/telephony/uicc/UsimFileHandler.java
rc/java/com/android/internal/telephony/uicc/UsimServiceTable.java
rc/java/com/android/internal/telephony/uicc/VoiceMailConstants.java
ests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java
ests/telephonytests/src/com/android/internal/telephony/GsmAlphabetTest.java
ests/telephonytests/src/com/android/internal/telephony/IccServiceTableTest.java
ests/telephonytests/src/com/android/internal/telephony/SMSDispatcherTest.java
ests/telephonytests/src/com/android/internal/telephony/SimPhoneBookTest.java
ests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimServiceTableTest.java
9db40ea226ac2fb46417df55784f9dd3599450a1 09-Dec-2012 Wink Saville <wink@google.com> am 5b415773: (-s ours) am d1591969: Merge "Use Rlog"

* commit '5b415773990b638e2f906b5e881b52cd56ce4c36':
Use Rlog
5b415773990b638e2f906b5e881b52cd56ce4c36 09-Dec-2012 Wink Saville <wink@google.com> am d1591969: Merge "Use Rlog"

* commit 'd159196940a62b597a69d735ecb25a3c285d8625':
Use Rlog
d159196940a62b597a69d735ecb25a3c285d8625 09-Dec-2012 Wink Saville <wink@google.com> Merge "Use Rlog"
ded9c0af7fa49504c047275ed34c2d3b22bf0c3a 07-Dec-2012 Wink Saville <wink@google.com> Use Rlog

Change-Id: Ie013f51215de8380b8de74161b6056b010711cfd
ockril/src/com/android/internal/telephony/mockril/MockRilController.java
rc/java/android/provider/Telephony.java
rc/java/android/telephony/SmsMessage.java
rc/java/com/android/internal/telephony/AdnRecord.java
rc/java/com/android/internal/telephony/AdnRecordCache.java
rc/java/com/android/internal/telephony/AdnRecordLoader.java
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/Call.java
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/CallTracker.java
rc/java/com/android/internal/telephony/CommandException.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/Connection.java
rc/java/com/android/internal/telephony/CsimFileHandler.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/DataConnectionAc.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/DefaultPhoneNotifier.java
rc/java/com/android/internal/telephony/DriverCall.java
rc/java/com/android/internal/telephony/IccCardProxy.java
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccProvider.java
rc/java/com/android/internal/telephony/IccServiceTable.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccUtils.java
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/SmsStorageMonitor.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
rc/java/com/android/internal/telephony/TelephonyCapabilities.java
rc/java/com/android/internal/telephony/UiccCard.java
rc/java/com/android/internal/telephony/UiccCardApplication.java
rc/java/com/android/internal/telephony/UsimFileHandler.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/cat/CatLog.java
rc/java/com/android/internal/telephony/cat/ComprehensionTlv.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
rc/java/com/android/internal/telephony/cdma/EriManager.java
rc/java/com/android/internal/telephony/cdma/RuimFileHandler.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SignalToneUtil.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMFileHandler.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/SpnOverride.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
rc/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
rc/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
rc/java/com/android/internal/telephony/ims/IsimFileHandler.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/sip/SipPhoneFactory.java
rc/java/com/android/internal/telephony/test/ModelInterpreter.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
rc/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
ests/telephonymockriltests/src/com/android/telephonymockriltests/TelephonyMockTestRunner.java
ests/telephonymockriltests/src/com/android/telephonymockriltests/functional/SimpleTestUsingMockRil.java
ests/telephonytests/src/com/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
ests/telephonytests/src/com/android/internal/telephony/CallerInfoTest.java
ests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
ests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java
ests/telephonytests/src/com/android/internal/telephony/mockril/MockRilTest.java
13cf7e43f92022a7bb71950b388805c60726589f 06-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> Remove unused INITING state.

Change-Id: I56dd80988a064836f9171021f57a7bbf367090c8
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
15852c31a4c339bb618dc884a2462612f5829f1a 06-Dec-2012 Nick Kralevich <nnk@google.com> am 051b44e1: am 7f65cbad: Merge "Remove sent USSD log"

* commit '051b44e1e1c9b974b5541c74b2a24b8443940a44':
Remove sent USSD log
051b44e1e1c9b974b5541c74b2a24b8443940a44 06-Dec-2012 Nick Kralevich <nnk@google.com> am 7f65cbad: Merge "Remove sent USSD log"

* commit '7f65cbadb856891c4075d4205b464f8dc4490f08':
Remove sent USSD log
a1e073c4dc0c0a9e27603d8c6817030fc653e76d 06-Dec-2012 Wink Saville <wink@google.com> am 8708e568: am f038d40e: Merge "simcard: With Kazakh Beeline SIM card, there isn\'t STK menu"

* commit '8708e5682f40e5b8458b038f0bf13c0fdc0ccc19':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
8708e5682f40e5b8458b038f0bf13c0fdc0ccc19 06-Dec-2012 Wink Saville <wink@google.com> am f038d40e: Merge "simcard: With Kazakh Beeline SIM card, there isn\'t STK menu"

* commit 'f038d40e800fd9c48a7a91a2500e000116a2423e':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
7f65cbadb856891c4075d4205b464f8dc4490f08 06-Dec-2012 Nick Kralevich <nnk@google.com> Merge "Remove sent USSD log"
72000e2c06bbee97d5ce31c4f66befab8057cb71 04-Dec-2012 Cuihtlauac ALVARADO <cuihtlauac.alvarado@orange.com> Remove sent USSD log

Content of messages sent over USSD are copied in the radio logcat only if
debug level set to verbose. There are USSD services requiring highly
sensitive information to be sent by the user, we really don't want this
information to stay in the logcat by default.

Change-Id: Ieba37be0e346a6728dc7b139105a148577e0c0ff
rc/java/com/android/internal/telephony/RIL.java
2e75ed7a0a37b28a2b1e7ee78f1883ecc129e0ec 05-Dec-2012 jangeon.kim <jangeon.kim@lge.com> am cf702990: am 70c6547e: am 3e028681: simcard: With Kazakh Beeline SIM card, there isn\'t STK menu

* commit 'cf7029906ceac5d2d15138d94adfb9f9bad51b62':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
f038d40e800fd9c48a7a91a2500e000116a2423e 05-Dec-2012 Wink Saville <wink@google.com> Merge "simcard: With Kazakh Beeline SIM card, there isn't STK menu"
cf7029906ceac5d2d15138d94adfb9f9bad51b62 05-Dec-2012 jangeon.kim <jangeon.kim@lge.com> am 70c6547e: am 3e028681: simcard: With Kazakh Beeline SIM card, there isn\'t STK menu

* commit '70c6547e8223767411a2fca0601951a5fb27ed47':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
70c6547e8223767411a2fca0601951a5fb27ed47 05-Dec-2012 jangeon.kim <jangeon.kim@lge.com> am 3e028681: simcard: With Kazakh Beeline SIM card, there isn\'t STK menu

* commit '3e02868153369ab32d3ecc7b01f6e48750d6356d':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
3e02868153369ab32d3ecc7b01f6e48750d6356d 28-Nov-2012 jangeon.kim <jangeon.kim@lge.com> simcard: With Kazakh Beeline SIM card, there isn't STK menu

IccFileHandler.java is modified to fix an erroneous EF_IMG file path
information. The other is CommandParamsFactory.java file, which is modified
to ignore the result of reading EF_IMG file.

This Beeline SIM card returned an error status word when the mobile device
accessed the EF_IMG file in this SIM card.
(I think this Beeline SIM card does not support EF_IMG file.)
As a result, This error result stoped processing the setup menu proactive
command, and there was no STK menu.

So, I modified the CommandParamsFactory.java file to ignore the result of
EF_IMG file read operation.
After applying this modification, The STK menu was successfully displayed.
(This issue was resolved by these modified files.)

I think there will be no critical problem even if the EF_IMG(Icon image) file
is ignored.

Bug: 7585989

Change-Id: I16e3c077779811e3d4c46cd6e003771f3e1efde2
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
265fa2bedf7f279b2cabab99a189096b5bd16733 04-Dec-2012 Wink Saville <wink@google.com> Merge "Remove mRefCount"
2563e7e1ec513121b980045571a245aa5390f1c5 04-Dec-2012 Wink Saville <wink@google.com> Remove mRefCount

In DataConnection we had a list of connections and ref counting, with
this change we'll only use the list of connections only.

Change-Id: I64e3aff0980de845c14ee602632aa5f3cd740366
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/DataConnectionAc.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
deb8ccd0fbeae2b2f21f8a4ccc1139a79cccc71e 28-Nov-2012 jangeon.kim <jangeon.kim@lge.com> simcard: With Kazakh Beeline SIM card, there isn't STK menu

IccFileHandler.java is modified to fix an erroneous EF_IMG file path
information. The other is CommandParamsFactory.java file, which is modified
to ignore the result of reading EF_IMG file.

This Beeline SIM card returned an error status word when the mobile device
accessed the EF_IMG file in this SIM card.
(I think this Beeline SIM card does not support EF_IMG file.)
As a result, This error result stoped processing the setup menu proactive
command, and there was no STK menu.

So, I modified the CommandParamsFactory.java file to ignore the result of
EF_IMG file read operation.
After applying this modification, The STK menu was successfully displayed.
(This issue was resolved by these modified files.)

I think there will be no critical problem even if the EF_IMG(Icon image) file
is ignored.

Bug: 7585989

Change-Id: I16e3c077779811e3d4c46cd6e003771f3e1efde2
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
9eb33c38c0597e358fdf41003584e1f2a05d69f8 04-Dec-2012 Wink Saville <wink@google.com> am 4c95838a: am 7c7a5b41: am 859f7a91: Assume LTE location info is base 10 but allow 16 or 8.

* commit '4c95838add2cb8f48c9ea41e2ae37e20daea4d60':
Assume LTE location info is base 10 but allow 16 or 8.
4c95838add2cb8f48c9ea41e2ae37e20daea4d60 04-Dec-2012 Wink Saville <wink@google.com> am 7c7a5b41: am 859f7a91: Assume LTE location info is base 10 but allow 16 or 8.

* commit '7c7a5b41dfee9a5834a6da0842ad2878e262eca7':
Assume LTE location info is base 10 but allow 16 or 8.
7c7a5b41dfee9a5834a6da0842ad2878e262eca7 04-Dec-2012 Wink Saville <wink@google.com> am 859f7a91: Assume LTE location info is base 10 but allow 16 or 8.

* commit '859f7a917b27e64fc03ee614152ac37c688307a8':
Assume LTE location info is base 10 but allow 16 or 8.
859f7a917b27e64fc03ee614152ac37c688307a8 04-Dec-2012 Wink Saville <wink@google.com> Assume LTE location info is base 10 but allow 16 or 8.

Previously it was base 16 but somewhere along the line it changed
to base 10. The code is now changed to use the decode method which
assumes base 10 but also accepts base 16 (prefix 0x, 0X, #) or
base 8 (prefix 0).

Bug: 7651566
Change-Id: Icae05dcbee9c1092fce2f594a1e179bbd3e1426a
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
5109e89a509a890573849dfacf33d955f12a2021 30-Nov-2012 Jake Hamby <jhamby@google.com> am 7a48d5f4: am fd70b976: am e7fd4f72: Raise threshold for detecting excessive SMS usage.

* commit '7a48d5f494bd1ac8047adda1e3a691ec4ef7e89b':
Raise threshold for detecting excessive SMS usage.
7a48d5f494bd1ac8047adda1e3a691ec4ef7e89b 30-Nov-2012 Jake Hamby <jhamby@google.com> am fd70b976: am e7fd4f72: Raise threshold for detecting excessive SMS usage.

* commit 'fd70b97666c46f3a5672fd1aefa28df76296769d':
Raise threshold for detecting excessive SMS usage.
fd70b97666c46f3a5672fd1aefa28df76296769d 30-Nov-2012 Jake Hamby <jhamby@google.com> am e7fd4f72: Raise threshold for detecting excessive SMS usage.

* commit 'e7fd4f7253d22528de63bb3f0fa1f9f9ca879a86':
Raise threshold for detecting excessive SMS usage.
e7fd4f7253d22528de63bb3f0fa1f9f9ca879a86 29-Nov-2012 Jake Hamby <jhamby@google.com> Raise threshold for detecting excessive SMS usage.

Raise threshold for detecting excessive SMS usage so that the user
is warned when an app tries to send 30 or more messages in 1 minute,
rather than 30 messages in 30 minutes. This will be much less likely
to trigger for legitimate SMS usage, while still protecting against
buggy or malicious SMS apps that try to send SMS's continuously.

Bug: 7212322
Change-Id: I97078f96fdb8584cdb3ccc830000de9a534044c0
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
99c2e1d6749cfad2a8ca94a47857d8c3bfc09454 27-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log.

Change-Id: I2f44193b294513e743526e5c163e7d9a45308b28
rc/java/android/provider/Telephony.java
rc/java/android/telephony/Rlog.java
rc/java/android/telephony/SmsMessage.java
rc/java/com/android/internal/telephony/AdnRecord.java
rc/java/com/android/internal/telephony/AdnRecordCache.java
rc/java/com/android/internal/telephony/AdnRecordLoader.java
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/Call.java
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/CallTracker.java
rc/java/com/android/internal/telephony/CommandException.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/Connection.java
rc/java/com/android/internal/telephony/CsimFileHandler.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/DataConnectionAc.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/DefaultPhoneNotifier.java
rc/java/com/android/internal/telephony/DriverCall.java
rc/java/com/android/internal/telephony/IccCardProxy.java
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccProvider.java
rc/java/com/android/internal/telephony/IccServiceTable.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccUtils.java
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/SmsStorageMonitor.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
rc/java/com/android/internal/telephony/TelephonyCapabilities.java
rc/java/com/android/internal/telephony/UiccCard.java
rc/java/com/android/internal/telephony/UiccCardApplication.java
rc/java/com/android/internal/telephony/UsimFileHandler.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/cat/CatLog.java
rc/java/com/android/internal/telephony/cat/ComprehensionTlv.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
rc/java/com/android/internal/telephony/cdma/EriManager.java
rc/java/com/android/internal/telephony/cdma/RuimFileHandler.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SignalToneUtil.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMFileHandler.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/SpnOverride.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
rc/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
rc/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
rc/java/com/android/internal/telephony/ims/IsimFileHandler.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/sip/SipPhoneFactory.java
rc/java/com/android/internal/telephony/test/ModelInterpreter.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
rc/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
ests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
ests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java
d008821aacac55a7d4717fb52b85ab5590be30eb 17-Nov-2012 Wink Saville <wink@google.com> Remove mockril.

Mock ril isn't being used and the V8 library is being removed,
so mockril is being removed.

Change-Id: I76238bd97ff82072786e05a275bd90102c02f391
ockril/Android.mk
ockril/src/com/android/internal/telephony/mockril/MockRilController.java
ests/telephonymockriltests/Android.mk
ests/telephonymockriltests/AndroidManifest.xml
ests/telephonymockriltests/src/com/android/telephonymockriltests/TelephonyMockTestRunner.java
ests/telephonymockriltests/src/com/android/telephonymockriltests/functional/SimpleTestUsingMockRil.java
ests/telephonytests/AndroidManifest.xml
ests/telephonytests/src/com/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
ests/telephonytests/src/com/android/internal/telephony/CallerInfoTest.java
ests/telephonytests/src/com/android/internal/telephony/mockril/MockRilTest.java
fa4fd4721082689c4b276f67b845e7be249cb8da 16-Nov-2012 Wink Saville <wink@google.com> Add support for logging directly to RADIO LOG.

Eventually we will remove using the LOG_TAG in
system/core/liblog/logd_write.c to steer the log string
to the LOG_ID_RADIO buffer. This can't be done immediately
even if we changed all of the code in frameworks/opt/telephony
and frameworks/base/telephony because ril's and radio's are
relying on this behavior. But next year we will.

Change-Id: Ic36eaaca6f2a6302255e96a7646b687322d6997e
rc/java/android/telephony/Rlog.java
rc/java/com/android/internal/telephony/RIL.java
f92cb4bd5519427a0db673709d94683a8baf203a 16-Nov-2012 Wink Saville <wink@google.com> Remove CdmaDCT and CdmaDC.

Change-Id: Ifa251706326dae6b1676c79fa591f056a853953d
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
2e648e5c481ac90f64d71e1643c83bc67f8c0e7f 16-Nov-2012 Wink Saville <wink@google.com> Revert "Remove CdmaDCT and CdmaDC."

This reverts commit 88f9756a023639f48e85680b8bf2cd1469a5471a

Change-Id: I9b4f140b06acfc9d5f0856f380313a097171437a
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
88f9756a023639f48e85680b8bf2cd1469a5471a 15-Nov-2012 Wink Saville <wink@google.com> Remove CdmaDCT and CdmaDC.

Change-Id: I11ead478231bdd5f0b67bc2354e161eab3d4fd87
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
a6ab2346f5858247ab65265c91acc341b1e328ee 08-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 3de251ae: (-s ours) am e0650ebb: am d48f14fc: Reconcile with jb-mr1-release - do not merge

* commit '3de251aeb2e45e4cd993379fb42e87b355e7543f':
3de251aeb2e45e4cd993379fb42e87b355e7543f 08-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am e0650ebb: am d48f14fc: Reconcile with jb-mr1-release - do not merge

* commit 'e0650ebb1e4d08d2e883e14aebdcf59df6fd1dbd':
26bd5cfd9604dcafe4a9b4e915c4594b5258fa0e 08-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am 4f80dc44: am c82ab021: am 6af3665b: am 2bc7f2e1: Use proper check for spn for operator name display

* commit '4f80dc446e2d01705fda4fac4ed9c557b98730aa':
Use proper check for spn for operator name display
4f80dc446e2d01705fda4fac4ed9c557b98730aa 08-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am c82ab021: am 6af3665b: am 2bc7f2e1: Use proper check for spn for operator name display

* commit 'c82ab0216264ca82a62ed4cdda387b23c0d8c1c7':
Use proper check for spn for operator name display
e0650ebb1e4d08d2e883e14aebdcf59df6fd1dbd 07-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am d48f14fc: Reconcile with jb-mr1-release - do not merge

* commit 'd48f14fc02114e90c8212cf6302aae4793491c42':
d48f14fc02114e90c8212cf6302aae4793491c42 07-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Ic0cad6c664001b47eee72ed7bb3034626bfeae76
b211e832fcb3dd76ee63f1dc936d1e5ba7762ac2 07-Nov-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
9f8d011afa7ea105ba5f2cc5f642eccc48ce4860 07-Nov-2012 Christopher Tate <ctate@google.com> Merge "Use the correct new namespace for AUTO_TIME and AIRPLANE_MODE_ON settings"
c82ab0216264ca82a62ed4cdda387b23c0d8c1c7 07-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am 6af3665b: am 2bc7f2e1: Use proper check for spn for operator name display

* commit '6af3665bbfeade59948947f7f503345d04cf0a94':
Use proper check for spn for operator name display
6af3665bbfeade59948947f7f503345d04cf0a94 07-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am 2bc7f2e1: Use proper check for spn for operator name display

* commit '2bc7f2e1da139e183519af01f50940327ca9765e':
Use proper check for spn for operator name display
2bc7f2e1da139e183519af01f50940327ca9765e 06-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> Use proper check for spn for operator name display

Change null check to null or empty string check.

bug:7389730
Change-Id: I593429b8668b49978ad38b28062b8b2031464813
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
069488059d9619a2b8bd070e85d6d657bddcf65a 06-Nov-2012 Christopher Tate <ctate@google.com> Use the correct new namespace for AUTO_TIME and AIRPLANE_MODE_ON settings

These moved to the global namespace; update the points of usage here in the
telephony stack so the reads no longer have to be forwarded etc.

Change-Id: I06434b78bc42ac125ec114dc68381cf906ab3085
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
37208994e6acccf3bfb34f1dc1ecd0a7fa58d6be 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 4a27143b: (-s ours) am 7009c393: am bcf5c6fe: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '4a27143b4a9eff723c52170ef09ec2431afce943':
4a27143b4a9eff723c52170ef09ec2431afce943 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am 7009c393: am bcf5c6fe: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '7009c393ec005099fc931f9d5418b6b45b5640b5':
7009c393ec005099fc931f9d5418b6b45b5640b5 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> am bcf5c6fe: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'bcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793':
When retrying disassociate an ApnContext from a DC only when failed or idle.
Revert "Act on no-prefered-apn-on-connect config option."
Act on no-prefered-apn-on-connect config option.
bcf5c6fe5293ad607a2b5cf5a9f6f11fde9d0793 06-Nov-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I178d3a86d8c71bca722ca5bfda136462b820c85e
53b0cab9eec7eb02204122c31cf5f0126fe013da 31-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 214e43f8: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '214e43f82c3462aaffcb382f43df58ce02281df9':
When retrying disassociate an ApnContext from a DC only when failed or idle.
214e43f82c3462aaffcb382f43df58ce02281df9 31-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I2ca40701356e0a6f1adc4d95621c6043082c0544
c9aeb50a136db19f788da2dac022325d4f4ce458 30-Oct-2012 Rika Brooks <rbrooks@codeaurora.org> am 2d092d1d: am edde032a: am 44be3fc4: Telephony: Distinguish GSM vs ETWS bc by message id

* commit '2d092d1d1b6fdaa33040ecf6f50dd868785f9a2c':
Telephony: Distinguish GSM vs ETWS bc by message id
f1feffe336e9979a94137152f0723b6f7ee66280 30-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
2d092d1d1b6fdaa33040ecf6f50dd868785f9a2c 30-Oct-2012 Rika Brooks <rbrooks@codeaurora.org> am edde032a: am 44be3fc4: Telephony: Distinguish GSM vs ETWS bc by message id

* commit 'edde032ab1181fdce43551660bf675c8b8bb62be':
Telephony: Distinguish GSM vs ETWS bc by message id
edde032ab1181fdce43551660bf675c8b8bb62be 30-Oct-2012 Rika Brooks <rbrooks@codeaurora.org> am 44be3fc4: Telephony: Distinguish GSM vs ETWS bc by message id

* commit '44be3fc486c049bbfea331b0fc2cff0552326f4b':
Telephony: Distinguish GSM vs ETWS bc by message id
44be3fc486c049bbfea331b0fc2cff0552326f4b 06-Feb-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Distinguish GSM vs ETWS bc by message id

Per 3GPP TS 24.012 3.1 GSM CB can be less than 88 byes.
Fix to distinguish GSM vs ETWS broadcast format by checking message id field
rather than length of pdu.

Bug: 7417676
Change-Id: I6aeedcd531a89ded7901db33d89ed45baaabbaa7
rc/java/com/android/internal/telephony/gsm/SmsCbHeader.java
aa2908dd54304e252be68ba1ed82181e6ea27c5d 29-Oct-2012 Junichi Monma <monma@google.com> am 4adaff35: am 3eb13f88: am 708cb897: Allowing to change the poll state even if only PS is avairable on the network.

* commit '4adaff35f8b52aa68edd31e05052e923344b18a8':
Allowing to change the poll state even if only PS is avairable on the network.
4adaff35f8b52aa68edd31e05052e923344b18a8 29-Oct-2012 Junichi Monma <monma@google.com> am 3eb13f88: am 708cb897: Allowing to change the poll state even if only PS is avairable on the network.

* commit '3eb13f8805e784f4257dd77537fde7b7fdcbf0e3':
Allowing to change the poll state even if only PS is avairable on the network.
3eb13f8805e784f4257dd77537fde7b7fdcbf0e3 29-Oct-2012 Junichi Monma <monma@google.com> am 708cb897: Allowing to change the poll state even if only PS is avairable on the network.

* commit '708cb897813b5239e1d732d08ee2d04f577d09f1':
Allowing to change the poll state even if only PS is avairable on the network.
060a623dc5c9e4666414e80e3478eb7e3b261313 27-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
708cb897813b5239e1d732d08ee2d04f577d09f1 26-Oct-2012 Junichi Monma <monma@google.com> Allowing to change the poll state even if only PS is avairable on the network.

There are some MVNO operators are shipping the data only SIM. It isn't
connectable with CS, but wroks for PS. If the poll is not shown on the
system bar when network registration returns STATE_OUT_OF_SERVICE for
CS, user doesn't notice whether or not they can use PS. In addition,
PS might works while CS restriction.

Bug: 3339315
Change-Id: I6c2b508a181afed6dc9356b99ad9ef09f8c7ea4f
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
de0835fd848a723efe40432a4cb09a06b8d5825e 24-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
19364aaa786b2311a65aeefd33f0667ee7efd870 24-Oct-2012 Wink Saville <wink@google.com> am a19f2492: am 628da84b: am a2985af1: Validate call forwarding indicator status from SIM.

* commit 'a19f2492f65afd54e9ab2f5b6c787fda7bdda711':
Validate call forwarding indicator status from SIM.
a19f2492f65afd54e9ab2f5b6c787fda7bdda711 24-Oct-2012 Wink Saville <wink@google.com> am 628da84b: am a2985af1: Validate call forwarding indicator status from SIM.

* commit '628da84bfeb1bd9de02bed2fb0cc186ac4bb0567':
Validate call forwarding indicator status from SIM.
628da84bfeb1bd9de02bed2fb0cc186ac4bb0567 24-Oct-2012 Wink Saville <wink@google.com> am a2985af1: Validate call forwarding indicator status from SIM.

* commit 'a2985af1d00f7db8cb11da3874dc74e0c7ff7088':
Validate call forwarding indicator status from SIM.
a2985af1d00f7db8cb11da3874dc74e0c7ff7088 23-Oct-2012 Wink Saville <wink@google.com> Validate call forwarding indicator status from SIM.

The expected value for the MSP is 1 to 4, if not ignore.

Bug: 7387797
Change-Id: Ib35700c927fcc06eb5fb533097cb25a0de13db77
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
1de1d3c6da7aa16d1a1b4a3f85484803788d2f8b 19-Oct-2012 Wink Saville <wink@google.com> Fake errors in DataConnection.

Errors can be faked for all DC's or just a particular DC,
use tools/tdi to issue the broadcast intent.


Change-Id: I4ba661e765d32931421bb62bc5e740c9652370a5
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
ools/tdi
b9f33f437348b38a1c0422cd844b267894661d9f 18-Oct-2012 Wink Saville <wink@google.com> Add additional debug logging.

Change-Id: I8ea0ff57faabfdd1dedb97bfa46706fd0fb93b5b
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
01ffdacbdefde835858389df09557e8664fce82b 18-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
be0930109ef5f2e044cb8cde5dce10bec64383d0 17-Oct-2012 Wink Saville <wink@google.com> Remove fake data setup counter, didn't work correctly.

There will be a change for DataConnection which allows it to be
configured to return errors when bringUp is called.

Change-Id: Ie5d8209ab9f78894027a1cf7bcea7507d29d9ed4
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
5aa2282b21a141e6c705c8fb7b12e0d7548942e4 16-Oct-2012 Wink Saville <wink@google.com> When retrying disassociate an ApnContext from a DC only when failed or idle.

Disassociating, is setting an ApnContext DataConnection to null. When its
null the DataConnectionTracker will not find the DataConnection when the
next RIL_UNSOL_DATA_CALL_LIST_CHANGED arrives and it sends a notification
that the connection has been disconnected. When the notification is
received by the ConnectivityService it will reset the connection and now
there will truly be no connection.

Typically, when the DataConnectionTracker sees that the default connection
is been removed, it will automatically retry the connection. But this won't
happen in this case, because there was no error to cause the retry.

Bug: 6884995
Bug: 7343098
Change-Id: Ia36316151bc5ae9a0ef9b48b1841816198862127
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
7596e424ab65740ef6a05baf8d4652403797c6db 17-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am b3b3dd5e: am 99a846e1: am 20659cc7: Retry connections that are in SCANNING.

* commit 'b3b3dd5e0d8e3d05a5d1baa683b6b275d7427247':
Retry connections that are in SCANNING.
b3b3dd5e0d8e3d05a5d1baa683b6b275d7427247 17-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 99a846e1: am 20659cc7: Retry connections that are in SCANNING.

* commit '99a846e14233977d46ec1a67a000872fbc34af00':
Retry connections that are in SCANNING.
99a846e14233977d46ec1a67a000872fbc34af00 17-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 20659cc7: Retry connections that are in SCANNING.

* commit '20659cc78b898b553a54bb6d9d7728f326b77bd1':
Retry connections that are in SCANNING.
20659cc78b898b553a54bb6d9d7728f326b77bd1 16-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Retry connections that are in SCANNING.

Old code would retry all connections except those in the SCANNING state
when we reattach to the network. We're seeing this from people coming out
of subways as well as emerging from their house.

bug:7353277
Change-Id: Ic1fdd745f52ef33dd94b1d85b0dcc57a00c04d62
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
5e1bc7508bd2f6cbe52ce1d7cb13194a0d265406 17-Oct-2012 Jiju Kinattingal <jijuk@codeaurora.org> Telephony: Correct the typo in RIL.java

Change-Id: Ic4bcd054f14d7e4b702b924f799e4d1619b666e0
rc/java/com/android/internal/telephony/RIL.java
e4444b42904d52b9553d56722598153abab9e5ed 17-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
d83a463c68d97d1a1b8ee52cb3542d66a46c0d5d 16-Oct-2012 Wink Saville <wink@google.com> am c2a24b8d: am 0bc0fc92: am 27814a2e: When retrying disassociate an ApnContext from a DC only when failed or idle.

* commit 'c2a24b8d9bc3cdcc89650494cd6011201d75bdee':
When retrying disassociate an ApnContext from a DC only when failed or idle.
c2a24b8d9bc3cdcc89650494cd6011201d75bdee 16-Oct-2012 Wink Saville <wink@google.com> am 0bc0fc92: am 27814a2e: When retrying disassociate an ApnContext from a DC only when failed or idle.

* commit '0bc0fc923b4e5e811987c4c641252b2fe01fa9b1':
When retrying disassociate an ApnContext from a DC only when failed or idle.
0bc0fc923b4e5e811987c4c641252b2fe01fa9b1 16-Oct-2012 Wink Saville <wink@google.com> am 27814a2e: When retrying disassociate an ApnContext from a DC only when failed or idle.

* commit '27814a2e735c0221935d46654fb00ff3ec2c45ea':
When retrying disassociate an ApnContext from a DC only when failed or idle.
27814a2e735c0221935d46654fb00ff3ec2c45ea 16-Oct-2012 Wink Saville <wink@google.com> When retrying disassociate an ApnContext from a DC only when failed or idle.

Disassociating, is setting an ApnContext DataConnection to null. When its
null the DataConnectionTracker will not find the DataConnection when the
next RIL_UNSOL_DATA_CALL_LIST_CHANGED arrives and it sends a notification
that the connection has been disconnected. When the notification is
received by the ConnectivityService it will reset the connection and now
there will truly be no connection.

Typically, when the DataConnectionTracker sees that the default connection
is been removed, it will automatically retry the connection. But this won't
happen in this case, because there was no error to cause the retry.

Bug: 6884995
Bug: 7343098
Change-Id: Ia36316151bc5ae9a0ef9b48b1841816198862127
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6da27089a1aa5faf4a4391378223e659b11f8821 15-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-factory-release history after reset to jb-mr1-dev
433201d2ffa7886a7d7e37d97606385ec3366b87 15-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 368d06fd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '368d06fdb75578f6e5ef4aa0b20db5153b86746c':
368d06fdb75578f6e5ef4aa0b20db5153b86746c 15-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-release - do not merge

Change-Id: Id46c84731699446fa4b89cd27308d2f307c4a81b
ab3408065b00efc460e7b08cc0fd685e122864e6 13-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
706998778b761b957cbee36cdeed9a624691c071 13-Oct-2012 Wink Saville <wink@google.com> am 8f732e35: am 727b32f8: am f7a81331: Handle no IccRecords in updateSpnDisplay differently.

* commit '8f732e354be617e5978529d9e129c6b188777f95':
Handle no IccRecords in updateSpnDisplay differently.
8f732e354be617e5978529d9e129c6b188777f95 13-Oct-2012 Wink Saville <wink@google.com> am 727b32f8: am f7a81331: Handle no IccRecords in updateSpnDisplay differently.

* commit '727b32f8fc527d23e8cd9f92a165198b5dff03c6':
Handle no IccRecords in updateSpnDisplay differently.
727b32f8fc527d23e8cd9f92a165198b5dff03c6 13-Oct-2012 Wink Saville <wink@google.com> am f7a81331: Handle no IccRecords in updateSpnDisplay differently.

* commit 'f7a8133113daddcc48a41e451193afd3fcb35e16':
Handle no IccRecords in updateSpnDisplay differently.
f7a8133113daddcc48a41e451193afd3fcb35e16 13-Oct-2012 Wink Saville <wink@google.com> Handle no IccRecords in updateSpnDisplay differently.

Rather than doing nothing in GsmServiceStateTracker#updateSpnDisplay
if mIccRecords is null, use a rule of 0 and an empty spn. And then keep the
remaining logic the same.

This allows "Emergency Only Calls" to be displayed in the lock and
notification screens if there is no SIM card.

Bug: 7276760
Change-Id: I0f969c8f5cad204e80c63d2e1a8e896cb7f4c02a
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
02de6d550835795d648d004df93e0cca9e014d2e 10-Oct-2012 The Android Open Source Project <initial-contribution@android.com> am 37daa00c: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '37daa00c00a0eade9f21e3e7224464080727393f':
Revert "Act on no-prefered-apn-on-connect config option."
Act on no-prefered-apn-on-connect config option.
37daa00c00a0eade9f21e3e7224464080727393f 10-Oct-2012 The Android Open Source Project <initial-contribution@android.com> Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I6f56e5f48f3ab092856f539ac922f2660a0286be
9a8ca5ed0ae0792a6f5dfa4bb1fbfb56f5fc594e 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
1bb35a7bb1ee5210c7c674c40b5e162854b3f25f 10-Oct-2012 Baligh Uddin <baligh@google.com> am a90fe2bc: am 674c0b56: am 175442fc: Revert "Revert "Act on no-prefered-apn-on-connect config option.""

* commit 'a90fe2bc14a1e29c484f8022e09ee833ff08160a':
Revert "Revert "Act on no-prefered-apn-on-connect config option.""
a90fe2bc14a1e29c484f8022e09ee833ff08160a 10-Oct-2012 Baligh Uddin <baligh@google.com> am 674c0b56: am 175442fc: Revert "Revert "Act on no-prefered-apn-on-connect config option.""

* commit '674c0b56e52d7e223be6fa3e84aacd4b61fff153':
Revert "Revert "Act on no-prefered-apn-on-connect config option.""
674c0b56e52d7e223be6fa3e84aacd4b61fff153 10-Oct-2012 Baligh Uddin <baligh@google.com> am 175442fc: Revert "Revert "Act on no-prefered-apn-on-connect config option.""

* commit '175442fc1d7ed440e4c2a7aaffe38521446dec8c':
Revert "Revert "Act on no-prefered-apn-on-connect config option.""
175442fc1d7ed440e4c2a7aaffe38521446dec8c 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Revert "Act on no-prefered-apn-on-connect config option.""

Revert the revert - change is good.

This reverts commit 859e774e4309c24efafb157a894c2f94f8c544f2

Change-Id: Icb71779f30f5fe1ee7ed73c88e547507cbc0c31f
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
f48d8ac1742a410d5d8260e176cab0bee036046b 10-Oct-2012 Baligh Uddin <baligh@google.com> am 25dbe645: am a35580d7: am 859e774e: Revert "Act on no-prefered-apn-on-connect config option."

* commit '25dbe645c6b16dee0e0bf41bbd26e9cacc66baad':
Revert "Act on no-prefered-apn-on-connect config option."
25dbe645c6b16dee0e0bf41bbd26e9cacc66baad 10-Oct-2012 Baligh Uddin <baligh@google.com> am a35580d7: am 859e774e: Revert "Act on no-prefered-apn-on-connect config option."

* commit 'a35580d76caf1cfedbded2c640f989583b4374e3':
Revert "Act on no-prefered-apn-on-connect config option."
a35580d76caf1cfedbded2c640f989583b4374e3 10-Oct-2012 Baligh Uddin <baligh@google.com> am 859e774e: Revert "Act on no-prefered-apn-on-connect config option."

* commit '859e774e4309c24efafb157a894c2f94f8c544f2':
Revert "Act on no-prefered-apn-on-connect config option."
7fbee783fad45798167bd5e2f184ea489a25b2b1 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Act on no-prefered-apn-on-connect config option."

breaking jb-mr1-release

This reverts commit 3ff47ff70406e6973226ac966d157a97fa8e9279

Change-Id: I897cc6eecaa0b4a3d248abda0431cd70742ad2df
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
859e774e4309c24efafb157a894c2f94f8c544f2 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Act on no-prefered-apn-on-connect config option."

breaking jb-mr1-release

This reverts commit 3ff47ff70406e6973226ac966d157a97fa8e9279

Change-Id: I897cc6eecaa0b4a3d248abda0431cd70742ad2df
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
62bb795169c3c134a21e3c09f71707daac813b09 08-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Act on no-prefered-apn-on-connect config option.

bug:7306353
Change-Id: Icf1c21cc8997821a7d50d114c8985728d9bdb02e
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
79ba052305342cc844a5f662ae83b9e81e2f521b 10-Oct-2012 The Android Automerger <android-build@android.com> merge in jb-mr1-release history after reset to jb-mr1-dev
6585f45c64a7110dec5173ec2c26da6b1c76199c 09-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 4eac40be: am 4f4042f1: am 3ff47ff7: Act on no-prefered-apn-on-connect config option.

* commit '4eac40beef0c2988f3a76609776e6fd665fa190f':
Act on no-prefered-apn-on-connect config option.
4eac40beef0c2988f3a76609776e6fd665fa190f 09-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 4f4042f1: am 3ff47ff7: Act on no-prefered-apn-on-connect config option.

* commit '4f4042f1895f817e23ce3c821504053423232fc7':
Act on no-prefered-apn-on-connect config option.
4f4042f1895f817e23ce3c821504053423232fc7 09-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 3ff47ff7: Act on no-prefered-apn-on-connect config option.

* commit '3ff47ff70406e6973226ac966d157a97fa8e9279':
Act on no-prefered-apn-on-connect config option.
3ff47ff70406e6973226ac966d157a97fa8e9279 08-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Act on no-prefered-apn-on-connect config option.

bug:7306353
Change-Id: Icf1c21cc8997821a7d50d114c8985728d9bdb02e
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
ec407079cddbd5132bd7943a73f762e1721e11a9 07-Oct-2012 Wink Saville <wink@google.com> am a21458b7: am e55abcae: am 682428cb: Merge "Fake sim status changed appropriately" into jb-mr1-dev

* commit 'a21458b7e268f39b4995c9501d1084a580676087':
Fake sim status changed appropriately
a21458b7e268f39b4995c9501d1084a580676087 07-Oct-2012 Wink Saville <wink@google.com> am e55abcae: am 682428cb: Merge "Fake sim status changed appropriately" into jb-mr1-dev

* commit 'e55abcae66ffde0739cdcc7a57783c22bae1f2df':
Fake sim status changed appropriately
e55abcae66ffde0739cdcc7a57783c22bae1f2df 07-Oct-2012 Wink Saville <wink@google.com> am 682428cb: Merge "Fake sim status changed appropriately" into jb-mr1-dev

* commit '682428cb5e85d8bcc85685808b3f0e88716712a2':
Fake sim status changed appropriately
682428cb5e85d8bcc85685808b3f0e88716712a2 07-Oct-2012 Wink Saville <wink@google.com> Merge "Fake sim status changed appropriately" into jb-mr1-dev
f860a3f42f87c9c8572623aff33349168d689477 06-Oct-2012 Wink Saville <wink@google.com> Fake sim status changed appropriately

On a VZW GN if we always do ENTER_SIM_PIN the GET_SIM_STATUS comes so
quickly that it causes the SIMRecords to return an operator.numeric of
666666 instead of 311480. To fix this we only fake sim status changed
when an error occurs on the CHANGE/ENTER SIM_PIN/PIN2. Also, faking on
RIL_REQUEST_SET_FACILITY_LOCK on errors so on a VZW GN we automatically
go to the main lock screen when the PUK is needed,

Finally, on VZN GN RIL_REQUEST_ENTER_SIM_PUK we need to always fake
RIL_RESPONSE_UNSOL_SIM_STATUS_CHANGED, otherwise we won't automatically
leave the main lock screen when we enter the correct PUK. I also do this
for RIL_REQUEST_ENTER_SIM_PUK2 for consistency.

Bug: 7255789
Change-Id: I712cc5020970317922f0c3d686c621a6abcd552c
rc/java/com/android/internal/telephony/RIL.java
6af987cac8e161493239fb806e55b74849084a7d 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am c69c6cc0: am 4e9b8c2d: am 205e3cb5: Merge "Change the dir used for the sms policy." into jb-mr1-dev

* commit 'c69c6cc00e4031162b7ba91edf0ffb8b566e4f57':
Change the dir used for the sms policy.
c69c6cc00e4031162b7ba91edf0ffb8b566e4f57 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 4e9b8c2d: am 205e3cb5: Merge "Change the dir used for the sms policy." into jb-mr1-dev

* commit '4e9b8c2d3b556a4a1b588dd2eef606c9b5ecbed3':
Change the dir used for the sms policy.
4e9b8c2d3b556a4a1b588dd2eef606c9b5ecbed3 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 205e3cb5: Merge "Change the dir used for the sms policy." into jb-mr1-dev

* commit '205e3cb53a164c6d06b61dee9c2973038ae522e2':
Change the dir used for the sms policy.
205e3cb53a164c6d06b61dee9c2973038ae522e2 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Change the dir used for the sms policy." into jb-mr1-dev
58c8356d4b119d4e9c0b6fe73526f4daca1112ec 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Change the dir used for the sms policy.

The dir being used didn't exist (at least on mako) so changed to /data/misc/sms
which is used for other sms-y purposes (sms short code data) and exists.

bug:7287473
Change-Id: Idd952fabc2ee40c5d25db2da79c03ad302defa72
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
9af2fe07cbbd74fd2001fd67e43962cf8af463a1 04-Oct-2012 Wink Saville <wink@google.com> am e298a991: am 31ff8674: am be3dc4b0: Fix 7255789

* commit 'e298a991476a0b48503713bd31dca3ed82a4c4e0':
Fix 7255789
e298a991476a0b48503713bd31dca3ed82a4c4e0 04-Oct-2012 Wink Saville <wink@google.com> am 31ff8674: am be3dc4b0: Fix 7255789

* commit '31ff8674da1d7570909d893e149581ddb88285f5':
Fix 7255789
31ff8674da1d7570909d893e149581ddb88285f5 04-Oct-2012 Wink Saville <wink@google.com> am be3dc4b0: Fix 7255789

* commit 'be3dc4b04cd65e576d250cf68f310d47637167ff':
Fix 7255789
be3dc4b04cd65e576d250cf68f310d47637167ff 04-Oct-2012 Wink Saville <wink@google.com> Fix 7255789

Two problems were identified, first in IccCardProxy needs to assume a
the current app type is 3GPP because some rils are not managing the
sim status properly and return the csim as PINSTATE_UNKNOWN if the device
is gets PUK locked because the PIN was entered incorrectly 3 times. This
is fixed with the changes IccCardProxy.java and Phone.java.

The second problem is that some rils are not sending a
RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED when the PIN or PUK are changed.
This causes some devices to NOT automatically go to the lock screen
when a PUK is required. This is fixed by the change to RIL.java.

Bug: 7255789
Change-Id: I969585edf416e6b11f52470ee69d19f781bf29ca
rc/java/com/android/internal/telephony/IccCardProxy.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/RIL.java
0a9d55403e683d6e4a4f893219089d667abc511c 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am e681dffc: am ea779b73: am d070d1c9: Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev

* commit 'e681dffc954ae2c2e7e48deb68ec8f21cb2aac11':
Fix bug in subsequent premium-sms detections.
e681dffc954ae2c2e7e48deb68ec8f21cb2aac11 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am ea779b73: am d070d1c9: Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev

* commit 'ea779b7385612a334596fd4f09c105cf0d5fa5c2':
Fix bug in subsequent premium-sms detections.
ea779b7385612a334596fd4f09c105cf0d5fa5c2 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am d070d1c9: Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev

* commit 'd070d1c9318cf1b33ab901e3741acfa81262eeb7':
Fix bug in subsequent premium-sms detections.
d070d1c9318cf1b33ab901e3741acfa81262eeb7 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev
b95d05461be6504e492304af83284490e26a7bc1 03-Oct-2012 Dianne Hackborn <hackbod@google.com> am b7ca3296: am bbab7683: am ac1e58bf: Merge "Fix issue #7274813: A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev

* commit 'b7ca3296aeec1c103b027548e78a4eaf96b560f5':
Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
b7ca3296aeec1c103b027548e78a4eaf96b560f5 03-Oct-2012 Dianne Hackborn <hackbod@google.com> am bbab7683: am ac1e58bf: Merge "Fix issue #7274813: A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev

* commit 'bbab768308c37fae48a4ae17a11e7d304ffae1aa':
Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
bbab768308c37fae48a4ae17a11e7d304ffae1aa 03-Oct-2012 Dianne Hackborn <hackbod@google.com> am ac1e58bf: Merge "Fix issue #7274813: A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev

* commit 'ac1e58bf04e394a9d051c6a3c3099bda0ec409e9':
Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
ac1e58bf04e394a9d051c6a3c3099bda0ec409e9 03-Oct-2012 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #7274813: A few sticky broadcasts aren't being sent to all users" into jb-mr1-dev
10270d2586e2d940dea23b19f6ad733f702609be 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Fix bug in subsequent premium-sms detections.

bug:fix_7273572
Change-Id: Ia51989fb417f5394b9a86d0dd8109671b2ee73ab
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
7eff443d1f090abdbbd93eef9f265c74890920bc 03-Oct-2012 Dianne Hackborn <hackbod@google.com> Fix issue #7274813: A few sticky broadcasts aren't being sent to all users

Change-Id: Ief63aa4be067618b2431c2c0fcd1d6820a348715
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
8a03763b346d2b821f98602148a409b66488689e 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am cf4d1243: am 7fe56ac2: am 78e1a45d: Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev

* commit 'cf4d12430566850fbbeeef77eb1d5de17aa94327':
fallback to res-based premium-sms detection info
cf4d12430566850fbbeeef77eb1d5de17aa94327 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 7fe56ac2: am 78e1a45d: Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev

* commit '7fe56ac20fdee1cd270b7707bfcf60ba2d15cf85':
fallback to res-based premium-sms detection info
7fe56ac20fdee1cd270b7707bfcf60ba2d15cf85 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 78e1a45d: Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev

* commit '78e1a45d183e2564139372b5a828f056db4beb23':
fallback to res-based premium-sms detection info
78e1a45d183e2564139372b5a828f056db4beb23 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev
4dc9017de26d9844811ee258851c351c0a9ec80d 02-Oct-2012 Jeff Sharkey <jsharkey@android.com> am 7b918770: am b24d4a60: am 6ce6af46: Migrate telephony settings to Global.

* commit '7b9187707ed429b57ee7b6f293da1ac87f7219fd':
Migrate telephony settings to Global.
7b9187707ed429b57ee7b6f293da1ac87f7219fd 02-Oct-2012 Jeff Sharkey <jsharkey@android.com> am b24d4a60: am 6ce6af46: Migrate telephony settings to Global.

* commit 'b24d4a60d972feea197f0d1776bc3ac1fb8dcda4':
Migrate telephony settings to Global.
b24d4a60d972feea197f0d1776bc3ac1fb8dcda4 02-Oct-2012 Jeff Sharkey <jsharkey@android.com> am 6ce6af46: Migrate telephony settings to Global.

* commit '6ce6af4664de8d12c238f00b1f566db010d52a44':
Migrate telephony settings to Global.
6ce6af4664de8d12c238f00b1f566db010d52a44 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> Migrate telephony settings to Global.

Bug: 7231764
Change-Id: I2e1c23ed930bb9499c8bca53ac68c38da85085b5
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
81ddb888952763b5eb7a4a38fb293fc86b897968 01-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> fallback to res-based premium-sms detection info

If a device doesn't yet have or will never have the gservices-based
updatable premium-sms data, we should have a reasonable fallback.
Prepopulate with an xml resource.

bug:7254595
Change-Id: I065832bfffb46faba35054a7cdf05000ed14eb4a
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
688f6a60870a7a6596f1f1781c36d16182678b40 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 33f1ee53: Merge from jb-mr1-aah-dev

* commit '33f1ee534163d08f7446ef82419976e566da1302':
33f1ee534163d08f7446ef82419976e566da1302 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1-aah-dev

Change-Id: I2c58f760ca5214e0d334f7c44be338a6c06cd5c3
f3f73a585e3254d67b3e78ab4817f3eff2293748 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am f5aea702: Merge "Fix the premium-SMS UI." into jb-mr1-dev

* commit 'f5aea70215c993c3ddcf1455ef9405f4a729240d':
Fix the premium-SMS UI.
473e8f685574ddff844d4eddcf7ee6c328569c05 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am 5250a7fb: am f5aea702: Merge "Fix the premium-SMS UI." into jb-mr1-dev

* commit '5250a7fba832323c4e34c31d24f31d2afa725577':
Fix the premium-SMS UI.
d1816faeedf2c7e9ca6dda6d3c7e39106fe6f415 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am a7700794: Use a gservices provided file for premium-sms data

* commit 'a7700794b7fbe667e87d72d3117ae3a4d2501313':
Use a gservices provided file for premium-sms data
5250a7fba832323c4e34c31d24f31d2afa725577 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am f5aea702: Merge "Fix the premium-SMS UI." into jb-mr1-dev

* commit 'f5aea70215c993c3ddcf1455ef9405f4a729240d':
Fix the premium-SMS UI.
f5aea70215c993c3ddcf1455ef9405f4a729240d 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix the premium-SMS UI." into jb-mr1-dev
9d6d05b8f25d831ee4df862d30f3c1cbf377962e 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am 91bd62c6: am a7700794: Use a gservices provided file for premium-sms data

* commit '91bd62c65b414cffe5fee52dff8b388195f7baf7':
Use a gservices provided file for premium-sms data
b574313d23ff00b8e498da0134747a054bf77bd5 29-Sep-2012 Jean-Baptiste Queru <jbq@google.com> am 3ada5b8c: Merge from jb-mr1-aah-dev

* commit '3ada5b8ce0b1e2457f8842cc33214faa9eca3178':
91bd62c65b414cffe5fee52dff8b388195f7baf7 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am a7700794: Use a gservices provided file for premium-sms data

* commit 'a7700794b7fbe667e87d72d3117ae3a4d2501313':
Use a gservices provided file for premium-sms data
3ada5b8ce0b1e2457f8842cc33214faa9eca3178 28-Sep-2012 Jean-Baptiste Queru <jbq@google.com> Merge from jb-mr1-aah-dev

Change-Id: I7260c85c5b14dede0d30a8ecc108026c67072243
a7700794b7fbe667e87d72d3117ae3a4d2501313 25-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Use a gservices provided file for premium-sms data

Allows simple full-file replacement of the data rather than trying to send
country specific data to different devices.
bug:7221402

Change-Id: Ibdac97b39b66e01e62c845fb9c6732fafd99f1c9
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
3cc01cec8d06f7630bae2a11ab057839de79e6c2 26-Sep-2012 Jeff Brown <jeffbrown@google.com> am 6c8221a2: am 04160ae3: Merge "Update references to migrated global settings." into jb-mr1-dev

* commit '6c8221a25dae13b209b9765b8b2200de1a077436':
Update references to migrated global settings.
6c8221a25dae13b209b9765b8b2200de1a077436 26-Sep-2012 Jeff Brown <jeffbrown@google.com> am 04160ae3: Merge "Update references to migrated global settings." into jb-mr1-dev

* commit '04160ae3ea77ea98d07cc55efbb6370973dd0d22':
Update references to migrated global settings.
0b01e3541d611ae0b48683acdee5ea2a8f45d4c4 26-Sep-2012 Jeff Brown <jeffbrown@google.com> am 04160ae3: Merge "Update references to migrated global settings." into jb-mr1-dev

* commit '04160ae3ea77ea98d07cc55efbb6370973dd0d22':
Update references to migrated global settings.
04160ae3ea77ea98d07cc55efbb6370973dd0d22 26-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge "Update references to migrated global settings." into jb-mr1-dev
97642542caec68e050fe74ea3f053480c759978f 26-Sep-2012 Wink Saville <wink@google.com> am 1636e061: (-s ours) am c90b7d25: Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)

* commit '1636e061e0036894f6f051374045e8aafe79cfa5':
Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)
b8d0e5993929ca9ecd29f406ae5f39a3e450e89b 25-Sep-2012 Jeff Brown <jeffbrown@google.com> Update references to migrated global settings.

Bug: 7231172
Change-Id: Id18cce843899452bd171d5eeff99b48ca65dfb1e
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
d362d35969d88e76925534e6db09fab33966d8f1 25-Sep-2012 Wink Saville <wink@google.com> am c90b7d25: (-s ours) Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)

* commit 'c90b7d250dae1931a603cc052bd90bc34c070f1b':
Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)
1636e061e0036894f6f051374045e8aafe79cfa5 25-Sep-2012 Wink Saville <wink@google.com> am c90b7d25: Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)

* commit 'c90b7d250dae1931a603cc052bd90bc34c070f1b':
Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)
78df2f47241a498bbd919c4c19a44b824e5dc2d6 25-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Fix the premium-SMS UI.

Add instructions to undo permanent selections.
bug:7205024

Change-Id: I970e41019c66ef77ed62c9cd017571e308744380
rc/java/com/android/internal/telephony/SMSDispatcher.java
c90b7d250dae1931a603cc052bd90bc34c070f1b 25-Sep-2012 Wink Saville <wink@google.com> Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)

This is already in AOSP and Master, back porting to JB-MR1.

Bug: 6983013
Change-Id: Ibda258e632ecff79f22eebe093df0061ed4cdf4d
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
9f7a7d7b51ccb89911a3975b9034ddc18d214107 25-Sep-2012 Wink Saville <wink@google.com> am b26d006f: am f0b6e3ed: am 5607e47c: Merge "Telephony: Fix npe when making a call after ejecting card"

* commit 'b26d006f08aa1967599cb5461069fc0ea0a7ae7f':
Telephony: Fix npe when making a call after ejecting card
b26d006f08aa1967599cb5461069fc0ea0a7ae7f 25-Sep-2012 Wink Saville <wink@google.com> am f0b6e3ed: am 5607e47c: Merge "Telephony: Fix npe when making a call after ejecting card"

* commit 'f0b6e3ed7881f0a92281684e70c6249d0898338c':
Telephony: Fix npe when making a call after ejecting card
f0b6e3ed7881f0a92281684e70c6249d0898338c 25-Sep-2012 Wink Saville <wink@google.com> am 5607e47c: Merge "Telephony: Fix npe when making a call after ejecting card"

* commit '5607e47cac5ac23459539bbb6f75e2507d4e03b7':
Telephony: Fix npe when making a call after ejecting card
5607e47cac5ac23459539bbb6f75e2507d4e03b7 25-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Fix npe when making a call after ejecting card"
d6e488984bd7ee461ffa533f403cfe917b6dfd1f 25-Sep-2012 John Wang <johnwang@google.com> am 814e478b: am f4bfdd29: Merge "Handle mmi dialing number ending with #." into jb-mr1-dev

* commit '814e478b413dff2236a2ca5570a3ee0d15166ec6':
Handle mmi dialing number ending with #.
814e478b413dff2236a2ca5570a3ee0d15166ec6 25-Sep-2012 John Wang <johnwang@google.com> am f4bfdd29: Merge "Handle mmi dialing number ending with #." into jb-mr1-dev

* commit 'f4bfdd2941bdee6927a5300556a5c1d490bbff33':
Handle mmi dialing number ending with #.
f4bfdd2941bdee6927a5300556a5c1d490bbff33 25-Sep-2012 John Wang <johnwang@google.com> Merge "Handle mmi dialing number ending with #." into jb-mr1-dev
9225578f29e449d30380fcf71defb1ac7e8a59db 25-Sep-2012 John Wang <johnwang@google.com> Handle mmi dialing number ending with #.

According to TS 22.030 6.5.2 "Structure of the MMI", the dialing
number should not ending with #. But it is okay to have # in the
middle of dialing number.

bug:6410387
Change-Id: I1838d7012a132f27a3a879e1d34a9c3b04844def
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
998d102f40d26c06824c5f7be7dc92a08044dc77 25-Sep-2012 John Wang <johnwang@google.com> am f82cca88: am 1b5c213b: Merge "Make updateSpnDisplay cover out various scenarios." into jb-mr1-dev

* commit 'f82cca88a11f79d93231b76b246d2daddd82a70f':
Make updateSpnDisplay cover out various scenarios.
f82cca88a11f79d93231b76b246d2daddd82a70f 25-Sep-2012 John Wang <johnwang@google.com> am 1b5c213b: Merge "Make updateSpnDisplay cover out various scenarios." into jb-mr1-dev

* commit '1b5c213b68a9d7ab4af0263161ba9eb91668dedf':
Make updateSpnDisplay cover out various scenarios.
1b5c213b68a9d7ab4af0263161ba9eb91668dedf 25-Sep-2012 John Wang <johnwang@google.com> Merge "Make updateSpnDisplay cover out various scenarios." into jb-mr1-dev
60e7f68c5f73b06fd5b603c331fc24b9d329de6b 24-Sep-2012 John Wang <johnwang@google.com> Make updateSpnDisplay cover out various scenarios.

Set showPlmn and plmn to correct values in emergency mode,
out of service, and airplane mode.

bug:7134445
Change-Id: Ic95e352dbfad3c6e2b62119ce288ce69dc83b856
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
a2da94751bbf8718bbaa4e181eb7d0633c1ab0f7 24-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe when making a call after ejecting card

Bug: 6983013
Change-Id: Ibda258e632ecff79f22eebe093df0061ed4cdf4d
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
db0cad50c2e70eb5e56b5f8ceaada9dd4d0fb0b7 24-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am d9246ed3: am ee7b6094: Add gservices-controllable rules policy.

* commit 'd9246ed30ec0e5626cc11dcff12e75f31622d0ed':
Add gservices-controllable rules policy.
d9246ed30ec0e5626cc11dcff12e75f31622d0ed 24-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am ee7b6094: Add gservices-controllable rules policy.

* commit 'ee7b6094d4f3d4c641e54246aec8f61349d6e9d0':
Add gservices-controllable rules policy.
ee7b6094d4f3d4c641e54246aec8f61349d6e9d0 22-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Add gservices-controllable rules policy.

Allows using SIM country, network country or the most restrictive of both.
bug:7205426

Change-Id: I4f7ec6ef884d8cc3665fe60290c167740f17d9e7
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
2cc531564a0047a7c69e4651d83ca7a96926236f 21-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am a09da553: am 5d875796: Fix string in sms_short_code confirm dialog.

* commit 'a09da553297e6ca61e878bd03b8ed177e0bc1fbf':
Fix string in sms_short_code confirm dialog.
a09da553297e6ca61e878bd03b8ed177e0bc1fbf 21-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am 5d875796: Fix string in sms_short_code confirm dialog.

* commit '5d875796122cdd8a7004e8e3964b20b5c65a31a1':
Fix string in sms_short_code confirm dialog.
5d875796122cdd8a7004e8e3964b20b5c65a31a1 20-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Fix string in sms_short_code confirm dialog.

Typo used the wrong string giving "allow, allow" options after toggling
the remember-my-choice checkbox.

bug:7198380
Change-Id: Ia9bf3da44a1153838c618bd8c6b722235629e853
rc/java/com/android/internal/telephony/SMSDispatcher.java
08bdb71add4714aaaa88d2aa3e7e59649c819801 20-Sep-2012 Wink Saville <wink@google.com> am 9f66e1bb: am 167a784e: am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '9f66e1bbc9bcec9e80ed50435c79b61afe9c56fb':
Telephony: Fix npe in IccPhoneBookInterfaceManager
9f66e1bbc9bcec9e80ed50435c79b61afe9c56fb 20-Sep-2012 Wink Saville <wink@google.com> am 167a784e: am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '167a784eb797781d89049a9fbc90aa6684fcb7e5':
Telephony: Fix npe in IccPhoneBookInterfaceManager
167a784eb797781d89049a9fbc90aa6684fcb7e5 20-Sep-2012 Wink Saville <wink@google.com> am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit 'ed6a91f6b4fb5e33406034f13d21897de70b506b':
Telephony: Fix npe in IccPhoneBookInterfaceManager
ed6a91f6b4fb5e33406034f13d21897de70b506b 20-Sep-2012 Wink Saville <wink@google.com> am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '7b5e41b5aca925ef476bf670a1f65f1cb51bac83':
Telephony: Fix npe in IccPhoneBookInterfaceManager
7b5e41b5aca925ef476bf670a1f65f1cb51bac83 20-Sep-2012 Wink Saville <wink@google.com> am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '54cadb79d3d2ef5be670d2fbd6e566f0a5f7f428':
Telephony: Fix npe in IccPhoneBookInterfaceManager
54cadb79d3d2ef5be670d2fbd6e566f0a5f7f428 20-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"
ba06d1becedde6ee94229154b2e493d6d4a3ad53 20-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe in IccPhoneBookInterfaceManager

Create new interface to get current uicc app type from
phone and use that

Bug: 7167839
Change-Id: I4787985593918c660a254c9826734cf9c963bff0
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/PhoneBase.java
d59393d4dbd12fedbf178f8357c54affa17ab8a4 18-Sep-2012 Wink Saville <wink@google.com> am ebef0ba6: am 4a6e52f2: am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit 'ebef0ba67576c4d137f4c338a91eb571f4f963b3':
Telephony: Add null pointer checks in UiccCardApplicaton.update
ebef0ba67576c4d137f4c338a91eb571f4f963b3 18-Sep-2012 Wink Saville <wink@google.com> am 4a6e52f2: am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '4a6e52f2f5db93fdf339de7e92e0a23659985019':
Telephony: Add null pointer checks in UiccCardApplicaton.update
4a6e52f2f5db93fdf339de7e92e0a23659985019 18-Sep-2012 Wink Saville <wink@google.com> am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '38953327bdab42c3975528ed416a6af0d4273a7f':
Telephony: Add null pointer checks in UiccCardApplicaton.update
38953327bdab42c3975528ed416a6af0d4273a7f 18-Sep-2012 Wink Saville <wink@google.com> am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '5d9a7e454c5c71ef15527f06278b18996d0cc191':
Telephony: Add null pointer checks in UiccCardApplicaton.update
5d9a7e454c5c71ef15527f06278b18996d0cc191 18-Sep-2012 Wink Saville <wink@google.com> am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit 'f667af23e53602cf0b7f1400ea0b7564764bf5ca':
Telephony: Add null pointer checks in UiccCardApplicaton.update
f667af23e53602cf0b7f1400ea0b7564764bf5ca 18-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"
f48d70f5336408e7910c4868b8ede5db8354727a 17-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Add null pointer checks in UiccCardApplicaton.update

Bug: 7174617
Change-Id: Iad5ef2352ea5e6ef4ede87214036ef27cc6a95ef
rc/java/com/android/internal/telephony/UiccCardApplication.java
f497ae4200adedf0cff3c451603c557ad6a8d8f2 17-Sep-2012 Jake Hamby <jhamby@google.com> am 7fb2d14f: am 4658a1a8: Add support for per-package policy for sending premium SMS.

* commit '7fb2d14fe0c1cace30af881c5c9af9b8be85f57e':
Add support for per-package policy for sending premium SMS.
c210642d8d29fc649d51a97487d5dc1f2f52e9cf 17-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am 24f66460: am a72f9451: Merge "Use the same logic in isDataPossible as GSM." into jb-mr1-dev

* commit '24f664604dc0520d123f6b4b69d6a395011ad347':
Use the same logic in isDataPossible as GSM.
7fb2d14fe0c1cace30af881c5c9af9b8be85f57e 16-Sep-2012 Jake Hamby <jhamby@google.com> am 4658a1a8: Add support for per-package policy for sending premium SMS.

* commit '4658a1a8c23111d5cc89feb040ce547a7b65dfb0':
Add support for per-package policy for sending premium SMS.
4658a1a8c23111d5cc89feb040ce547a7b65dfb0 06-Sep-2012 Jake Hamby <jhamby@google.com> Add support for per-package policy for sending premium SMS.

The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.

Bug: 5513975
Change-Id: I82731bbc6631ac79b1b5d1d9b1f96c7100ab20cf
rc/java/com/android/internal/telephony/ISms.aidl
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
5d019c4aacc4abf86d1331124a47474f1d1e69bb 14-Sep-2012 Wink Saville <wink@google.com> am 03cbf031: am aa810543: am f5082fd1: am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit '03cbf0312c2fb942f9e356303c2e6c466a668d88':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
4d50cbff267ef0618d814f703ec6abda34b118d5 14-Sep-2012 Geremy Condra <gcondra@google.com> am 82a05d56: am 71592446: Merge "Add event logging for SMS" into jb-mr1-dev

* commit '82a05d568a018a91778977adcbfec4c1f415e4d3':
Add event logging for SMS
24f664604dc0520d123f6b4b69d6a395011ad347 14-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am a72f9451: Merge "Use the same logic in isDataPossible as GSM." into jb-mr1-dev

* commit 'a72f94510f726ba8692bfbf11b7c489c80da9a08':
Use the same logic in isDataPossible as GSM.
a72f94510f726ba8692bfbf11b7c489c80da9a08 14-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Use the same logic in isDataPossible as GSM." into jb-mr1-dev
03cbf0312c2fb942f9e356303c2e6c466a668d88 14-Sep-2012 Wink Saville <wink@google.com> am aa810543: am f5082fd1: am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit 'aa810543a4084d2aa80e7f671483bc390e74c1a8':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
aa810543a4084d2aa80e7f671483bc390e74c1a8 14-Sep-2012 Wink Saville <wink@google.com> am f5082fd1: am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit 'f5082fd198921c62a17ce10f9fb503af944949a9':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
f5082fd198921c62a17ce10f9fb503af944949a9 14-Sep-2012 Wink Saville <wink@google.com> am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit '38a7ed0d3d355373ae7709e8292c636e48882124':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
38a7ed0d3d355373ae7709e8292c636e48882124 14-Sep-2012 Wink Saville <wink@google.com> am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit '4a8440506c9e31a3d65ba64664af3b2ad18b2fa1':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
4a8440506c9e31a3d65ba64664af3b2ad18b2fa1 14-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"
22e3d13998dd36f78d14b3c5b8508ad6be689629 14-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED

Some radios/rils lose initial UNSOL_SIM_STATUS_CHANGED indication
(because Telephony wasn't connected to rild when the event happened).
Query for sim_status on power_on.

Bug: 7116148
Change-Id: I448f1b939837a61b7b060068ea1062947a5f6138
rc/java/com/android/internal/telephony/uicc/UiccController.java
82a05d568a018a91778977adcbfec4c1f415e4d3 14-Sep-2012 Geremy Condra <gcondra@google.com> am 71592446: Merge "Add event logging for SMS" into jb-mr1-dev

* commit '71592446731992ac8bd61fe5804455d1b17335b9':
Add event logging for SMS
71592446731992ac8bd61fe5804455d1b17335b9 14-Sep-2012 Geremy Condra <gcondra@google.com> Merge "Add event logging for SMS" into jb-mr1-dev
2029d86b5aebd03f7acbd249a4e2e4f65ec37d47 08-Sep-2012 Geremy Condra <gcondra@google.com> Add event logging for SMS

This allows us to gather metrics about unwanted SMS use on
dogfood devices.

Change-Id: I00820b12219dde918d6d7adee3ccf03c576424c9
rc/java/com/android/internal/telephony/EventLogTags.logtags
rc/java/com/android/internal/telephony/SMSDispatcher.java
3a488f8e6d690dec33715bdd1e6c577d056793b4 13-Sep-2012 John Wang <johnwang@google.com> am 1ba4c5a8: am f022afff: am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

* commit '1ba4c5a810ea6b50bde1c86309b87950341f047d':
resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
a8dea337a63a297ca1d7a10dc274a350980d5a5f 13-Sep-2012 Wink Saville <wink@google.com> am bf1f37c3: am b840987a: Use Settings.Global instead of Settings.Secure in a few places.

* commit 'bf1f37c378f73b56b200d69950a5f761646f443e':
Use Settings.Global instead of Settings.Secure in a few places.
1ba4c5a810ea6b50bde1c86309b87950341f047d 13-Sep-2012 John Wang <johnwang@google.com> am f022afff: am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

* commit 'f022afffe951c56fd2c1fda40b0e276fd21edb20':
resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
f022afffe951c56fd2c1fda40b0e276fd21edb20 13-Sep-2012 John Wang <johnwang@google.com> am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

* commit '29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b':
resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
abd59738ceb9d21b8bf159d4625ea9b0ade873ee 13-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Use the same logic in isDataPossible as GSM.

Could not reproduce the problem, but this does seem like a potential problem.
bug:5870919

Change-Id: Iabee1ef20b56ec00dae8acbce32a876d51125a66
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b 13-Sep-2012 John Wang <johnwang@google.com> resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

Change-Id: I2ee98d03fb1e6e3f5c2325d59d54621fa97eb6ff
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
bf1f37c378f73b56b200d69950a5f761646f443e 13-Sep-2012 Wink Saville <wink@google.com> am b840987a: Use Settings.Global instead of Settings.Secure in a few places.

* commit 'b840987a39e7149c1364739696977089cd53814d':
Use Settings.Global instead of Settings.Secure in a few places.
b840987a39e7149c1364739696977089cd53814d 13-Sep-2012 Wink Saville <wink@google.com> Use Settings.Global instead of Settings.Secure in a few places.

There are more but the PDP_WATCHDOG_POLL_INTERVAL_MS is causing
excessive logging so changing it and others in the DCT as well as
in GsmSST.

The uses in PhoneFactory, SmsUsageMonitor, PhoneBase,
CdmaLteServiceStateTracker, CdmaSubscriptionSourceManager and
CdmaServiceStateTracker need to be looked at also, will fix
those next.

Change-Id: I8c29e7ce5ad6aecc824d3c0d71fa6cfca0eac777
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
3f455083f38a064ac68778310aef2970432e47ed 11-Sep-2012 Wink Saville <wink@google.com> am 3caca41a: am e08bcc94: am f8a1f90c: am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit '3caca41abdaa3988f8baf58ddc9e67e72f1aefd1':
Telephony: Log parameters for facility lock operations.
95f7536b4efc581b95cf65336cb91bb135d3313d 11-Sep-2012 Wink Saville <wink@google.com> am 3c0b1794: am 565013a7: Merge commit \'599f207f\' into fix-merge-conflict

* commit '3c0b1794a12a3d4652b433dd379982adff6986bb':
Telephony: Remove CdmaLteUicc objects
1785f3cdaabb7a996bc748845fe9fdce5e6c2cf1 11-Sep-2012 Tom Taylor <tomtaylor@google.com> am 46a3b352: am 7a299a45: Fix build

* commit '46a3b352589e64a5a6e4141654550bdb632419c9':
Fix build
3caca41abdaa3988f8baf58ddc9e67e72f1aefd1 08-Sep-2012 Wink Saville <wink@google.com> am e08bcc94: am f8a1f90c: am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit 'e08bcc948be9f8cb966da0814d7cf17109cfdb95':
Telephony: Log parameters for facility lock operations.
e08bcc948be9f8cb966da0814d7cf17109cfdb95 08-Sep-2012 Wink Saville <wink@google.com> am f8a1f90c: am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit 'f8a1f90c98b7252ca8fdc9df9166c6d62eb16e68':
Telephony: Log parameters for facility lock operations.
f8a1f90c98b7252ca8fdc9df9166c6d62eb16e68 08-Sep-2012 Wink Saville <wink@google.com> am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit '511d4b684ccaa6a2b572c331e4bc5c76a919e4a7':
Telephony: Log parameters for facility lock operations.
511d4b684ccaa6a2b572c331e4bc5c76a919e4a7 08-Sep-2012 Wink Saville <wink@google.com> am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit '713a658e9d60a94c96b98d94424a61c708525c04':
Telephony: Log parameters for facility lock operations.
713a658e9d60a94c96b98d94424a61c708525c04 08-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Log parameters for facility lock operations."
88e9c9700fbb6119c2564fb7173821c84b360d07 29-Aug-2012 Abhishek Adappa <aadappa@codeaurora.org> Telephony: Log parameters for facility lock operations.

Change-Id: Ib834928ffd76a0f0e4fa0552cc27a09ccb4cd987
rc/java/com/android/internal/telephony/RIL.java
3c0b1794a12a3d4652b433dd379982adff6986bb 08-Sep-2012 Wink Saville <wink@google.com> am 565013a7: Merge commit \'599f207f\' into fix-merge-conflict

* commit '565013a713156a0ddcc46dc3a0077e4c268ce272':
Telephony: Remove CdmaLteUicc objects
565013a713156a0ddcc46dc3a0077e4c268ce272 08-Sep-2012 Wink Saville <wink@google.com> Merge commit '599f207f' into fix-merge-conflict

* commit '599f207f':
Telephony: Remove CdmaLteUicc objects

Change-Id: I5d63ea7edbcb1e7fe4010bcb3e5c9d6c961827d6
599f207f9139a0d8c2251cc43757070eef1ae224 08-Sep-2012 Wink Saville <wink@google.com> am db1b0c54: am 1d40e34c: Merge "Telephony: Remove CdmaLteUicc objects"

* commit 'db1b0c54ffa990afeac24cc54d8b1992f1aa3a85':
Telephony: Remove CdmaLteUicc objects
db1b0c54ffa990afeac24cc54d8b1992f1aa3a85 08-Sep-2012 Wink Saville <wink@google.com> am 1d40e34c: Merge "Telephony: Remove CdmaLteUicc objects"

* commit '1d40e34c74e2874114855db681aafba5676ae25c':
Telephony: Remove CdmaLteUicc objects
1d40e34c74e2874114855db681aafba5676ae25c 08-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Remove CdmaLteUicc objects"
46a3b352589e64a5a6e4141654550bdb632419c9 08-Sep-2012 Tom Taylor <tomtaylor@google.com> am 7a299a45: Fix build

* commit '7a299a45d1132bfecfee02a1a71427dfbbadc72e':
Fix build
7a299a45d1132bfecfee02a1a71427dfbbadc72e 08-Sep-2012 Tom Taylor <tomtaylor@google.com> Fix build

Added a new column to mms.

Change-Id: I0ebe6c0b9e736cc90ed8392872dae2da8ec730ce
rc/java/android/provider/Telephony.java
e287feac673ff68565b766e0e463d105fa9cef9d 10-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Remove CdmaLteUicc objects

-Pass IccCard object to GsmMmiCode
-Create IccCardProxy
-Make IccCard an interface and pass instance of IccCardProxy to
external applications (PhoneApp). IccCardProxy will use internal
UiccCard to map Icc requests to current active application on
UiccCard to maintain backwards compatibility for external
applications
-Add documentation to UiccController

The primary advantage of UiccController is that we can work with
multiple uicc applications at the same time. And that is a
requirement for modes like Cdma/Lte. The existing code supports
Cdma/Lte only partially and with guessing on modem side. However,
some things modem can guess, while others - it can't.

For instance, when a user tries to edit the fdn list the current
code will pass ef_id for fdn (0x6F3B). But the modem will have no
clue which fdn list the user wants to edit (csim or usim, both
have path 7FFF), and it's impossible for modem to guess correctly
all the time. All the modem can do is try to be consistent and
hope another device is doing same things. Imagine you bring your
card from another Cdma/Lte device to your new Cdma/Lte device:
if this modem uses different fdn file, it won't work as all
existing entries won't be there.

Another example is when the modem's guess is wrong for files like
csim/ef_li (7FFF 6F3A) versus usim/ef_adn (7FFF 6F3A). They have
same ef_ids so Android really should pass aid of the app it wants
to access. Without aids there is no way modem can know for sure
which file Android wants to read! However, in the current code
even Android doesn't know which aid it wants to read file from
since CdmaLteRecords has only 1 aid.

All of these problems cause more and more hacks, both in the modem
and in Android side. UiccController cleans up current code and
provides framework to work with multiple Uicc applications at the
same time.

Change-Id: I60216887b14140bdf833a8ed579ba16cad932bdc
rc/java/com/android/internal/telephony/CsimFileHandler.java
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/IccCardApplication.java
rc/java/com/android/internal/telephony/IccCardApplicationStatus.java
rc/java/com/android/internal/telephony/IccCardProxy.java
rc/java/com/android/internal/telephony/IccCardStatus.java
rc/java/com/android/internal/telephony/IccConstants.java
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/UiccCard.java
rc/java/com/android/internal/telephony/UiccCardApplication.java
rc/java/com/android/internal/telephony/UsimFileHandler.java
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccRecords.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimFileHandler.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMFileHandler.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/ims/IsimFileHandler.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
rc/java/com/android/internal/telephony/uicc/README
rc/java/com/android/internal/telephony/uicc/UiccController.java
bb7b2345fdd181be2fc4b8bdf402c43d65e97338 06-Sep-2012 Wink Saville <wink@google.com> am c90c3893: am 2f81ec63: am 3d5e9bd1: am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit 'c90c3893ef4ef69e2f5f9a926a3be05526422c4e':
Omitting Big Endian caused corrupt characters
c90c3893ef4ef69e2f5f9a926a3be05526422c4e 06-Sep-2012 Wink Saville <wink@google.com> am 2f81ec63: am 3d5e9bd1: am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit '2f81ec63398ad4b0af33e5233411a4a1e3680bd7':
Omitting Big Endian caused corrupt characters
2f81ec63398ad4b0af33e5233411a4a1e3680bd7 06-Sep-2012 Wink Saville <wink@google.com> am 3d5e9bd1: am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit '3d5e9bd1a4ea294ebb85e87ef5a8aed687ba9ade':
Omitting Big Endian caused corrupt characters
3d5e9bd1a4ea294ebb85e87ef5a8aed687ba9ade 06-Sep-2012 Wink Saville <wink@google.com> am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit '8566fabf80997b1effde2fdaad3ff06223a5f326':
Omitting Big Endian caused corrupt characters
8566fabf80997b1effde2fdaad3ff06223a5f326 06-Sep-2012 Wink Saville <wink@google.com> am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit 'e9260aec3d196e9c9b94962289f177ae39283eb4':
Omitting Big Endian caused corrupt characters
e9260aec3d196e9c9b94962289f177ae39283eb4 06-Sep-2012 Wink Saville <wink@google.com> Merge "Omitting Big Endian caused corrupt characters"
9f1860d5596f79d74fa4ecf78c0dd1d8253fc5f9 18-Jul-2012 Pierre Fröjd <pierre.frojd.x@sonyericsson.com> Omitting Big Endian caused corrupt characters

When sending a terminal reponse to SIM containing unicode
characters, big endian must be explicitly stated to
avoid corrupt characters.

Change-Id: Iac4dcadfd860b5de15ad2a65c4ccdf3fae9292d4
rc/java/com/android/internal/telephony/cat/ResponseData.java
b77a6a0f4ffe788cee532da78f5283b8ea14843b 05-Sep-2012 Wink Saville <wink@google.com> am 15855915: am dec905e7: am b66683d8: am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit '15855915242ba74f67ed6ddba4cd4271d3909c84':
Telephony: Fixed problem with short operator name
15855915242ba74f67ed6ddba4cd4271d3909c84 05-Sep-2012 Wink Saville <wink@google.com> am dec905e7: am b66683d8: am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit 'dec905e7465287f21b191889da07f331890f43c9':
Telephony: Fixed problem with short operator name
dec905e7465287f21b191889da07f331890f43c9 05-Sep-2012 Wink Saville <wink@google.com> am b66683d8: am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit 'b66683d899c3e58f84d8369ced23e3c4f6e5fd99':
Telephony: Fixed problem with short operator name
b66683d899c3e58f84d8369ced23e3c4f6e5fd99 05-Sep-2012 Wink Saville <wink@google.com> am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit '5af6cdd62a9c88371ef5defafa7fd49780cf8ef3':
Telephony: Fixed problem with short operator name
5af6cdd62a9c88371ef5defafa7fd49780cf8ef3 05-Sep-2012 Wink Saville <wink@google.com> am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit '7ac8d8026b997141d106762574478eb9daaf3f38':
Telephony: Fixed problem with short operator name
8606d9932c7527c24379f2e01c9f8b54323220ef 05-Sep-2012 Wink Saville <wink@google.com> am 7c1366fd: am b142fa0d: am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit '7c1366fdb4a04d99903cf5ce55348ce3a79cb6c7':
Handle the case when TP-PI reserved bits are set
7ac8d8026b997141d106762574478eb9daaf3f38 05-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Fixed problem with short operator name"
7c1366fdb4a04d99903cf5ce55348ce3a79cb6c7 05-Sep-2012 Wink Saville <wink@google.com> am b142fa0d: am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit 'b142fa0d4ec00ebb7df1b6657f56a57f0fbfd7fa':
Handle the case when TP-PI reserved bits are set
b142fa0d4ec00ebb7df1b6657f56a57f0fbfd7fa 05-Sep-2012 Wink Saville <wink@google.com> am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit 'ad10642b1f79079148211dade13dce276f9dd93f':
Handle the case when TP-PI reserved bits are set
ad10642b1f79079148211dade13dce276f9dd93f 05-Sep-2012 Wink Saville <wink@google.com> am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit '380be4a4fa0290f4b86309b22778839fab8c1b5e':
Handle the case when TP-PI reserved bits are set
380be4a4fa0290f4b86309b22778839fab8c1b5e 05-Sep-2012 Wink Saville <wink@google.com> am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit '6fe2a8a4ab453dd72daf24798ef1bc460840b136':
Handle the case when TP-PI reserved bits are set
6fe2a8a4ab453dd72daf24798ef1bc460840b136 05-Sep-2012 Wink Saville <wink@google.com> Merge "Handle the case when TP-PI reserved bits are set"
56c949ded0e352444806dd04bbca1895a2c75a9b 04-Sep-2012 Huanze Lan <huanze.lan@sonyericsson.com> Handle the case when TP-PI reserved bits are set

Discard settings according to 3GPP TS 23.040,
9.2.3.27 TP-Parameter-Indicator (TP-PI).

Usually operators will set this byte to 0 to indicate
there is no more data, but a few operators sets a
reserved bit to 1 to indicate there is no more data instead,
so we need to handle this case also.

Change-Id: I58abc2473c79b65795be186182927c603b35305e
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
9386a53046f7cb9137b958c8d255306248c881cd 18-Jul-2012 Johan Redestig <johan.redestig@sonymobile.com> Telephony: Fixed problem with short operator name

This patch solves the problem with erroneous service
provider name that is visible in status row. The name
of the service provider is one character short. This
happen when loading the service provider name from
EF_SPN_CPHS or EF_SPN_SHORT_CPHS.

Change-Id: I54df69b9d46bc90028581d16df72f1fd4757c913
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
33fb3eec7ceb75e0326c4f623929b0030eab04b1 01-Sep-2012 Jake Hamby <jhamby@google.com> am d215ad0a: am dfc287a2: am ea36fc2a: am 08a57a4c: am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."

* commit 'd215ad0abad5a5236a79169bba5da4548b6fe757':
Fix CDMA decoding of multipart UTF-16 SMS messages.
d215ad0abad5a5236a79169bba5da4548b6fe757 01-Sep-2012 Jake Hamby <jhamby@google.com> am dfc287a2: am ea36fc2a: am 08a57a4c: am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."

* commit 'dfc287a2e2634b8ad0d98c9f5e1e390b8dc28eb1':
Fix CDMA decoding of multipart UTF-16 SMS messages.
dfc287a2e2634b8ad0d98c9f5e1e390b8dc28eb1 01-Sep-2012 Jake Hamby <jhamby@google.com> am ea36fc2a: am 08a57a4c: am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."

* commit 'ea36fc2a83fd4925c36b46af3ec2b95e7bd8a7e2':
Fix CDMA decoding of multipart UTF-16 SMS messages.
ea36fc2a83fd4925c36b46af3ec2b95e7bd8a7e2 01-Sep-2012 Jake Hamby <jhamby@google.com> am 08a57a4c: am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."

* commit '08a57a4c23056b2abbf6c86c1e3fa6fee8d20e67':
Fix CDMA decoding of multipart UTF-16 SMS messages.
08a57a4c23056b2abbf6c86c1e3fa6fee8d20e67 01-Sep-2012 Jake Hamby <jhamby@google.com> am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."

* commit '5b7a88ea46ba6d02369ca6ec030df7f2df31b644':
Fix CDMA decoding of multipart UTF-16 SMS messages.
5b7a88ea46ba6d02369ca6ec030df7f2df31b644 01-Sep-2012 Jake Hamby <jhamby@google.com> Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."
b2deb7e4c88a4000d66c3a8f711084515b9e0f57 31-Aug-2012 Jake Hamby <jhamby@google.com> Fix CDMA decoding of multipart UTF-16 SMS messages.

Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: I4000fa2f4703b39e5ed7e5bd8490828303ef8979
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
ests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
6274278cb0b9ba6dbadd4c0da163046b87d5b79e 31-Aug-2012 Jake Hamby <jhamby@google.com> am 035922a7: am ac1701ba: am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.

* commit '035922a7a159ec6e75369bd010031aee8b5f61af':
Fix CDMA decoding of multipart UTF-16 SMS messages.
035922a7a159ec6e75369bd010031aee8b5f61af 31-Aug-2012 Jake Hamby <jhamby@google.com> am ac1701ba: am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.

* commit 'ac1701bae6a076fe92b05875aa94b6bef45838c1':
Fix CDMA decoding of multipart UTF-16 SMS messages.
ac1701bae6a076fe92b05875aa94b6bef45838c1 31-Aug-2012 Jake Hamby <jhamby@google.com> am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.

* commit '115632cc56f813bd21543f8532c763d7d2968046':
Fix CDMA decoding of multipart UTF-16 SMS messages.
115632cc56f813bd21543f8532c763d7d2968046 31-Aug-2012 Jake Hamby <jhamby@google.com> Fix CDMA decoding of multipart UTF-16 SMS messages.

Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: I4000fa2f4703b39e5ed7e5bd8490828303ef8979
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
ests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
3305a9c2dc724fa3da1ea8336df3f555f9a3b3f8 31-Aug-2012 Wink Saville <wink@google.com> am a6c7689a: am 7f7d82aa: am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit 'a6c7689af4b8ca15e19f272525023522fc1f98fa':
WspTypeDecoder: fixed decoding of content parameters
a6c7689af4b8ca15e19f272525023522fc1f98fa 31-Aug-2012 Wink Saville <wink@google.com> am 7f7d82aa: am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit '7f7d82aac56022880f613772ed4a90738075c843':
WspTypeDecoder: fixed decoding of content parameters
7f7d82aac56022880f613772ed4a90738075c843 31-Aug-2012 Wink Saville <wink@google.com> am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit '50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5':
WspTypeDecoder: fixed decoding of content parameters
50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5 31-Aug-2012 Wink Saville <wink@google.com> am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit 'cc0e54506132e42f5e0ca2cfee0c399ba49ba149':
WspTypeDecoder: fixed decoding of content parameters
cc0e54506132e42f5e0ca2cfee0c399ba49ba149 31-Aug-2012 Wink Saville <wink@google.com> Merge "WspTypeDecoder: fixed decoding of content parameters"
3662c3f0964ee03b140173b8653410212bfc0f58 31-Aug-2012 Dianne Hackborn <hackbod@google.com> am 12442473: am cbbf6dee: Update to send sticky broadcasts to all users.

* commit '12442473a03f7f8fa87aa10080ca576c3d4fae89':
Update to send sticky broadcasts to all users.
12442473a03f7f8fa87aa10080ca576c3d4fae89 31-Aug-2012 Dianne Hackborn <hackbod@google.com> am cbbf6dee: Update to send sticky broadcasts to all users.

* commit 'cbbf6deee30d702e398939f4bb464f5e821f5e6c':
Update to send sticky broadcasts to all users.
cbbf6deee30d702e398939f4bb464f5e821f5e6c 30-Aug-2012 Dianne Hackborn <hackbod@google.com> Update to send sticky broadcasts to all users.

Change-Id: I66312f142348282b90fb63f8f20361446d56fb03
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
0fcf2097e7e217319b625d5dfc24aded06c02227 30-Aug-2012 Johan Redestig <johan.redestig@sonymobile.com> WspTypeDecoder: fixed decoding of content parameters

The removed condition prevented any parameter to have
0 as integer value.

Change-Id: Iaa8e106e49a51322c07f647f2f66bb7bd6055c89
rc/java/com/android/internal/telephony/WspTypeDecoder.java
ests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java
d4715bade6a8e1445c11f437365f89a64a0d796c 28-Aug-2012 Wink Saville <wink@google.com> am b38b9724: am 25a229f8: am 15e83e03: am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit 'b38b97244aaa9854d18cd13c22382360e211d19e':
Pull up Stats polling and Data Stall Alarm handling to DCT
736fc8728145a31a78b7b4e107cd37d456e8684a 28-Aug-2012 Wink Saville <wink@google.com> am cef96cdb: am 8739ce83: am 162971e5: am 820e9643: Merge "Plug a fd leak."

* commit 'cef96cdb5ea0c6d93838e0b8b0e308ba84d27841':
Plug a fd leak.
b38b97244aaa9854d18cd13c22382360e211d19e 28-Aug-2012 Wink Saville <wink@google.com> am 25a229f8: am 15e83e03: am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '25a229f871862521d0b15d9d042b36bd382a4a64':
Pull up Stats polling and Data Stall Alarm handling to DCT
25a229f871862521d0b15d9d042b36bd382a4a64 28-Aug-2012 Wink Saville <wink@google.com> am 15e83e03: am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '15e83e031027a1b161c4ee4f046e3cc1bdf0f92b':
Pull up Stats polling and Data Stall Alarm handling to DCT
15e83e031027a1b161c4ee4f046e3cc1bdf0f92b 28-Aug-2012 Wink Saville <wink@google.com> am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '935f0c7abbf49e71478c79ca32eae972fcca574d':
Pull up Stats polling and Data Stall Alarm handling to DCT
935f0c7abbf49e71478c79ca32eae972fcca574d 28-Aug-2012 Wink Saville <wink@google.com> Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"
cef96cdb5ea0c6d93838e0b8b0e308ba84d27841 28-Aug-2012 Wink Saville <wink@google.com> am 8739ce83: am 162971e5: am 820e9643: Merge "Plug a fd leak."

* commit '8739ce83da5d9e8887f7ec414614af3682c12c7a':
Plug a fd leak.
8739ce83da5d9e8887f7ec414614af3682c12c7a 28-Aug-2012 Wink Saville <wink@google.com> am 162971e5: am 820e9643: Merge "Plug a fd leak."

* commit '162971e54aa22f23b193ae5eb44ba12092fc0303':
Plug a fd leak.
162971e54aa22f23b193ae5eb44ba12092fc0303 28-Aug-2012 Wink Saville <wink@google.com> am 820e9643: Merge "Plug a fd leak."

* commit '820e964351b4d58c69ce40b64928911eb07efeeb':
Plug a fd leak.
820e964351b4d58c69ce40b64928911eb07efeeb 28-Aug-2012 Wink Saville <wink@google.com> Merge "Plug a fd leak."
cebb2cc576c652dd642d7f419532ec04e0f59d7d 31-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Pull up Stats polling and Data Stall Alarm handling to DCT

Code in GsmDataConnectionTracker and CdmaDataConnectionTracker is
very similar for maintaining data activity statistics and detecting
data stalls. So it can be moved up to the parent class.

Change-Id: I3ec63f6bbfe369e0006d3aa6d6b92abf451657f4
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
60d69df99a602fbfbf77b1bc0ff0a62dd86aa750 25-Aug-2012 Wink Saville <wink@google.com> am a71516d9: am dd8b840a: am 4b24797a: am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit 'a71516d9d1b639e871e39e31aaae7b1f5c6c7d4e':
Telephony: Send disconnect when disposing DCTs
a71516d9d1b639e871e39e31aaae7b1f5c6c7d4e 25-Aug-2012 Wink Saville <wink@google.com> am dd8b840a: am 4b24797a: am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit 'dd8b840a59aafaac5325985fb35fb1db3f7dd9d8':
Telephony: Send disconnect when disposing DCTs
dd8b840a59aafaac5325985fb35fb1db3f7dd9d8 25-Aug-2012 Wink Saville <wink@google.com> am 4b24797a: am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit '4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b':
Telephony: Send disconnect when disposing DCTs
4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b 25-Aug-2012 Wink Saville <wink@google.com> am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit 'fb4c7e43721fe51e2f749c70f36c0f6be18e8580':
Telephony: Send disconnect when disposing DCTs
fb4c7e43721fe51e2f749c70f36c0f6be18e8580 25-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Send disconnect when disposing DCTs"
9bd740e07de94a7f3d0ff08adf1286c49be66ab6 24-Aug-2012 Wink Saville <wink@google.com> am 1c331df7: am eca324b9: am ffcb548f: Empty DC\'s apnList when the DC is free.

* commit '1c331df7088e9bfd73c20313bbd84f708601ee22':
Empty DC's apnList when the DC is free.
1c331df7088e9bfd73c20313bbd84f708601ee22 24-Aug-2012 Wink Saville <wink@google.com> am eca324b9: am ffcb548f: Empty DC\'s apnList when the DC is free.

* commit 'eca324b92d4cd136f728c14dbb92a1d55674645e':
Empty DC's apnList when the DC is free.
eca324b92d4cd136f728c14dbb92a1d55674645e 24-Aug-2012 Wink Saville <wink@google.com> am ffcb548f: Empty DC\'s apnList when the DC is free.

* commit 'ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1':
Empty DC's apnList when the DC is free.
ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1 23-Aug-2012 Wink Saville <wink@google.com> Empty DC's apnList when the DC is free.

Not doing this causes DC.apnList's to have multiple entries in the
apnlist which causes DC's to look like its connected to both IMS and
INTERNET. And when selecting CDMA only mode on a Xoom we will not bring
up the connection thus no data connectivity.

A "cherry-pick" from frameworks/base/ b44b13a3f5967a7ce80f7124dc7b9c486f49c275

Bug: 6939338
Change-Id: I49881adb2710d7fe5d88c3aef748618bda7d65f1
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
14e336bdebafb1598dccd1b2b19e922f07c69448 20-Aug-2012 Jake Hamby <jhamby@google.com> am eb705568: am 0ef38e23: am 6df4d0f3: am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit 'eb7055685250d9efb92b00ff68515095a512e3a5':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
147a4972250c18ab2d267c169a733615fd801419 20-Aug-2012 Jake Hamby <jhamby@google.com> am 67b1dcb5: am 2ab32387: am 4eedbd9a: am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit '67b1dcb5798106b32502930747fe6a98107b1d15':
Telephony: Fix LTE CB Sms for dual-mode devices
eb7055685250d9efb92b00ff68515095a512e3a5 20-Aug-2012 Jake Hamby <jhamby@google.com> am 0ef38e23: am 6df4d0f3: am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '0ef38e23406aeed28e95dbc4e5022822508349e7':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
67b1dcb5798106b32502930747fe6a98107b1d15 20-Aug-2012 Jake Hamby <jhamby@google.com> am 2ab32387: am 4eedbd9a: am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit '2ab323871c8a16e039df1ff916da57df7bd34763':
Telephony: Fix LTE CB Sms for dual-mode devices
0ef38e23406aeed28e95dbc4e5022822508349e7 20-Aug-2012 Jake Hamby <jhamby@google.com> am 6df4d0f3: am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '6df4d0f3d49769e733045b3efcda9060aaae1bfe':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
2ab323871c8a16e039df1ff916da57df7bd34763 20-Aug-2012 Jake Hamby <jhamby@google.com> am 4eedbd9a: am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit '4eedbd9a3fa0bafb4be05522113a5f6498923b4e':
Telephony: Fix LTE CB Sms for dual-mode devices
6df4d0f3d49769e733045b3efcda9060aaae1bfe 20-Aug-2012 Jake Hamby <jhamby@google.com> am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '026b1a184c918c9e0ddd028073084e443e5ae0fc':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
4eedbd9a3fa0bafb4be05522113a5f6498923b4e 20-Aug-2012 Jake Hamby <jhamby@google.com> am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit 'f0414167059ea8ac7daae752e0ce7bd858df7f92':
Telephony: Fix LTE CB Sms for dual-mode devices
026b1a184c918c9e0ddd028073084e443e5ae0fc 20-Aug-2012 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"
f0414167059ea8ac7daae752e0ce7bd858df7f92 20-Aug-2012 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix LTE CB Sms for dual-mode devices"
0fd49b6b31960a768702d202a066b1088ec489a1 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Fix LTE CB Sms for dual-mode devices

Ignore 3gpp location information when it is not available.
This is required to support dual-mode devices such as CDMA/LTE devices
that require support for both 3GPP and 3GPP2 format messages.

Change-Id: Ie5d6372ef7e8da6893800e05a83ba840b7fd31f6
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
5ad6947b2d955a4e972d556090922d77aa6a2641 09-Aug-2011 Rekha Kumar <rekhak@codeaurora.org> Telephony: Fix MT SMS with invalid TOA field causing crash issue

Throw FormatException when type of number is incorrect and handle it

Change-Id: I305ea1c9e4fee29c84caefec7d7564d46228851d
rc/java/com/android/internal/telephony/gsm/GsmSmsAddress.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
59d7facb016faf234f4b3a114ed8bc513ee55f38 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am cd0425c4: am 79dbf561: am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit 'cd0425c4a1b9e2149edfbcc1a1ae9c4a7a50a208':
Telephony: Fix SmsManager to throw IllegalArgumentException
cd0425c4a1b9e2149edfbcc1a1ae9c4a7a50a208 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 79dbf561: am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit '79dbf5616c72262355bb66bf1a2f70da5ceea015':
Telephony: Fix SmsManager to throw IllegalArgumentException
79dbf5616c72262355bb66bf1a2f70da5ceea015 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 342f21b8: am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit '342f21b85d51d4216192a4e8b9fe6d6706b9bb3e':
Telephony: Fix SmsManager to throw IllegalArgumentException
342f21b85d51d4216192a4e8b9fe6d6706b9bb3e 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am a462a18c: Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"

* commit 'a462a18c25eb2a09b0f3c15d3a3c231b25448f0b':
Telephony: Fix SmsManager to throw IllegalArgumentException
a462a18c25eb2a09b0f3c15d3a3c231b25448f0b 20-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Telephony: Fix SmsManager to throw IllegalArgumentException"
6615c2b349c34b59811c47e4f2762f98f72d11b2 16-Aug-2012 Wink Saville <wink@google.com> am fd1c8517: am 4a558a7b: am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit 'fd1c85175a498978b394258b34c9c52b5b51d860':
Telephony: Ignore SipPhone
fd1c85175a498978b394258b34c9c52b5b51d860 16-Aug-2012 Wink Saville <wink@google.com> am 4a558a7b: am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '4a558a7b6494361fb0b3ac5ebb4f40f8e778ac5f':
Telephony: Ignore SipPhone
4a558a7b6494361fb0b3ac5ebb4f40f8e778ac5f 16-Aug-2012 Wink Saville <wink@google.com> am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '3a7fdcb7918fd4e68814952b545c89fb971e5356':
Telephony: Ignore SipPhone
3a7fdcb7918fd4e68814952b545c89fb971e5356 16-Aug-2012 Wink Saville <wink@google.com> am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '640ac8068f3941dcf79c0496285758d4b8180847':
Telephony: Ignore SipPhone
640ac8068f3941dcf79c0496285758d4b8180847 16-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Ignore SipPhone"
073ffbd395b7c3942c75a0880cafd1ddb84b4b07 15-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Ignore SipPhone

UiccController's code isn't ready to handle having multiple
different PhoneBase objects working at the same time

Bug: 6975696
Change-Id: I8f83174cc7db478743445c09fb8f03c66cf1e41e
rc/java/com/android/internal/telephony/uicc/UiccController.java
53f71ef9ac402a85d564d1ee5e3698ad1a587cef 15-Aug-2012 Wink Saville <wink@google.com> am 1f59196c: am 208f334f: Merge commit \'d9d3f48c\' into fix-merge-conflict

* commit '1f59196ce1e6b612224eeb2c51d37489b289b9dc':
Telephony: Unregister broadcast receiver
1f59196ce1e6b612224eeb2c51d37489b289b9dc 15-Aug-2012 Wink Saville <wink@google.com> am 208f334f: Merge commit \'d9d3f48c\' into fix-merge-conflict

* commit '208f334f85a5e5182a98aefb56066443a2de5261':
Telephony: Unregister broadcast receiver
208f334f85a5e5182a98aefb56066443a2de5261 15-Aug-2012 Wink Saville <wink@google.com> Merge commit 'd9d3f48c' into fix-merge-conflict



* commit 'd9d3f48c':
Telephony: Unregister broadcast receiver

Change-Id: I57a974e92592efa8a662f083dd1bfc613c1a945a
bb274aca5fe57107bb14d477e6277e2ce2f1fd22 15-Aug-2012 Wink Saville <wink@google.com> am 95f35828: am 81a055a7: am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '95f35828170db0cb4001ae061f7d11d232868cc2':
Telephony: Always create IccCard
95f35828170db0cb4001ae061f7d11d232868cc2 15-Aug-2012 Wink Saville <wink@google.com> am 81a055a7: am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '81a055a7b9e3049413a503fa61c09f3f43648d78':
Telephony: Always create IccCard
81a055a7b9e3049413a503fa61c09f3f43648d78 15-Aug-2012 Wink Saville <wink@google.com> am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit 'aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76':
Telephony: Always create IccCard
d9d3f48c49050e54b5fbbcd660a1cda940559a70 15-Aug-2012 Wink Saville <wink@google.com> am 4a306f66: Merge "Telephony: Unregister broadcast receiver"

* commit '4a306f66962aabf843ce883a8f96450389db5f7a':
Telephony: Unregister broadcast receiver
aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76 15-Aug-2012 Wink Saville <wink@google.com> am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '91cccaaf575d6faf4e57bcb8a7e78538f28c75cd':
Telephony: Always create IccCard
4a306f66962aabf843ce883a8f96450389db5f7a 15-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Unregister broadcast receiver"
91cccaaf575d6faf4e57bcb8a7e78538f28c75cd 15-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Always create IccCard"
a5fc984c8b0696c187e14bfa75962b6e46c40d02 15-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Unregister broadcast receiver

Telephony code registers a BroadcastReceiver but does not
unregister it. This is causing Broadcast Register Receivers list
to grow large enough to cause situation with excessive JNI refs.

Change-Id: I8d2531849fd2b1282aaf5c20516b043b3bf0a2fa
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
dbb088ab146d2fcb435e75e4ca70f2ff7d00d2c7 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Fix decodeCallbackNumber for Cdma CMAS

Fix exception in decodeCallbackNumber for Cdma CMAS by
verifying expected param size.

Change-Id: I687a0ad424b6c1d73c0320b3a776cadf7e8ba180
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
bb8277c9c32f77d71dcc393b9baa19a3ffbeb0a6 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Don't ack CB messages

SmsDispatcher receives its own broadcast to ack messages.
CB message needs to be excluded from the acking code since
it should not be acked.

Change-Id: I3f1496bb0c81a8edcc4173661e2ca75b03a9c6fb
rc/java/com/android/internal/telephony/SMSDispatcher.java
f92aefb45aa708772779a1ea10622b38f965fab5 13-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Always create IccCard

There is some bug in master branch which is not in AOSP code
that prevents KeyGuard from showing up unless IccCard broadcasts
its status

Force creation of IccCard (even if it really is absent) so that
it broadcasts its state and KeyGuard gets displayed

Fix NullPointerException in case card was removed by checking
return value of phone.getIccCard()

bug: 6983013
Change-Id: I95de1cc8a70a9e3d66d3e5d6059e82626057c5d4
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
559923bc9b6a08ddd75e4d147232b9008cbda1d2 13-Aug-2012 Wink Saville <wink@google.com> am 749e3164: am e0e2ceb1: Merge commit \'616b281b\' into merge-conflict-TelephonySignal-Strength-cleanup

* commit '749e3164a947e341dd7c14ae51cc0ad5d8d6347f':
Telephony: Signal Strength cleanup
749e3164a947e341dd7c14ae51cc0ad5d8d6347f 13-Aug-2012 Wink Saville <wink@google.com> am e0e2ceb1: Merge commit \'616b281b\' into merge-conflict-TelephonySignal-Strength-cleanup

* commit 'e0e2ceb1ae025e6dd2adda75c32dba93c6dfeea4':
Telephony: Signal Strength cleanup
e0e2ceb1ae025e6dd2adda75c32dba93c6dfeea4 13-Aug-2012 Wink Saville <wink@google.com> Merge commit '616b281b' into merge-conflict-TelephonySignal-Strength-cleanup

* commit '616b281b':
Telephony: Signal Strength cleanup

Change-Id: I3c211a06c480169d90fb5bc2c1774bd509d91f87
616b281b5a644d599bcc6b4bd75545b600eff45e 13-Aug-2012 Wink Saville <wink@google.com> am 15e350db: Merge "Telephony: Signal Strength cleanup"

* commit '15e350dbdedb12c36c4432375e8c58a633b1e492':
Telephony: Signal Strength cleanup
15e350dbdedb12c36c4432375e8c58a633b1e492 13-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Signal Strength cleanup"
5ae86deae6183a729f1d765c75a0e74be06e6499 11-Aug-2012 Wink Saville <wink@google.com> am 8f145515: am 59a96dd3: am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into fix-merge-conflict

* commit '8f1455159ad8e6526f52bfcd9200c090f4cbea94':
Telephony: Fix npe due to mIccCard not being created
8f1455159ad8e6526f52bfcd9200c090f4cbea94 11-Aug-2012 Wink Saville <wink@google.com> am 59a96dd3: am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into fix-merge-conflict

* commit '59a96dd369b5c275b5e40105d71ed4c76d46f8b1':
Telephony: Fix npe due to mIccCard not being created
59a96dd369b5c275b5e40105d71ed4c76d46f8b1 11-Aug-2012 Wink Saville <wink@google.com> am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into fix-merge-conflict

* commit '193becaf222c8b426f46afad87391ae3e70415c8':
Telephony: Fix npe due to mIccCard not being created
193becaf222c8b426f46afad87391ae3e70415c8 11-Aug-2012 Wink Saville <wink@google.com> Merge commit '33f24931ad25942ed8abb142df2edc2c1811350e' into fix-merge-conflict

* commit '33f24931ad25942ed8abb142df2edc2c1811350e':
Telephony: Fix npe due to mIccCard not being created
63b7dd36a37759816ff2860e21c123dbf895f769 11-Aug-2012 Wink Saville <wink@google.com> am 9adf9fec: am 7717d50e: am 3bbdedb2: Merge commit \'10b02a84\' into fix-merge-conflict

* commit '9adf9feca1a72b9b126bb47f036cdebce00c2c83':
Telephony: Dynamically instantiate IccCard
9adf9feca1a72b9b126bb47f036cdebce00c2c83 11-Aug-2012 Wink Saville <wink@google.com> am 7717d50e: am 3bbdedb2: Merge commit \'10b02a84\' into fix-merge-conflict

* commit '7717d50e4bd32cdee17bc87dc80b30c9d51a59d4':
Telephony: Dynamically instantiate IccCard
7717d50e4bd32cdee17bc87dc80b30c9d51a59d4 11-Aug-2012 Wink Saville <wink@google.com> am 3bbdedb2: Merge commit \'10b02a84\' into fix-merge-conflict

* commit '3bbdedb21d96fefdd5549a7aae6cfa20535aabbc':
Telephony: Dynamically instantiate IccCard
3bbdedb21d96fefdd5549a7aae6cfa20535aabbc 11-Aug-2012 Wink Saville <wink@google.com> Merge commit '10b02a84' into fix-merge-conflict

* commit '10b02a84':
Telephony: Dynamically instantiate IccCard

Change-Id: I8f9e1f89ad20b0ec77b8f665c31f7e3fc14f2aef
33f24931ad25942ed8abb142df2edc2c1811350e 11-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Fix npe due to mIccCard not being created"
54007c8258ed3ea20c1a00c9385cf11129218efb 11-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe due to mIccCard not being created

Change-Id: I668bfb97ea7f047182fdcb92ebfec7cc4e73d2f5
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
28d9d4043f2a75267397e134d59235fe2c509293 09-Aug-2012 Keun young Park <keunyoung@google.com> am 6fbd195c: am 04e862d1: Merge "do not build mockril for PDK" into jb-mr1-dev

* commit '6fbd195c65414f80c3f98cb58162f0f0a215eb86':
do not build mockril for PDK
6fbd195c65414f80c3f98cb58162f0f0a215eb86 09-Aug-2012 Keun young Park <keunyoung@google.com> am 04e862d1: Merge "do not build mockril for PDK" into jb-mr1-dev

* commit '04e862d1a81386dbdc995bde6451456016765ed5':
do not build mockril for PDK
04e862d1a81386dbdc995bde6451456016765ed5 09-Aug-2012 Keun young Park <keunyoung@google.com> Merge "do not build mockril for PDK" into jb-mr1-dev
e2b9760ddb4071d21f8fc6e630938dd4f737ab74 09-Aug-2012 Keun young Park <keunyoung@google.com> do not build mockril for PDK

Change-Id: Ib14b6f8d3315bed4e74719d51a1258d787fa18bc
ockril/Android.mk
0a377afdb9731474379caab6f908373e648bcbdb 09-Aug-2012 Wink Saville <wink@google.com> am 79537317: am 049ab042: Merge commit \'e0e2ebb5\' into fix-merge-conflict

* commit '79537317f876eea4f32925b98846f69e25dc1f67':
Telephony: Dynamically instantiate IccCard
79537317f876eea4f32925b98846f69e25dc1f67 09-Aug-2012 Wink Saville <wink@google.com> am 049ab042: Merge commit \'e0e2ebb5\' into fix-merge-conflict

* commit '049ab0421f32e6effc5d1277b69bd382cebadb18':
Telephony: Dynamically instantiate IccCard
049ab0421f32e6effc5d1277b69bd382cebadb18 09-Aug-2012 Wink Saville <wink@google.com> Merge commit 'e0e2ebb5' into fix-merge-conflict

* commit 'e0e2ebb5':
Telephony: Dynamically instantiate IccCard

Change-Id: I37d65c140033f110bc4990f68adf9489737c9c38
e0e2ebb5a50e580cbe6957dcafb3495a2d0a27f2 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
10b02a84943ba2e7da130296595c0879afce2d04 09-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Dynamically instantiate IccCard"
a13eb8b86f22b0efcfb888e2491b007d3424dddd 08-Nov-2011 Rekha Kumar <rekhak@codeaurora.org> Telephony: Check SmsTracker's mSentIntent for null

When SmsManager's sendMultipartTextMessage is invoked with null sentIntents,
the SmsTracker object is initialized with mSentIntent as null.
This causes NullPointerException.

Change-Id: I545c4a23676ba67f6a5523f15564993f001e48ca
rc/java/com/android/internal/telephony/SMSDispatcher.java
910825a2ed10bd5cc454b91380b7db0dac2e616e 13-Apr-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Fix SmsManager to throw IllegalArgumentException

IllegalArgumentException condition for:
enableCellBroadcastRange() and disableCellBroadcastRange() is
if endMessageId < startMessageId.

IllegalArgumentException condition for divideMessage() is if input text
is null, for copyMessageToIcc() it is if pdu is null.

Change-Id: Id344e99728ac92cbfcf2d11b8ca3f920d140bbde
rc/java/android/telephony/SmsManager.java
bb36adde615d3d85fa0fc23935197c6bc6a799ed 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/uicc/UiccController.java
188e479a6fa91b794f81b871c3a90b190a571c56 04-Aug-2012 Wink Saville <wink@google.com> am 3f5644c8: am b754042d: Merge "Fix a logging NPE problem" into jb-mr1-dev

* commit '3f5644c840fb92fcca2a750d20606317c1b1251a':
Fix a logging NPE problem
3f5644c840fb92fcca2a750d20606317c1b1251a 04-Aug-2012 Wink Saville <wink@google.com> am b754042d: Merge "Fix a logging NPE problem" into jb-mr1-dev

* commit 'b754042d27e77f6e800b2e9a16d9b3ee9f91f154':
Fix a logging NPE problem
b754042d27e77f6e800b2e9a16d9b3ee9f91f154 04-Aug-2012 Wink Saville <wink@google.com> Merge "Fix a logging NPE problem" into jb-mr1-dev
6d55e7386d12731f40144c79dec927e553dd71e8 04-Aug-2012 Wink Saville <wink@google.com> am 30eba74e: am b89bb0f8: am f7c060b9: am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit '30eba74eb7ca45d570a9aa95c3092e22490c7169':
Telephony: Move AdnRecord.aidl into opt/telephony
6b3735e451654e0bb02f1787b12743a0e18f631d 04-Aug-2012 Wink Saville <wink@google.com> am 11604482: am 28af7786: am 073517d3: am d016bfd4: Merge "fixes buffer overflow for data"

* commit '116044828038d3a010872493361fab75721e4164':
fixes buffer overflow for data
26d9541738e80ebadb119ac8520ac45d565e83c0 04-Aug-2012 Wink Saville <wink@google.com> am 789bb7c5: am 06e85d33: am 8342d163: am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit '789bb7c5bfa77329dd4203be3e75518ca6db0718':
Add DORMANT state to GSM data link activity
30eba74eb7ca45d570a9aa95c3092e22490c7169 04-Aug-2012 Wink Saville <wink@google.com> am b89bb0f8: am f7c060b9: am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit 'b89bb0f88d5e1042a5fa56b6b1dd4baeec07f58f':
Telephony: Move AdnRecord.aidl into opt/telephony
116044828038d3a010872493361fab75721e4164 04-Aug-2012 Wink Saville <wink@google.com> am 28af7786: am 073517d3: am d016bfd4: Merge "fixes buffer overflow for data"

* commit '28af7786dc807b6647221bfd2c0edd4fdbffef3c':
fixes buffer overflow for data
789bb7c5bfa77329dd4203be3e75518ca6db0718 04-Aug-2012 Wink Saville <wink@google.com> am 06e85d33: am 8342d163: am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit '06e85d3327fcdd6b2a8e7b83c9f84f0ae348a12e':
Add DORMANT state to GSM data link activity
b89bb0f88d5e1042a5fa56b6b1dd4baeec07f58f 04-Aug-2012 Wink Saville <wink@google.com> am f7c060b9: am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit 'f7c060b9ded0613109c1cec05c537c4e846fecd4':
Telephony: Move AdnRecord.aidl into opt/telephony
28af7786dc807b6647221bfd2c0edd4fdbffef3c 04-Aug-2012 Wink Saville <wink@google.com> am 073517d3: am d016bfd4: Merge "fixes buffer overflow for data"

* commit '073517d3e1529f2a6007de5c6fbed5412dcfe59e':
fixes buffer overflow for data
06e85d3327fcdd6b2a8e7b83c9f84f0ae348a12e 04-Aug-2012 Wink Saville <wink@google.com> am 8342d163: am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit '8342d1630c433559835563eded2dacdbf35d9db4':
Add DORMANT state to GSM data link activity
f7c060b9ded0613109c1cec05c537c4e846fecd4 04-Aug-2012 Wink Saville <wink@google.com> am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit '99dec9ebdfb31432e7fdac5c42b7e7e21f29e287':
Telephony: Move AdnRecord.aidl into opt/telephony
073517d3e1529f2a6007de5c6fbed5412dcfe59e 04-Aug-2012 Wink Saville <wink@google.com> am d016bfd4: Merge "fixes buffer overflow for data"

* commit 'd016bfd42fcfc230d0104fd16fa807bfd7ceb7e6':
fixes buffer overflow for data
8342d1630c433559835563eded2dacdbf35d9db4 04-Aug-2012 Wink Saville <wink@google.com> am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit 'f8f82e088e109049cb888a75af0686afd118ea85':
Add DORMANT state to GSM data link activity
99dec9ebdfb31432e7fdac5c42b7e7e21f29e287 04-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
d016bfd42fcfc230d0104fd16fa807bfd7ceb7e6 04-Aug-2012 Wink Saville <wink@google.com> Merge "fixes buffer overflow for data"
f8f82e088e109049cb888a75af0686afd118ea85 04-Aug-2012 Wink Saville <wink@google.com> Merge "Add DORMANT state to GSM data link activity"
cd4ae4aa265885ea754df9c9909d232563454187 03-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Move AdnRecord.aidl into opt/telephony

Change-Id: I827343c758dd2aac9014c4f98b247e3784606516
ndroid.mk
leanSpec.mk
rc/java/com/android/internal/telephony/AdnRecord.aidl
11b9bd95ff8d436ffb5e01998870102f5a412cf9 04-Aug-2012 Robert Greenwalt <rgreenwalt@google.com> Fix a logging NPE problem

Manually ported from jb-dev due to telephony relocation.

bug:6864064
Change-Id: Ic461256654f99e8c6c13251777972cc3e799e179
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
b3a03455be44a2a0ffbeb757b193d860c1878599 19-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Add DORMANT state to GSM data link activity

GsmDataConnectionTracker sets its activity flag to DORMANT and notifies
LinkActivity when RIL indicates that all its data calls are in
dormant state (i.e. active is set to 1 in UNSOL_DATA_CALL_LIST_CHANGED
message for all data calls)

This indication is needed so that the Android public API getDataActivity()
can return DATA_ACTIVITY_DORMANT when Android applications invoke this
API while the phone is on a WCDMA data call.

Change-Id: I81b9db36375fea4f9fb946ddd5ddf0e1d16cbbab
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
c1e1c4722539812750c2d22dd9cf5f8df0ed7da0 03-Aug-2012 Madan Ankapura <mankapur@sta.samsung.com> fixes buffer overflow for data

Change-Id: Ia1fc89b2fe0fc84ca540fef2783b95f8f9952d6f
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccRecords.java
5b81adc82a53b3064f4baa3acfeabef31586588a 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Signal Strength cleanup

Make signal strength parsing common for all modes

Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
c62df086696fc7cb42c51e086ea2aab076cff24b 01-Aug-2012 Ajay Nambi <anambi@codeaurora.org> Telephony: Send disconnect when disposing DCTs

Send disconnect when disposing DCTs. This is invoked multiple times
during Inter-RAT (IRAT) handovers and sending disconnect to lower layers
keeps things in-sync and avoid race conditions as seen in field tests.

Change-Id: I7c0c32a0448934981f0ebbeb9ee2702b87f9b5d9
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
3965c152887e506f5b5df486185820510290363e 28-Jul-2012 Ajay Nambi <anambi@codeaurora.org> Telephony: Look for CSS indicator for voice+data

For non-LTE, use the CSS field of VOICE_REGISTRATION_STATE to determine
if the modem supports simultaneous voice+data.

Change-Id: I546c939f325a6e3b09d563e32d45412910401422
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
fc0954a2c70abe2360d2db4baa6153017781ee93 26-Jul-2012 Jake Hamby <jhamby@google.com> am 89e16bf5: am a6b55dcb: am 324dd8d1: am b8a13d30: Implement CMAS service category program results.

* commit '89e16bf56aa9c798856f81b08f33587e9bca0536':
0bcd75e3d5f02207162ed31e2a0b42acf3340ac4 26-Jul-2012 Jake Hamby <jhamby@google.com> am c53625d2: am 067196df: am 522ff6be: am 34661b1e: Fix detection of CDMA cell broadcast messages.

* commit 'c53625d2b460bc859fc679f48a94e87316724a9c':
545827908489a45b9df818f512c1d83fba2346c5 26-Jul-2012 Wink Saville <wink@google.com> am 5e01113d: am 64159c62: am f71db0a5: am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '5e01113d1ea94557917b518dc44cfe8b20364d17':
74fad14903545fbc39382ce83af686a8b9dd5e6d 26-Jul-2012 Wink Saville <wink@google.com> am 6b6c0c03: am a2aa7a99: am 89ab794f: am 9fdeecb4: Fix build

* commit '6b6c0c03547dd4e8dc0c6fa18cb3f0b3a1ee406f':
679622c7b4353eda98e57ded23825f897f50512d 26-Jul-2012 John Wang <johnwang@google.com> am 2f3742f0: am d4ed2bde: am eca0fe06: am 1e5f46c0: Don\'t send terminal response without cmd details.

* commit '2f3742f04055638617a978de054442b9e42a5878':
6938b871bcef6a7e483af6cb3e5ee73eaf354e98 26-Jul-2012 Wink Saville <wink@google.com> am 5facf571: am 3c93767b: Merge "Revise CellInfo API\'s"

* commit '5facf571395eeb662bc5ff3079df990ba71fa406':
89e16bf56aa9c798856f81b08f33587e9bca0536 26-Jul-2012 Jake Hamby <jhamby@google.com> am a6b55dcb: am 324dd8d1: am b8a13d30: Implement CMAS service category program results.

* commit 'a6b55dcb21ebc8e781d3031ff2de74e23427abb1':
c53625d2b460bc859fc679f48a94e87316724a9c 26-Jul-2012 Jake Hamby <jhamby@google.com> am 067196df: am 522ff6be: am 34661b1e: Fix detection of CDMA cell broadcast messages.

* commit '067196df27214e8203369b013023887919a10aff':
5e01113d1ea94557917b518dc44cfe8b20364d17 26-Jul-2012 Wink Saville <wink@google.com> am 64159c62: am f71db0a5: am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '64159c6230faabfee86bbb9597a04d202034882b':
6b6c0c03547dd4e8dc0c6fa18cb3f0b3a1ee406f 26-Jul-2012 Wink Saville <wink@google.com> am a2aa7a99: am 89ab794f: am 9fdeecb4: Fix build

* commit 'a2aa7a99068ce4cb7d7a72450aa05d10884ad307':
2f3742f04055638617a978de054442b9e42a5878 26-Jul-2012 John Wang <johnwang@google.com> am d4ed2bde: am eca0fe06: am 1e5f46c0: Don\'t send terminal response without cmd details.

* commit 'd4ed2bdefb663ee7cb78c25edba4f8a70fe31c29':
5facf571395eeb662bc5ff3079df990ba71fa406 26-Jul-2012 Wink Saville <wink@google.com> am 3c93767b: Merge "Revise CellInfo API\'s"

* commit '3c93767bab0040818e0f530c0d0102654a87e0c0':
Revise CellInfo API's
a6b55dcb21ebc8e781d3031ff2de74e23427abb1 26-Jul-2012 Jake Hamby <jhamby@google.com> am 324dd8d1: am b8a13d30: Implement CMAS service category program results.

* commit '324dd8d12e3c3df713e981119d8e88c6afefa962':
Implement CMAS service category program results.
324dd8d12e3c3df713e981119d8e88c6afefa962 26-Jul-2012 Jake Hamby <jhamby@google.com> am b8a13d30: Implement CMAS service category program results.

* commit 'b8a13d300b245e0080aa01275e232f54d5d0e09c':
Implement CMAS service category program results.
067196df27214e8203369b013023887919a10aff 26-Jul-2012 Jake Hamby <jhamby@google.com> am 522ff6be: am 34661b1e: Fix detection of CDMA cell broadcast messages.

* commit '522ff6be0e89476101687c6865f98d925448c8ac':
Fix detection of CDMA cell broadcast messages.
64159c6230faabfee86bbb9597a04d202034882b 26-Jul-2012 Wink Saville <wink@google.com> am f71db0a5: am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit 'f71db0a58eeec26998288ed65b0516ca1043c66a':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
a2aa7a99068ce4cb7d7a72450aa05d10884ad307 26-Jul-2012 Wink Saville <wink@google.com> am 89ab794f: am 9fdeecb4: Fix build

* commit '89ab794fbe239de1cc63a02132572677133bcc18':
Fix build
d4ed2bdefb663ee7cb78c25edba4f8a70fe31c29 26-Jul-2012 John Wang <johnwang@google.com> am eca0fe06: am 1e5f46c0: Don\'t send terminal response without cmd details.

* commit 'eca0fe063adf22665ab5a83fc4e5ab11610641d0':
Don't send terminal response without cmd details.
b8a13d300b245e0080aa01275e232f54d5d0e09c 25-Jul-2012 Jake Hamby <jhamby@google.com> Implement CMAS service category program results.

Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
ests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
522ff6be0e89476101687c6865f98d925448c8ac 26-Jul-2012 Jake Hamby <jhamby@google.com> am 34661b1e: Fix detection of CDMA cell broadcast messages.

* commit '34661b1e9381d56b168777e3f18f6f9f2ad305c1':
Fix detection of CDMA cell broadcast messages.
f71db0a58eeec26998288ed65b0516ca1043c66a 26-Jul-2012 Wink Saville <wink@google.com> am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '08bf1a57eb310c99b9994ef23b944441ae33aa2b':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
89ab794fbe239de1cc63a02132572677133bcc18 26-Jul-2012 Wink Saville <wink@google.com> am 9fdeecb4: Fix build

* commit '9fdeecb4aa06552efcc535f21718cae45cc604e2':
Fix build
eca0fe063adf22665ab5a83fc4e5ab11610641d0 26-Jul-2012 John Wang <johnwang@google.com> am 1e5f46c0: Don\'t send terminal response without cmd details.

* commit '1e5f46c0477703b0eef40278cfa101d20b53091a':
Don't send terminal response without cmd details.
3c93767bab0040818e0f530c0d0102654a87e0c0 25-Jul-2012 Wink Saville <wink@google.com> Merge "Revise CellInfo API's"
34661b1e9381d56b168777e3f18f6f9f2ad305c1 23-Jul-2012 Jake Hamby <jhamby@google.com> Fix detection of CDMA cell broadcast messages.

The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.

Bug: 6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
08bf1a57eb310c99b9994ef23b944441ae33aa2b 25-Jul-2012 Wink Saville <wink@google.com> am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '801aa9f327730327132aafbae7e0c55bb6e7ea71':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
801aa9f327730327132aafbae7e0c55bb6e7ea71 25-Jul-2012 Wink Saville <wink@google.com> Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"
9fdeecb4aa06552efcc535f21718cae45cc604e2 25-Jul-2012 Wink Saville <wink@google.com> Fix build

mCurrentCmd should have been mCurrntCmd.

Change-Id: Ibd8faf0f6fec2285045f6f498730ff7882217cb1
rc/java/com/android/internal/telephony/cat/CatService.java
1e5f46c0477703b0eef40278cfa101d20b53091a 25-Jul-2012 John Wang <johnwang@google.com> Don't send terminal response without cmd details.

bug:6481578
Change-Id: I1ccd8b4599cff8df6806e39d53f86e265647bae7
rc/java/com/android/internal/telephony/cat/CatService.java
7c491bb3d140e2579c2c01edca94305701664db5 25-Jul-2012 Rekha Kumar <rekhak@codeaurora.org> Fix PhoneApp crash while decoding operatorNumeric to find mcc

Handle StringIndexOutOfBoundsException when mcc is found using
substring operation.

Bug: 6872958
Change-Id: I9e89a791e6efb3f9daacc33ac3aef05d9218af41
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
d95b0070db8345ecbb63bb41ffde2957aa36d091 20-Jul-2012 Jake Hamby <jhamby@google.com> am bdb9f1b6: am ec1ecc09: Merge "Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests"

* commit 'bdb9f1b6adfee42decc50585d5f7bfc5c75e09a5':
Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests
bdb9f1b6adfee42decc50585d5f7bfc5c75e09a5 20-Jul-2012 Jake Hamby <jhamby@google.com> am ec1ecc09: Merge "Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests"

* commit 'ec1ecc09ac9339e00fe6fc283397d3afd6c07d9a':
Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests
ec1ecc09ac9339e00fe6fc283397d3afd6c07d9a 20-Jul-2012 Jake Hamby <jhamby@google.com> Merge "Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests"
8d1c68c32ad6a79a7dd126cb01dd9d0177f301e7 19-Jul-2012 Robert Greenwalt <rgreenwalt@google.com> am 62b20cd5: Fix our interpretation of apn setting\'s bearer.

* commit '62b20cd5b7ce5d7809ff1fe2b5796b2e605165e5':
Fix our interpretation of apn setting's bearer.
dbbcde988d620307a97afbd9a6dc389eab02b586 18-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Move SmsUsageMonitorShortCodeTest from frameworks/base/telephony/tests

This test was missed out while migrating telephony code from frameworks/base.

Change-Id: Id3a2add255057b8b977e48a4fa873b44c3ddc732
ests/telephonytests/src/com/android/internal/telephony/SmsUsageMonitorShortCodeTest.java
ef1d4bff9bbf7d967dbcace73f08910e14e367d0 17-Jul-2012 Wink Saville <wink@google.com> Revise CellInfo API's

Change-Id: I35bc22caf4a6a2255f2ce122690823f8d602b359
rc/java/com/android/internal/telephony/DefaultPhoneNotifier.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneNotifier.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
ests/telephonytests/src/com/android/internal/telephony/TestPhoneNotifier.java
a63bf4237dfc3c9b81f7d5eff57c5500b8b8215d 18-Jul-2012 Johan Redestig <johan.redestig@sonymobile.com> Plug a fd leak.

Change-Id: Ia7189e67e8a03eceaa81e13cac98f20a82a44276
rc/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
62b20cd5b7ce5d7809ff1fe2b5796b2e605165e5 18-Jul-2012 Robert Greenwalt <rgreenwalt@google.com> Fix our interpretation of apn setting's bearer.

Between ICS and JB we changed it to use TelephonyManager's network type
enumeration. This changes it back to represent the RIL's radio
technology. The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I25f3e30b08ebcdf99bb70a41e01e3fbf38bf2de7
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
013125a96b1e6f46eed507c65bce65ebfec60b6d 17-Jul-2012 Wink Saville <wink@google.com> am dbbd0075: (-s ours) am c38bb60d: (-s ours) Create telephony-common - DO NOT MERGE

* commit 'dbbd0075d2a7fa703588ace5a32cd6af1bbb4b46':
Create telephony-common - DO NOT MERGE
dbbd0075d2a7fa703588ace5a32cd6af1bbb4b46 17-Jul-2012 Wink Saville <wink@google.com> am c38bb60d: (-s ours) Create telephony-common - DO NOT MERGE

* commit 'c38bb60d867c5d61d90b7179a9ed2b2d1848124f':
Create telephony-common - DO NOT MERGE
c38bb60d867c5d61d90b7179a9ed2b2d1848124f 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common - DO NOT MERGE

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
ndroid.mk
leanSpec.mk
ockril/Android.mk
ockril/src/com/android/internal/telephony/mockril/MockRilController.java
rc/java/android/provider/Telephony.java
rc/java/android/telephony/CellBroadcastMessage.java
rc/java/android/telephony/SmsCbCmasInfo.java
rc/java/android/telephony/SmsCbEtwsInfo.java
rc/java/android/telephony/SmsCbLocation.java
rc/java/android/telephony/SmsCbMessage.java
rc/java/android/telephony/SmsManager.java
rc/java/android/telephony/SmsMessage.java
rc/java/android/telephony/gsm/SmsManager.java
rc/java/android/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/ATParseEx.java
rc/java/com/android/internal/telephony/ATResponseParser.java
rc/java/com/android/internal/telephony/AdnRecord.java
rc/java/com/android/internal/telephony/AdnRecordCache.java
rc/java/com/android/internal/telephony/AdnRecordLoader.java
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/ApnSetting.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/Call.java
rc/java/com/android/internal/telephony/CallForwardInfo.java
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/CallStateException.java
rc/java/com/android/internal/telephony/CallTracker.java
rc/java/com/android/internal/telephony/CommandException.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/Connection.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/DataConnectionAc.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/DefaultPhoneNotifier.java
rc/java/com/android/internal/telephony/DriverCall.java
rc/java/com/android/internal/telephony/EventLogTags.logtags
rc/java/com/android/internal/telephony/IIccPhoneBook.aidl
rc/java/com/android/internal/telephony/ISms.aidl
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/IccCardApplication.java
rc/java/com/android/internal/telephony/IccCardStatus.java
rc/java/com/android/internal/telephony/IccConstants.java
rc/java/com/android/internal/telephony/IccException.java
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/IccFileNotFound.java
rc/java/com/android/internal/telephony/IccFileTypeMismatch.java
rc/java/com/android/internal/telephony/IccIoResult.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccProvider.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/IccRefreshResponse.java
rc/java/com/android/internal/telephony/IccServiceTable.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccUtils.java
rc/java/com/android/internal/telephony/IccVmFixedException.java
rc/java/com/android/internal/telephony/IccVmNotSupportedException.java
rc/java/com/android/internal/telephony/IntRangeManager.java
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/MmiCode.java
rc/java/com/android/internal/telephony/OperatorInfo.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneNotifier.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/PhoneSubInfoProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/RestrictedState.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/SmsAddress.java
rc/java/com/android/internal/telephony/SmsHeader.java
rc/java/com/android/internal/telephony/SmsMessageBase.java
rc/java/com/android/internal/telephony/SmsRawData.java
rc/java/com/android/internal/telephony/SmsResponse.java
rc/java/com/android/internal/telephony/SmsStorageMonitor.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
rc/java/com/android/internal/telephony/TelephonyCapabilities.java
rc/java/com/android/internal/telephony/UUSInfo.java
rc/java/com/android/internal/telephony/WapPushManagerParams.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/WspTypeDecoder.java
rc/java/com/android/internal/telephony/cat/AppInterface.java
rc/java/com/android/internal/telephony/cat/BerTlv.java
rc/java/com/android/internal/telephony/cat/CatCmdMessage.java
rc/java/com/android/internal/telephony/cat/CatException.java
rc/java/com/android/internal/telephony/cat/CatLog.java
rc/java/com/android/internal/telephony/cat/CatResponseMessage.java
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/CommandDetails.java
rc/java/com/android/internal/telephony/cat/CommandParams.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
rc/java/com/android/internal/telephony/cat/ComprehensionTlv.java
rc/java/com/android/internal/telephony/cat/ComprehensionTlvTag.java
rc/java/com/android/internal/telephony/cat/Duration.java
rc/java/com/android/internal/telephony/cat/FontSize.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cat/ImageDescriptor.java
rc/java/com/android/internal/telephony/cat/Input.java
rc/java/com/android/internal/telephony/cat/Item.java
rc/java/com/android/internal/telephony/cat/LaunchBrowserMode.java
rc/java/com/android/internal/telephony/cat/Menu.java
rc/java/com/android/internal/telephony/cat/PresentationType.java
rc/java/com/android/internal/telephony/cat/ResponseData.java
rc/java/com/android/internal/telephony/cat/ResultCode.java
rc/java/com/android/internal/telephony/cat/ResultException.java
rc/java/com/android/internal/telephony/cat/RilMessageDecoder.java
rc/java/com/android/internal/telephony/cat/TextAlignment.java
rc/java/com/android/internal/telephony/cat/TextAttribute.java
rc/java/com/android/internal/telephony/cat/TextColor.java
rc/java/com/android/internal/telephony/cat/TextMessage.java
rc/java/com/android/internal/telephony/cat/Tone.java
rc/java/com/android/internal/telephony/cat/ToneSettings.java
rc/java/com/android/internal/telephony/cat/ValueParser.java
rc/java/com/android/internal/telephony/cat/package.html
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CallFailCause.java
rc/java/com/android/internal/telephony/cdma/CdmaCall.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccRecords.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
rc/java/com/android/internal/telephony/cdma/EriInfo.java
rc/java/com/android/internal/telephony/cdma/EriManager.java
rc/java/com/android/internal/telephony/cdma/RuimFileHandler.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SignalToneUtil.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/TtyIntent.java
rc/java/com/android/internal/telephony/cdma/package.html
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
rc/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
rc/java/com/android/internal/telephony/cdma/sms/CdmaSmsSubaddress.java
rc/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java
rc/java/com/android/internal/telephony/cdma/sms/UserData.java
rc/java/com/android/internal/telephony/cdma/sms/package.html
rc/java/com/android/internal/telephony/gsm/CallFailCause.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCall.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmSmsAddress.java
rc/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java
rc/java/com/android/internal/telephony/gsm/SIMFileHandler.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimTlv.java
rc/java/com/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
rc/java/com/android/internal/telephony/gsm/SmsCbConstants.java
rc/java/com/android/internal/telephony/gsm/SmsCbHeader.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/SpnOverride.java
rc/java/com/android/internal/telephony/gsm/SuppServiceNotification.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
rc/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
rc/java/com/android/internal/telephony/gsm/UsimServiceTable.java
rc/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
rc/java/com/android/internal/telephony/gsm/package.html
rc/java/com/android/internal/telephony/ims/IsimRecords.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
rc/java/com/android/internal/telephony/package.html
rc/java/com/android/internal/telephony/sip/SipCallBase.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/sip/SipPhoneFactory.java
rc/java/com/android/internal/telephony/test/ModelInterpreter.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
rc/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
rc/java/com/android/internal/telephony/test/SimulatedRadioControl.java
rc/java/com/android/internal/telephony/test/package.html
rc/java/com/android/internal/telephony/uicc/UiccController.java
ests/telephonymockriltests/Android.mk
ests/telephonymockriltests/AndroidManifest.xml
ests/telephonymockriltests/src/com/android/telephonymockriltests/TelephonyMockTestRunner.java
ests/telephonymockriltests/src/com/android/telephonymockriltests/functional/SimpleTestUsingMockRil.java
ests/telephonytests/Android.mk
ests/telephonytests/AndroidManifest.xml
ests/telephonytests/src/com/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
ests/telephonytests/src/com/android/internal/telephony/ATResponseParserTest.java
ests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java
ests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
ests/telephonytests/src/com/android/internal/telephony/CallerInfoTest.java
ests/telephonytests/src/com/android/internal/telephony/GsmAlphabetTest.java
ests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java
ests/telephonytests/src/com/android/internal/telephony/IccServiceTableTest.java
ests/telephonytests/src/com/android/internal/telephony/IntRangeManagerTest.java
ests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
ests/telephonytests/src/com/android/internal/telephony/NeighboringCellInfoTest.java
ests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/PhoneNumberWatcherTest.java
ests/telephonytests/src/com/android/internal/telephony/SMSDispatcherTest.java
ests/telephonytests/src/com/android/internal/telephony/SimPhoneBookTest.java
ests/telephonytests/src/com/android/internal/telephony/SimSmsTest.java
ests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java
ests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/TestPhoneNotifier.java
ests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GSMPhoneTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimServiceTableTest.java
ests/telephonytests/src/com/android/internal/telephony/mockril/MockRilTest.java
d97782c72e76681f7a19ce2d0f1d47a7c6816301 12-Jul-2012 Wink Saville <wink@google.com> Merge commit '0825495a' into mit

* commit '0825495a':
Create telephony-common
0825495a331bb44df395a0cdb79fab85e68db5d5 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
ndroid.mk
leanSpec.mk
ockril/Android.mk
ockril/src/com/android/internal/telephony/mockril/MockRilController.java
rc/java/android/provider/Telephony.java
rc/java/android/telephony/CellBroadcastMessage.java
rc/java/android/telephony/SmsCbCmasInfo.java
rc/java/android/telephony/SmsCbEtwsInfo.java
rc/java/android/telephony/SmsCbLocation.java
rc/java/android/telephony/SmsCbMessage.java
rc/java/android/telephony/SmsManager.java
rc/java/android/telephony/SmsMessage.java
rc/java/android/telephony/gsm/SmsManager.java
rc/java/android/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/ATParseEx.java
rc/java/com/android/internal/telephony/ATResponseParser.java
rc/java/com/android/internal/telephony/AdnRecord.java
rc/java/com/android/internal/telephony/AdnRecordCache.java
rc/java/com/android/internal/telephony/AdnRecordLoader.java
rc/java/com/android/internal/telephony/ApnContext.java
rc/java/com/android/internal/telephony/ApnSetting.java
rc/java/com/android/internal/telephony/BaseCommands.java
rc/java/com/android/internal/telephony/Call.java
rc/java/com/android/internal/telephony/CallForwardInfo.java
rc/java/com/android/internal/telephony/CallManager.java
rc/java/com/android/internal/telephony/CallStateException.java
rc/java/com/android/internal/telephony/CallTracker.java
rc/java/com/android/internal/telephony/CommandException.java
rc/java/com/android/internal/telephony/CommandsInterface.java
rc/java/com/android/internal/telephony/Connection.java
rc/java/com/android/internal/telephony/DataCallState.java
rc/java/com/android/internal/telephony/DataConnection.java
rc/java/com/android/internal/telephony/DataConnectionAc.java
rc/java/com/android/internal/telephony/DataConnectionTracker.java
rc/java/com/android/internal/telephony/DebugService.java
rc/java/com/android/internal/telephony/DefaultPhoneNotifier.java
rc/java/com/android/internal/telephony/DriverCall.java
rc/java/com/android/internal/telephony/EventLogTags.logtags
rc/java/com/android/internal/telephony/IIccPhoneBook.aidl
rc/java/com/android/internal/telephony/ISms.aidl
rc/java/com/android/internal/telephony/IccCard.java
rc/java/com/android/internal/telephony/IccCardApplication.java
rc/java/com/android/internal/telephony/IccCardStatus.java
rc/java/com/android/internal/telephony/IccConstants.java
rc/java/com/android/internal/telephony/IccException.java
rc/java/com/android/internal/telephony/IccFileHandler.java
rc/java/com/android/internal/telephony/IccFileNotFound.java
rc/java/com/android/internal/telephony/IccFileTypeMismatch.java
rc/java/com/android/internal/telephony/IccIoResult.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccProvider.java
rc/java/com/android/internal/telephony/IccRecords.java
rc/java/com/android/internal/telephony/IccRefreshResponse.java
rc/java/com/android/internal/telephony/IccServiceTable.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManager.java
rc/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
rc/java/com/android/internal/telephony/IccUtils.java
rc/java/com/android/internal/telephony/IccVmFixedException.java
rc/java/com/android/internal/telephony/IccVmNotSupportedException.java
rc/java/com/android/internal/telephony/IntRangeManager.java
rc/java/com/android/internal/telephony/MccTable.java
rc/java/com/android/internal/telephony/MmiCode.java
rc/java/com/android/internal/telephony/OperatorInfo.java
rc/java/com/android/internal/telephony/Phone.java
rc/java/com/android/internal/telephony/PhoneBase.java
rc/java/com/android/internal/telephony/PhoneFactory.java
rc/java/com/android/internal/telephony/PhoneNotifier.java
rc/java/com/android/internal/telephony/PhoneProxy.java
rc/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
rc/java/com/android/internal/telephony/PhoneSubInfo.java
rc/java/com/android/internal/telephony/PhoneSubInfoProxy.java
rc/java/com/android/internal/telephony/RIL.java
rc/java/com/android/internal/telephony/RestrictedState.java
rc/java/com/android/internal/telephony/RetryManager.java
rc/java/com/android/internal/telephony/SMSDispatcher.java
rc/java/com/android/internal/telephony/ServiceStateTracker.java
rc/java/com/android/internal/telephony/SmsAddress.java
rc/java/com/android/internal/telephony/SmsHeader.java
rc/java/com/android/internal/telephony/SmsMessageBase.java
rc/java/com/android/internal/telephony/SmsRawData.java
rc/java/com/android/internal/telephony/SmsResponse.java
rc/java/com/android/internal/telephony/SmsStorageMonitor.java
rc/java/com/android/internal/telephony/SmsUsageMonitor.java
rc/java/com/android/internal/telephony/TelephonyCapabilities.java
rc/java/com/android/internal/telephony/UUSInfo.java
rc/java/com/android/internal/telephony/WapPushManagerParams.java
rc/java/com/android/internal/telephony/WapPushOverSms.java
rc/java/com/android/internal/telephony/WspTypeDecoder.java
rc/java/com/android/internal/telephony/cat/AppInterface.java
rc/java/com/android/internal/telephony/cat/BerTlv.java
rc/java/com/android/internal/telephony/cat/CatCmdMessage.java
rc/java/com/android/internal/telephony/cat/CatException.java
rc/java/com/android/internal/telephony/cat/CatLog.java
rc/java/com/android/internal/telephony/cat/CatResponseMessage.java
rc/java/com/android/internal/telephony/cat/CatService.java
rc/java/com/android/internal/telephony/cat/CommandDetails.java
rc/java/com/android/internal/telephony/cat/CommandParams.java
rc/java/com/android/internal/telephony/cat/CommandParamsFactory.java
rc/java/com/android/internal/telephony/cat/ComprehensionTlv.java
rc/java/com/android/internal/telephony/cat/ComprehensionTlvTag.java
rc/java/com/android/internal/telephony/cat/Duration.java
rc/java/com/android/internal/telephony/cat/FontSize.java
rc/java/com/android/internal/telephony/cat/IconLoader.java
rc/java/com/android/internal/telephony/cat/ImageDescriptor.java
rc/java/com/android/internal/telephony/cat/Input.java
rc/java/com/android/internal/telephony/cat/Item.java
rc/java/com/android/internal/telephony/cat/LaunchBrowserMode.java
rc/java/com/android/internal/telephony/cat/Menu.java
rc/java/com/android/internal/telephony/cat/PresentationType.java
rc/java/com/android/internal/telephony/cat/ResponseData.java
rc/java/com/android/internal/telephony/cat/ResultCode.java
rc/java/com/android/internal/telephony/cat/ResultException.java
rc/java/com/android/internal/telephony/cat/RilMessageDecoder.java
rc/java/com/android/internal/telephony/cat/TextAlignment.java
rc/java/com/android/internal/telephony/cat/TextAttribute.java
rc/java/com/android/internal/telephony/cat/TextColor.java
rc/java/com/android/internal/telephony/cat/TextMessage.java
rc/java/com/android/internal/telephony/cat/Tone.java
rc/java/com/android/internal/telephony/cat/ToneSettings.java
rc/java/com/android/internal/telephony/cat/ValueParser.java
rc/java/com/android/internal/telephony/cat/package.html
rc/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
rc/java/com/android/internal/telephony/cdma/CDMAPhone.java
rc/java/com/android/internal/telephony/cdma/CallFailCause.java
rc/java/com/android/internal/telephony/cdma/CdmaCall.java
rc/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
rc/java/com/android/internal/telephony/cdma/CdmaConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
rc/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaInformationRecords.java
rc/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
rc/java/com/android/internal/telephony/cdma/CdmaLteUiccRecords.java
rc/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
rc/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
rc/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
rc/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
rc/java/com/android/internal/telephony/cdma/EriInfo.java
rc/java/com/android/internal/telephony/cdma/EriManager.java
rc/java/com/android/internal/telephony/cdma/RuimFileHandler.java
rc/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/RuimRecords.java
rc/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/cdma/SignalToneUtil.java
rc/java/com/android/internal/telephony/cdma/SmsMessage.java
rc/java/com/android/internal/telephony/cdma/TtyIntent.java
rc/java/com/android/internal/telephony/cdma/package.html
rc/java/com/android/internal/telephony/cdma/sms/BearerData.java
rc/java/com/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
rc/java/com/android/internal/telephony/cdma/sms/CdmaSmsSubaddress.java
rc/java/com/android/internal/telephony/cdma/sms/SmsEnvelope.java
rc/java/com/android/internal/telephony/cdma/sms/UserData.java
rc/java/com/android/internal/telephony/cdma/sms/package.html
rc/java/com/android/internal/telephony/gsm/CallFailCause.java
rc/java/com/android/internal/telephony/gsm/GSMPhone.java
rc/java/com/android/internal/telephony/gsm/GsmCall.java
rc/java/com/android/internal/telephony/gsm/GsmCallTracker.java
rc/java/com/android/internal/telephony/gsm/GsmConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnection.java
rc/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
rc/java/com/android/internal/telephony/gsm/GsmMmiCode.java
rc/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
rc/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
rc/java/com/android/internal/telephony/gsm/GsmSmsAddress.java
rc/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java
rc/java/com/android/internal/telephony/gsm/SIMFileHandler.java
rc/java/com/android/internal/telephony/gsm/SIMRecords.java
rc/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
rc/java/com/android/internal/telephony/gsm/SimTlv.java
rc/java/com/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
rc/java/com/android/internal/telephony/gsm/SmsCbConstants.java
rc/java/com/android/internal/telephony/gsm/SmsCbHeader.java
rc/java/com/android/internal/telephony/gsm/SmsMessage.java
rc/java/com/android/internal/telephony/gsm/SpnOverride.java
rc/java/com/android/internal/telephony/gsm/SuppServiceNotification.java
rc/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
rc/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
rc/java/com/android/internal/telephony/gsm/UsimServiceTable.java
rc/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
rc/java/com/android/internal/telephony/gsm/package.html
rc/java/com/android/internal/telephony/ims/IsimRecords.java
rc/java/com/android/internal/telephony/ims/IsimUiccRecords.java
rc/java/com/android/internal/telephony/package.html
rc/java/com/android/internal/telephony/sip/SipCallBase.java
rc/java/com/android/internal/telephony/sip/SipCommandInterface.java
rc/java/com/android/internal/telephony/sip/SipConnectionBase.java
rc/java/com/android/internal/telephony/sip/SipPhone.java
rc/java/com/android/internal/telephony/sip/SipPhoneBase.java
rc/java/com/android/internal/telephony/sip/SipPhoneFactory.java
rc/java/com/android/internal/telephony/test/ModelInterpreter.java
rc/java/com/android/internal/telephony/test/SimulatedCommands.java
rc/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
rc/java/com/android/internal/telephony/test/SimulatedRadioControl.java
rc/java/com/android/internal/telephony/test/package.html
rc/java/com/android/internal/telephony/uicc/UiccController.java
ests/telephonymockriltests/Android.mk
ests/telephonymockriltests/AndroidManifest.xml
ests/telephonymockriltests/src/com/android/telephonymockriltests/TelephonyMockTestRunner.java
ests/telephonymockriltests/src/com/android/telephonymockriltests/functional/SimpleTestUsingMockRil.java
ests/telephonytests/Android.mk
ests/telephonytests/AndroidManifest.xml
ests/telephonytests/src/com/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
ests/telephonytests/src/com/android/internal/telephony/ATResponseParserTest.java
ests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java
ests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
ests/telephonytests/src/com/android/internal/telephony/CallerInfoTest.java
ests/telephonytests/src/com/android/internal/telephony/GsmAlphabetTest.java
ests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java
ests/telephonytests/src/com/android/internal/telephony/IccServiceTableTest.java
ests/telephonytests/src/com/android/internal/telephony/IntRangeManagerTest.java
ests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
ests/telephonytests/src/com/android/internal/telephony/NeighboringCellInfoTest.java
ests/telephonytests/src/com/android/internal/telephony/PhoneNumberUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/PhoneNumberWatcherTest.java
ests/telephonytests/src/com/android/internal/telephony/SMSDispatcherTest.java
ests/telephonytests/src/com/android/internal/telephony/SimPhoneBookTest.java
ests/telephonytests/src/com/android/internal/telephony/SimSmsTest.java
ests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java
ests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java
ests/telephonytests/src/com/android/internal/telephony/TestPhoneNotifier.java
ests/telephonytests/src/com/android/internal/telephony/Wap230WspContentTypeTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/cdma/sms/CdmaSmsTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GSMPhoneTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java
ests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java
ests/telephonytests/src/com/android/internal/telephony/gsm/UsimServiceTableTest.java
ests/telephonytests/src/com/android/internal/telephony/mockril/MockRilTest.java
f4ba68aa88637e9df034fce94971535852cc0a7b 14-Jun-2012 Chad Jones <chadj@google.com> Initial empty repository