• Home
  • History
  • Annotate
  • only in /frameworks/base/telephony/java/
History log of /frameworks/base/telephony/java/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
199bc563e3afb13dee44aec1eeda6be80188caca 13-Sep-2012 John Wang <johnwang@google.com> Show plmn in emergency call allowed mode.

When emergency call is allowed, plmn string is used to pass up the
"Emergency calls only" string. This change set showPlmn to true
in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value.

bug:7103854
Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
dba8a81d935cd5647343d3fd8341c0ed159c87b5 29-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: Iba9e7156bd7df94e972963959a7ce1c78464f7f5
om/android/internal/telephony/cdma/sms/BearerData.java
b44b13a3f5967a7ce80f7124dc7b9c486f49c275 22-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.

Bug: 6939338
Change-Id: I17bc17cd1938ebac773db8131d12d0fa724348b0
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
41508f0544c5905def4a7e9ccb07941e5f7417fd 03-Aug-2012 Robert Greenwalt <rgreenwalt@google.com> Fix a logging NPE problem

bug:6864064
Change-Id: I3237e55cb164462b9616515b0de009bf687f1dca
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
7b661fb3fc17f981bb122520791344891a3c1661 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
ndroid/telephony/cdma/CdmaSmsCbProgramData.java
ndroid/telephony/cdma/CdmaSmsCbProgramResults.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
bc8bab8949e3ab1ccfff5b5b96ed3726cfa938bb 24-Jul-2012 Wink Saville <wink@google.com> Merge "Don't send terminal response without cmd details." into jb-dev
15c257eb8f077fc4f6c95f8a7bc84dd9a7b39c61 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
om/android/internal/telephony/cdma/SmsMessage.java
aeffc933e9ba10c2374098cbb69daa58e79331ad 20-Jul-2012 John Wang <johnwang@google.com> Don't send terminal response without cmd details.

bug:6481578
Change-Id: Ie9f6e33c49307ddd884015a400f90e5477cc551e
om/android/internal/telephony/cat/CatService.java
7d551361d117afd6bcadfeb9c3b882ebbe45cb79 17-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: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
d22469302707d87ee56d7a30dd8b38e671ee0179 11-Jul-2012 Wink Saville <wink@google.com> Merge "Preserve retryCount when retrying." into jb-dev
e87c71f8c1db547831e8f91be765a6eecee27342 11-Jul-2012 Wink Saville <wink@google.com> Merge "When reconnecting disassociate dc and apnContext." into jb-dev
829edb8a53336b4c7362edd8d0941e794b35d0fc 02-Jul-2012 Wink Saville <wink@google.com> Fix country code for Netherlands Antilles.

Change the cc to "ai" from "nl" otherwise the timezone is
set to Netherlands which is +1 rather than the Caribbean
which is -4.

Bug: 6765706
Change-Id: Ie399efe95ce93b73eb4e60cfc47e621cce85e6e5
om/android/internal/telephony/MccTable.java
68e66497e78f1fcfcb49a28a17ac7805734e7a3c 28-Jun-2012 Wink Saville <wink@google.com> Preserve retryCount when retrying.

Bug: 6529189
Change-Id: I743aed08aa161d91899aeb2ccacffcd224e48c0a
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/RetryManager.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
1157e1a8d4320589983fc39688bb7be7d6487d67 21-Jun-2012 Wink Saville <wink@google.com> When reconnecting disassociate dc and apnContext.

This is done in onActionIntentReconnectAlarm, which is called when
retrying after an error, by setting the ApnContext.DataConnection &
DataConnctionAc to null which intern clears the DataConnection.mApnList.

With the mApnList cleared DataConnection.mRefCount will not be incremented
because the DC will not be found by findReadyDataConnection. Thus fixing
at least one cause of 6529189.

Bug: 6529189
Change-Id: I40ff1966f6fbd2f69e97d77b9db7122e4c5b992f
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
0f40a51b2027c4dbca88f682c7c8691da0ffcf99 26-Jun-2012 Jake Hamby <jhamby@google.com> Fix detection of CDMA CMAS cell broadcasts.

CMAS cell broadcasts do not necessarily set the message
priority indicator subparameter. Interpret the user data as a
CMAS message if the service category is in the CMAS range.

Includes a new test case in CdmaSmsCbTest to verify correct
decoding of an actual CMAS monthly test message.

Bug: 6506785
Change-Id: I2a26a5194a1a02e34c1ef862ff348e1571df51c4
om/android/internal/telephony/cdma/sms/BearerData.java
004ff5ad2aa02daff607bcf1712f3efbb84c58ca 06-Jun-2012 Jake Hamby <jhamby@google.com> DO NOT MERGE: Remove SMS shortcode warning feature.

Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.

Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
om/android/internal/telephony/SMSDispatcher.java
b1fc08ca082db8ecad54c792485ff7915e3513ce 05-Jun-2012 Jake Hamby <jhamby@google.com> DO NOT MERGE: Remove SMS shortcode warning feature.

The SMS shortcode warning feature has some usability limitations which need
to be resolved before shipping. Remove the code for JellyBean. It will be
added back to a future release when the feature is complete.

Bug: 6605549
Change-Id: Ifb23d20f30199f242abb8bf7db015232a085c8e3
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/SmsUsageMonitor.java
8367627f3afd065a8d6b2f0131e0f30fa4fb53f7 26-May-2012 Jake Hamby <jhamby@google.com> Allow apps with SEND_SMS_NO_CONFIRMATION to bypass short code check.

Change SMSDispatcher to bypass SMS premium short code confirmation
dialog when caller has "android.permission.SEND_SMS_NO_CONFIRMATION"
permission (instead of checking package name against hardcoded list).

This permission is only available to system apps or those signed with
the same certificates as those in the system image.

Bug: 6502817
Change-Id: I6098d448892cc5e842ba6dc10cf494295e7226af
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/SmsUsageMonitor.java
f19540a2d7958f60f88428f964733e50d462c65b 25-May-2012 Wink Saville <wink@google.com> Add debug for tracking down connectivity issues.

bug: 6529189
Change-Id: I5dc4316ceacf48625f0839e0200b77a1e0984465
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
8f669f49faf6084ad0132a02a474209907a069ce 09-May-2012 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Improve sim ready event handling for CdmaLte.

bug: 6463933
Change-Id: I751f760badb87c1fe4b78fd68921257cec4a4b9d
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
45131d0c3b9cb6927589396520eb40f33be406f0 21-May-2012 John Wang <johnwang@google.com> Merge "Only reset time from NITZ in zone fix." into jb-dev
df7bbfd7c28549742443bbf91200871c09e89299 18-May-2012 John Wang <johnwang@google.com> Only reset time from NITZ in zone fix.

When timezone property gets reset by mcc change, SST only adjusts time to
reflect new timezone settings if there is NITZ string w/o timezone.

bug:6465783
Change-Id: I1a27b3f371f79aa532de1c94ec5cb12285bdfdb4
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
8834538a4e6066b656d68614361b0af15100b9c9 19-May-2012 John Wang <johnwang@google.com> Change "uk" to "gb" in COUNTRY_CODES.

Since MccTable uses "gb" instead of "uk" for United Kingdom.

bug:6465783
Change-Id: Ifc2e2e7e72bd8405c698474d2ab9d01cb4ca006b
om/android/internal/telephony/ServiceStateTracker.java
172d97edcdfd9b228d8cf96d312b55fb67699fd4 02-May-2012 Jake Hamby <jhamby@google.com> Enable SMS short code patterns to be updated from secure settings.

The premium SMS short code detector loads patterns from an XML resource
by default (frameworks/base/core/res/res/xml/sms_short_codes.xml).
Add support for updated patterns to be loaded on a per-country basis
from a secure setting named "sms_short_codes_" + the country code.
Updated patterns can be pushed to Google devices via Gservices.

Bug: 5513975
Change-Id: Ibfc0be4f12227ba45c28396ec7cdbc307442af81
om/android/internal/telephony/SmsUsageMonitor.java
2977286dde1eb78cabb322ab7896acadd6b309df 17-May-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Log more RetryManager information." into jb-dev
3a64109db653c5a3df57e60b89f6c69927e20585 17-May-2012 John Wang <johnwang@google.com> Merge "Restore ready apns once voice call ended" into jb-dev
83daf6c5aea671086ca152d02378da194770168b 17-May-2012 Robert Greenwalt <rgreenwalt@google.com> Log more RetryManager information.

6505637 had unexplainable behavior. Add some logging so we can see
what's going on.

bug:6505637
Change-Id: I43c2ce7f8d12271d988b112f47589d0fba2b6955
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RetryManager.java
32eda207cdeec28fe829e399ae7030d40108ac88 16-May-2012 yoonsung.nam <yoonsung.nam@samsung.com> Restore ready apns once voice call ended

Currently GsmDCT does not setup default data if secondary APNs are
connected but default is disconnected. Sometimes retry alarm of default
expries during voice call but it's rejected due to voice calling and
eHRPD attached status.

Fix onVocieCallEnded() to restore all ready apns inclduing defautl
regardless of isConnected().

bug:6502005

Change-Id: I25db9be010cb588dfee51bdaf435f24055ecb431
Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com>
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
33961892a9f143623ac7bb5450ba0230e40f0471 17-May-2012 Robert Greenwalt <rgreenwalt@google.com> Don't start data-stall checks if not connected

We did this only if connected in most places, but screen-on/off didn't
care. On no-radio devices it caused extra timers/wakeups that
didn't help anybody.

bug:6375908
Change-Id: Iba72da323de716acb0e67361b955c7381f18f67d
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
47509c744fa36b59bb5e511e21182a573fb8317b 14-May-2012 Jake Hamby <jhamby@google.com> Merge "Change SMS security check to enforceCallingPermission()." into jb-dev
7304c343821309dd15f769b18f1de2fa43751573 12-May-2012 Jeff Brown <jeffbrown@google.com> Move power HAL interactions to PowerManagerService.

This refactoring sets the stage for a follow-on change that
will make use additional functions of the power HAL.

Moved functionality from android.os.Power into PowerManagerService.
None of these functions make sense being called outside of the
system server. Moving them to the PowerManagerService makes it
easier to ensure that the power HAL is initialized exactly once.

Similarly, moved ShutdownThread out of the policy package and into
the services package where it can tie into the PowerManagerService
as needed.

Bug: 6435382
Change-Id: I958241bb124fb4410d96f5d5eb00ed68d60b29e5
om/android/internal/telephony/IccCard.java
e9aa4b27af4fe68b999f906aea80847fa1f4b0d8 11-May-2012 Wink Saville <wink@google.com> Merge "Add additional debug for time zone handling." into jb-dev
26e1a02ba3183aba2ba262c6f60602e10dd792e3 11-May-2012 Wink Saville <wink@google.com> Add additional debug for time zone handling.

Change-Id: Ie46bba7e0ef7737a865f7efadbf963c2d14e488f
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
26ee989576ffeffa787f240a4ef6962b87644b40 09-May-2012 Robert Greenwalt <rgreenwalt@google.com> Fix some apn settings issues.

Correct some logging that was misleading and be more precise in our
removal of things from the waiting list.

bug:6445253
Change-Id: I97b20b851617149a24303276392de403dbde2a8f
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6de4da44618c970e32c84c28a37e38156388107e 10-May-2012 Jake Hamby <jhamby@google.com> Change SMS security check to enforceCallingPermission().

The permission check for IccSmsInterfaceManager.sendText() was changed from
enforceCallingPermission() to enforceCallingOrSelfPermission() to enable the
Phone app to send SMS's directly for the "reply by SMS" feature. That feature
was implemented in a different way (handled by the MMS app), so the permission
check can be changed back to the original enforceCallingPermission(). Verified
that SMS can still be sent, including "reply by SMS" for an incoming call.

Bug: 4686733
Change-Id: If844a0c485de0a87857d8f82a3452e776005153e
om/android/internal/telephony/IccSmsInterfaceManager.java
e69ec2253cd2e151a6a98e87d1bbf5d5cfa05bed 09-May-2012 Daisuke Miyakawa <dmiyakawa@google.com> Remove STOPSHIP part of the logging in telephony

We still need the log itself to trap the exceptional case.

Bug: 6201805
Change-Id: I62d12f6a1ed41817ee12c0f5c7fc4aa0a967a60f
ndroid/telephony/PhoneNumberUtils.java
290e1c9396aa8da3665c55d72f4b4a1f5d9277ce 08-May-2012 John Wang <johnwang@google.com> Set provider name in airplane mode.

Set eriText to correct provider alpha during power_off state.

bug:5262482
Change-Id: Ic72aaf0465cde6934a2b46d4b9520627ac0ac335
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
1d7c1f11179fae48271b8bcd8bf06760f9cb04ec 03-May-2012 Wink Saville <wink@google.com> Rename isTimeZoneFixNeeded to shouldFixTimeZoneNow.

Change-Id: I01c73a0afaa17793f9dea1b78c9fe49fa138f787
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
9a992450cb0b48ea2a0bb946d321b3afbc27aad5 03-May-2012 Wink Saville <wink@google.com> Merge "Time can become incorrect when no sim is present or mcc changes." into jb-dev
f0f43227a7dbaab111f6984d8a013776754e6f38 03-May-2012 Wink Saville <wink@google.com> Time can become incorrect when no sim is present or mcc changes.

bug: 6393147
Change-Id: I07ad74998b03af532ccf704a8a7e4844f5829b14
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
6ac0471da79c99a043cb6fbccb12bd86f1f3c024 02-May-2012 John Wang <johnwang@google.com> Enable restart in getSpnFsm().

If the FSM gets restart while waiting for one of
SPN EFs results (i.e. a SIM refresh occurs after issuing
read EF_CPHS_SPN), it will re-initialize only after
receiving and discarding the unfinished SPN EF result.

bug:5499225

Change-Id: I715fc2feabdd03435903f7dcb785c8f0154619bc
om/android/internal/telephony/gsm/SIMRecords.java
4dafaf117e680c138b3b0e0893a8ce09bc75f519 30-Apr-2012 Robert Greenwalt <rgreenwalt@google.com> Fix data roaming notification.

We shouldn't tell people we're not connected due to roaming if it's really because
of data-disabled.

Use the data-disabled setting to decide if we should inform people about
data-discon due to roaming. Note this doesn't effect other notifications about roaming.

Also fix the data-enable/disable code to take roaming into account and clear/set the
roaming notification as needed (if data is enabled while we can't get on due to roaming
we should put up the roaming notifcation.. if data is disabled while that notification is
up we should take it down).

bug:5805666
Change-Id: I5c925dfdca4abc27e0034b113508df5719f04fae
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
7725180c646d1976a2a2097735862a75ec47c544 24-Apr-2012 Robert Greenwalt <rgreenwalt@google.com> Prefer the preferred APN for all types it supports

We used to only prefer it when connecting for default connection purposes,
but it makes sense to use the preference for all apn types it supports.

bug:6377793
Change-Id: I8b26b77fc0787121749cce9d32303ab24cc72c75
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
0205537536431204b11459e9d2d2eccf3924c6cd 24-Apr-2012 Daisuke Miyakawa <dmiyakawa@google.com> Add debug log for 5914560 and 6383850

This won't be shown in usual condition since in most cases the method
will just use the block just above the logging and return true/false
there. On the other hand this might be useful if the case is truely
exceptional and thus this path is really used.

Bug: 5914560
Bug: 6383850
Change-Id: I2242f93a9b905b5a39d997aa30d9fd6f5bfbdf49
ndroid/telephony/PhoneNumberUtils.java
53eb13ce0a05426ceed03465ed37f7f3587eb4f4 19-Mar-2012 Ye Jingjing <jingjing.ye@sonymobile.com> Set AuthType to NONE if username of APN is not set

When APN is edited, if authType and username are both not
set, authType should be set to NONE before setup of
data call.

The code today checks mApn.user for NULL, but if
user has edited APN the mApn.user field will be set
to an empty string.

Change the check of mApn.user to also take care of
this case.

Change-Id: I0e49247d46e1ba93da6dd951bbb75acc63fac73f
om/android/internal/telephony/gsm/GsmDataConnection.java
d65c2be5485143a0d489c6dfa24276ae834ccffc 20-Apr-2012 Jake Hamby <jhamby@google.com> Merge "Add ContentProvider for apps to read received SMS cell broadcasts."
d38e766e5ed461fcce96cf055ee0de7050126b01 19-Apr-2012 Wink Saville <wink@google.com> Merge "Fix calcuation of CMD_TO_STRING_COUNT."
01ce0ce4724803112e7f2885d9ad49edf7515dca 19-Apr-2012 Wink Saville <wink@google.com> Fix calcuation of CMD_TO_STRING_COUNT.

Change-Id: I03ae1a545474d7dcd4e65c58d9befd020d5b9c54
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
c3296ffdfc70c6778b6ae760b812b4e53e335f97 18-Apr-2012 Jake Hamby <jhamby@google.com> Add ContentProvider for apps to read received SMS cell broadcasts.

The CellBroadcastReceiver app will allow apps with the new permission
"android.permission.READ_CELL_BROADCASTS" to read previously received
cell broadcast messages from a new ContentProvider database at URI
"content://cellbroadcasts". This will enable third parties to provide
additional information to users in the event of emergencies without
delaying or interfering with the initial system alert dialog to warn
the user when the alert is received.

Includes a new android.telephony.CellBroadcastMessage class which
can be instantiated from the Cursor retrieved from the ContentProvider.
This was previously a part of the CellBroadcastReceiver app, but can now
be used by third party apps with read permission on the ContentProvider.

Change-Id: I2c31f62b63c050c7946de2d81c28a5f4dc6f00b0
ndroid/telephony/CellBroadcastMessage.java
ecd302259a66aaf5abd49407c379c066e2542e95 19-Apr-2012 Wink Saville <wink@google.com> Revert "Telephony: Dynamically instantiate IccCard"

This reverts commit fe37acae729529b8bf3a3140fa397bddce42b1e0

There are two bugs that are weekend release blockers:

b/6357558
b/6357880

6357558 is easily fixed with:

https://android-git.corp.google.com/g/#/c/182228/

But there are still questions. Bug 6357880 has
unknown causes at the moment but this change is the
most likely candidate. So for today's pre-weekend
build we are reverting this change.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/sip/SipPhoneBase.java
om/android/internal/telephony/uicc/UiccController.java
fe37acae729529b8bf3a3140fa397bddce42b1e0 17-Apr-2012 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Dynamically instantiate IccCard

Change-Id: I8c4d800158fb1eb12de66d437cb0d76695ff98d3
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/sip/SipPhoneBase.java
om/android/internal/telephony/uicc/UiccController.java
8334679be1a9defb9d52217542ec0a1389c9fcae 17-Apr-2012 Daisuke Miyakawa <dmiyakawa@google.com> Merge "Introduce cachedPhotoIcon for notification's large icon"
265974803a01b6a461a94f984bb6b1e5f1f48496 16-Apr-2012 Daisuke Miyakawa <dmiyakawa@google.com> Introduce cachedPhotoIcon for notification's large icon

Bug: 6336293
Change-Id: I492384fdb819dfd6574b0dbc84a0324c917c392c
om/android/internal/telephony/CallerInfo.java
f80310d3c56387091ccd4111b698c09f76b8c53d 13-Jan-2012 jshin <jgsin@samsung.com> Added API to replace unicoded digits to ascii numbers

Users can enter arabic phone number or click arabic phone number
to send MMS. Works for generic Unicode digits (full-width, etc.).

bug:5615791
Change-Id: Ieec8c5c6c3736ee2b4ac8ddf17f8c41b2001460e

Signed-off-by: Jake Hamby <jhamby@google.com>
ndroid/telephony/PhoneNumberUtils.java
e333c82da35119cfa25109328c3db98fa84f965e 13-Jan-2012 Jake Hamby <jhamby@google.com> Convert Arabic phone numbers to ASCII when sending SMS.

Modify PhoneNumberUtils to automatically convert non-ASCII digits,
such as Arabic-Indic numbers, CJK full-width digits, etc., to ASCII
in normalizeNumber(), extractNetworkPortion(), and stripSeparators().

This enables the SMS application to support sending SMS's to phone
numbers written with Arabic, or other non-ASCII digits. The number will
be converted to ASCII digits and formatted for the user according to the
country formatting rules.

Bug: 5615791
Change-Id: I42039285db5795b1dda22e4251f54af302e27f13

Signed-off-by: Jake Hamby <jhamby@google.com>
ndroid/telephony/PhoneNumberUtils.java
48a7bf24e375bb98f6300f0b1b3d4c9b7447443a 14-Apr-2012 Wink Saville <wink@google.com> Merge "Enhance the debug output for StateMachines."
583eaaa57c51b28bf14da2a5cc94a2e6091cccf5 14-Apr-2012 Wink Saville <wink@google.com> Enhance the debug output for StateMachines.

Allow some messages to be ignored and allow the subclass to
add additional information. In particular, the information
can be used to decode the msg.what to a string.

Change-Id: I4f53becc6f0cb77399f99702084efef9d8785d67
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
b4bc99e847d15f04c035d676e01ff85623565e0a 03-Jan-2012 Jake Hamby <jhamby@google.com> Add user confirmation dialog before sending SMS to short code.

Non-system apps now require user confirmation before sending an SMS
to a short code that may potentially cost the user money. The number
is tested against regex patterns for short codes for the country
matching the user's SIM card or network. The user is warned if the
phone number is potentially or definitely a premium SMS number.

The regex patterns are loaded from core/res/res/xml/sms_short_codes.xml.
If the user's country is not found, then phone numbers of 5 digits or less
(excluding known emergency phone numbers) are considered to be potential
SMS short codes.

Command to run test cases:
$ runtest -c com.android.internal.telephony.SmsUsageMonitorShortCodeTest frameworks-telephony

Bug: 5513975
Change-Id: Ic0b483153390e974c632302f3061300bc2a2274a
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/SmsUsageMonitor.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
335ef47968ea3ecc00546c7e60736b4e0dcfb0f8 13-Apr-2012 Wink Saville <wink@google.com> Fix phone is sometimes in America/Dawson canadian time zone

Add code that updates the time zone whenever the country code
or time zone changes. In bug 6269708 the device initially
reported the mcc as 001 and then a short time later it got
the correct code, 311. This could cause the time zone to be
reported as America/Dawson instead of America/Los_Angeles.

Bug: 6269708
Change-Id: Ibfb40ea1158d3b99c121ed9960a1f0b1a45980bd
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
cbc41deaa309801acac80d667f3e787a3afa2261 09-Apr-2012 Wink Saville <wink@google.com> Merge "Telephony: Fix NV ready state"
431a4a3b97f494c23e3dc7e781c2efcea63f3a7e 03-Apr-2012 Wink Saville <wink@google.com> Add some additional debug for set operator numeric.

Change-Id: I7e22a33f893984c1ad5bd9dd79428ad72d2b4d7c
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
784eb36b884242d92b38b9f8cf572c205a9ff787 09-Apr-2012 Wink Saville <wink@google.com> Telephony: Fix NV ready state

Don't trigger RuimRecords onReady so that it doesn't overwrite
mccmnc property value set by CdmaPhone in NV case.

Bug: 6153667
Change-Id: I2f25f6a69deecd085f11dbe1dbf752c2fd51cecb
om/android/internal/telephony/IccCard.java
2119ade6d737345d58145e773f5877c199a3e20d 06-Apr-2012 John Wang <johnwang@google.com> Merge "Enhance Cell Location Api."
8fc27e8b87bd1def854a03d84009143b315d4176 05-Apr-2012 Jeff Sharkey <jsharkey@android.com> Support metered Wi-Fi NetworkPolicy.

Add networkId field to NetworkIdentity to identify Wi-Fi networks by
SSID. Add support for policies without usage cycles.

Only apply mobile policies when SIM state is ready, which is cleaner
than just checking for airplane mode. Also avoids creating no-op
default policies when subscriberId is null.

Bug: 3001465, 3291052
Change-Id: I1f8aaa49a5db306df022c402ea7f3f5d4bc0cfc7
ndroid/telephony/TelephonyManager.java
963db55d59a170f4b17ff907c96615a19ef6fe17 31-Mar-2012 John Wang <johnwang@google.com> Enhance Cell Location Api.

To boost accurary and enhance capability of cell location api,
two new APIs, TelephonyManager.getAllCellInfo() and
TelephonyManager.listen(LISTEN_CELL_INFO), are added. Two new
Class, CellInfo and CellIdentity, are created.

This API change returns all information of one cell locaiton
at the same time. It also provides additional LTE and timestamp information.

Change-Id: I4d0f813107e625ec4ac88c8d980ffd171aa5fc30
ndroid/telephony/CdmaCellIdentity.java
ndroid/telephony/CellIdentity.java
ndroid/telephony/CellInfo.aidl
ndroid/telephony/CellInfo.java
ndroid/telephony/GsmCellIdentity.java
ndroid/telephony/LteCellIdentity.java
ndroid/telephony/NeighboringCellInfo.aidl
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.aidl
ndroid/telephony/SignalStrength.aidl
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/PhoneNotifier.java
e1bff46863a7431bc2c7d02a96d0129b91fda741 02-Apr-2012 Wink Saville <wink@google.com> Merge "Add DebugService."
30ccade7f9432b8212807b9ddc8cc69a4a8fc854 02-Apr-2012 Wink Saville <wink@google.com> Add DebugService.

This will dump the state of the telephony stack using:

adb shell dumpsys activity service android.phone.TelephonyDebugService

The service is located in packages/app/Phone and TelephonyDebugService
instantiates DebugService and calls its dump method when asked
via the dumpsys command above.

Change-Id: I4d34c741544cafdadce2532de8b9c117a4d435a5
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DebugService.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
54e73321e57d916ed2ea7b782fd2fc4d146bac59 30-Mar-2012 Daisuke Miyakawa <dmiyakawa@google.com> Add supportsAdn()

Bug: 5487135
Change-Id: I52e570ef5d175ed8ae971c5f9889496e30f2c528
om/android/internal/telephony/TelephonyCapabilities.java
5f12f031111b47500fd6bb9ef0744fd379b31ece 29-Mar-2012 Daisuke Miyakawa <dmiyakawa@google.com> Move TelephonyCapabilities from Phone to telephony

- Move the class.
- Remove some TODOs mentioning this action : the class should belong to
telephony layer instead of to the Phone package
- Add private strings used in the class

Bug: 6252254
Change-Id: I0d4ca2f8e4d775004d146fe6f9c60165a94366a9
om/android/internal/telephony/TelephonyCapabilities.java
12ef0981be95a074443edcc600abce692e80d3d0 09-Dec-2011 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Remove IccFileHandler from PhoneBase

mIccCard is now be multi-thread safe but other similar
variables such as mIccRecords will be cleaned up in
the future and are no worse than before.

Change-Id: Ic2fc31af2575c2dc0bb30e7348dd9e76ec61e763
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
ce2dcb6f1358398eef9ccffccd0c0a309238f7a4 09-Dec-2011 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Move Cat to IccCard

Change-Id: Ibbea7b8f277f33e71580d61f83645b0aaefef580
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
80198f2235d12f278e391dfedc582b0b40bfd404 09-Dec-2011 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Remove coupling between phone and IccRecords

Change-Id: I7af0f0f37c59b7554fa329a5b00ff28cb149b4d9
om/android/internal/telephony/AdnRecordCache.java
om/android/internal/telephony/AdnRecordLoader.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/MccTable.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
3e3c3f80a90b156ff500076f8655647dfb317acf 06-Feb-2012 Jake Hamby <jhamby@google.com> Add support for CMAS warning notifications over CDMA.

Refactor SMS Cell Broadcast support to enable receiving CMAS warning
notifications over CDMA. The CellBroadcastReceiver app must also be
updated with the corresponding change. All cell broadcasts are now
delivered as a Parcelable SmsCbMessage object in the "message" extra
of the SMS_CB_RECEIVED_ACTION or SMS_EMERGENCY_CB_RECEIVED_ACTION,
instead of as a GSM/UMTS "pdu" byte array.

Existing functionality for ETWS and CMAS alerts over GSM/UMTS continues
to be supported using the new radio-technology independent SmsCbMessage
and related objects. Test cases are added to verify that valid and
invalid broadcast data is handled appropriately.

Unit testing discovered a bug in the BitwiseOutputStream utility class
used by the added test cases. When the BitwiseOutputStream object must be
expanded (in the private possExpand() method), the mEnd field is not
updated to the new array size. This causes a new array to be allocated
on every new write, and for all data beyond the original array allocation
to be replaced with zeroes. Fixed by adding a line to possExpand() to
update mEnd. Added a test case to BitwiseStreamsTest to verify the fix.
Besides the test cases, BitwiseOutputStream is only used by BearerData in
two places, both of which allocate a sufficient initial buffer. So the
bug in BitwiseOutputStream is not critical to fix for normal operation,
but should be fixed so that the test cases using it function correctly.

Bug: 5856308
Change-Id: I201ecbf11607fd200aaae3cbb32561efabf65672
ndroid/telephony/SmsCbCmasInfo.java
ndroid/telephony/SmsCbConstants.java
ndroid/telephony/SmsCbEtwsInfo.java
ndroid/telephony/SmsCbLocation.java
ndroid/telephony/SmsCbMessage.java
ndroid/telephony/cdma/CdmaSmsCbProgramData.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSmsCbMessage.java
om/android/internal/telephony/gsm/SmsCbConstants.java
om/android/internal/telephony/gsm/SmsCbHeader.java
2b75d12a7bbe7ff64c7043855c18961fd4466870 09-Mar-2012 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Make IccFileHandler use ci instead of phone

Change-Id: I94889b5b7954d9c16721f12145e8412ba418ac12
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccFileHandler.java
om/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/gsm/SIMFileHandler.java
33c67dcb23cd714e11674fa2d70937c66f35d1e1 13-Mar-2012 Wink Saville <wink@google.com> am 2a0eed20: am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.

* commit '2a0eed20b5828877b2db24bf49468e10c3f1b36b':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
f4ae6aabbcefe39b3c85b03729c74044f02369d4 10-Mar-2012 Wink Saville <wink@google.com> Allow CDMA on LTE devices to get data connections even if otasp is needed.

Bearer Independent Protocol (BIP) connections as defined in
ETSI TS 102 223 "Smart Cards; Card Application Toolkit (CAT) (Release 11)"
need to be able to establish data connections even when not provisioned.
This can occur when trying to provision on via and EVDO network.

Bug: 6110632
Change-Id: I85722e0ba2e2606ffcf2516b8f00be6ff5271adf
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
26a92257b43e8941e1505a5f9df42b00f23a87ee 05-Mar-2012 Todor Kalaydjiev <todor@google.com> Support auto-complete in PhoneNumberFormattingTextWatcher. Also, simplify logic.
Previously, the assumption was that only a deletion or an insertion can happen
at a time; but with auto-complete, a deletion and insertion happen at the same time.

Needed for bug 5992672 in the Messaging app and is nice to have in the platform.

Change-Id: I2d80cecc486e7a1ceeaeb34866bcd834074f5ead
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
22c1700378667c1f25974b134cc201663ac2c29e 07-Mar-2012 Wink Saville <wink@google.com> Telephony: Create and use UiccController

UiccController creates and disposes IccCard
IccRecords and IccFileHandler is part of IccCard

Change-Id: I3dfb476c76162bbe8443271927a06743bb5e39c4
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/uicc/UiccController.java
7eed139cdf6d6bbec82adabb373fa3d87a3a0cea 02-Mar-2012 Wink Saville <wink@google.com> Merge "Telephony: Remove SimCard and RuimCard"
393acacd61b3d0de43163d3b94bc35d030c901fd 01-Mar-2012 John Wang <johnwang@google.com> Merge "[maguro] Add Cheers' MCCMNC in SIMRecords.java"
859b7ef8f02708910e886489975017e2810e1d40 04-Feb-2012 Sangcheol Lee <goodsc.lee@samsung.com> [maguro] Add Cheers' MCCMNC in SIMRecords.java

[issue 5963659]
Result:
There is no APN information for Cheers

Expected Result:
Mobile internet APN name for Cheers should be displayed

Change-Id: Iab29cfbd06ab15559048ced23136abae1fcab8f3
om/android/internal/telephony/gsm/SIMRecords.java
a27421a306c49fbe9b3823b30f7ab1cd58b28854 01-Mar-2012 Wink Saville <wink@google.com> If no NITZ information use Country Code to set TimeZone.

This is not perfect and only works if the CC is known via
the GSM radio and is only accurate if there is one time zone
per country. This does nothing to resolve time zone problems
for wifi only devices.

So this is a partial fix for bug 2896745

Bug: 2896745
Change-Id: I78f013836c4e4870b8b1016a8312f5adbe0d31c9
om/android/internal/telephony/RIL.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
efba344b5a7b20e400daf5f41b2fbd688337f789 29-Feb-2012 Jake Hamby <jhamby@google.com> Revert "Add support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready.

This reverts commit 0c49f03a0429b5c0c4a619256f7bca86a4997ae8
ndroid/telephony/SmsCbCmasInfo.java
ndroid/telephony/SmsCbConstants.java
ndroid/telephony/SmsCbEtwsInfo.java
ndroid/telephony/SmsCbLocation.java
ndroid/telephony/SmsCbMessage.java
ndroid/telephony/cdma/CdmaSmsCbProgramData.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSmsCbMessage.java
om/android/internal/telephony/gsm/SmsCbConstants.java
om/android/internal/telephony/gsm/SmsCbHeader.java
e7af59b375f08b13d964816fc52048e670764bdb 09-Dec-2011 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Remove SimCard and RuimCard

Remove notions of SimCard and RuimCard since they don't make sense
in the world of Uicc cards where each card can have multiple
3gpp and 3gpp2 subscriptions.

This change prepares code for the introduction of Uicc cards.

Change-Id: Ibab13004604f829328b73c177669b89ef97d3f25
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmConnection.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
0c49f03a0429b5c0c4a619256f7bca86a4997ae8 06-Feb-2012 Jake Hamby <jhamby@google.com> Add support for CMAS warning notifications over CDMA.

Refactor SMS Cell Broadcast support to enable receiving CMAS warning
notifications over CDMA. The CellBroadcastReceiver app must also be
updated with the corresponding change. All cell broadcasts are now
delivered as a Parcelable SmsCbMessage object in the "message" extra
of the SMS_CB_RECEIVED_ACTION or SMS_EMERGENCY_CB_RECEIVED_ACTION,
instead of as a GSM/UMTS "pdu" byte array.

Existing functionality for ETWS and CMAS alerts over GSM/UMTS continues
to be supported using the new radio-technology independent SmsCbMessage
and related objects. Test cases are added to verify that valid and
invalid broadcast data is handled appropriately.

Unit testing discovered a bug in the BitwiseOutputStream utility class
used by the added test cases. When the BitwiseOutputStream object must be
expanded (in the private possExpand() method), the mEnd field is not
updated to the new array size. This causes a new array to be allocated
on every new write, and for all data beyond the original array allocation
to be replaced with zeroes. Fixed by adding a line to possExpand() to
update mEnd. Added a test case to BitwiseStreamsTest to verify the fix.
Besides the test cases, BitwiseOutputStream is only used by BearerData in
two places, both of which allocate a sufficient initial buffer. So the
bug in BitwiseOutputStream is not critical to fix for normal operation,
but should be fixed so that the test cases using it function correctly.

Bug: 5856308
Change-Id: Ie3e6af747976ce9b8a3e71e76fec71709cf86545
ndroid/telephony/SmsCbCmasInfo.java
ndroid/telephony/SmsCbConstants.java
ndroid/telephony/SmsCbEtwsInfo.java
ndroid/telephony/SmsCbLocation.java
ndroid/telephony/SmsCbMessage.java
ndroid/telephony/cdma/CdmaSmsCbProgramData.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSmsCbMessage.java
om/android/internal/telephony/gsm/SmsCbConstants.java
om/android/internal/telephony/gsm/SmsCbHeader.java
fd400f5f483d76a38a28155a7328a953ed3ec36f 27-Feb-2012 John Huang <jsh@google.com> Merge "Prevent dial() return null in a racing condition."
0593c68a986152cd6c21cd92dca43a81c4060fd7 25-Feb-2012 John Wang <johnwang@google.com> Prevent dial() return null in a racing condition.

The racing condition happens between dial() returns and
the first GET_CURRENT_CALLS query gets handled.

If GET_CURRENT_CALLS gets handled before dial() finishs, the pendingMO can be set
to null in handlePollCalls() so that dial() will return null. This null connection causes
error in PhoneUtils.placeCall().

The Synchronized dial() and handlePollCalls() Methods will make sure the
dial() returns before the first GET_CURRENT_CALLS gets handled.

bug:6028290
Change-Id: I41b024760acb7dd13b342866180dffe3fdbe1c03
om/android/internal/telephony/gsm/GsmCallTracker.java
d13f9aa8b1d59f4d8baf21960f18f5f7dc75dad7 25-Feb-2012 Mathias Agopian <mathias@google.com> attempt to fix IMSFramework crash

Change-Id: Iad6dd85afe8f37c1e443c116162d75f116c24316
ndroid/telephony/ServiceState.java
6513daef5e34082d9670c4149252703d40f8d937 25-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Seperate RIL constants from the framework."
1434d7b855108cb14c210b26cabb7bdb15f31887 17-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Seperate RIL constants from the framework.

We have two sets of constants for network type. One used by the RIL can't
be changed without big pains with OEM/Radio vendors. The other has been published
as part of the framework and can't be easily changed either.

Separate the two so it's clear where one should be used versus the other.

bug:5717664
Change-Id: Ibf21f9165662e75557c7254fc9ad9a4870ba4af9
ndroid/telephony/ServiceState.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
ddda82cd6289e1c5eb114854605d750c588d79fe 15-Feb-2012 Daisuke Miyakawa <dmiyakawa@google.com> Merge "Introduce convertAndStrip()"
510db8feb611a924d235b9b8a1d55ebbd36e9022 15-Feb-2012 Daisuke Miyakawa <dmiyakawa@google.com> Introduce convertAndStrip()

Phone app will use this for actual phone calling, coping with
IccProvider, etc.

Add unit tests for the method, and stripSeparators() which is missing

Bug: 5546664
Change-Id: I49b996abe7a44f7db4301b62f667189281fc40e9
ndroid/telephony/PhoneNumberUtils.java
2d9d7fb74b70436b6e0a862cef6d8f16077f6da2 15-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> am 1b2583c4: am 7874efeb: am c8711ca7: Merge "Stop using shared DUN APN when tethering stops." into ics-mr1

* commit '1b2583c41c37c055821d8f4ebbdc717f108c3b48':
Stop using shared DUN APN when tethering stops.
f8b8eafc45c7928fe811ce242fa8275b6d6f57ed 15-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> am 7a08ef44: am e3776a47: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1

* commit '7a08ef442ad6138352785690a8e341607d763399':
Add a config to set Dun capabilities.
c8711ca7eb962072ccd6175be3cfa861195ba6cd 14-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Stop using shared DUN APN when tethering stops." into ics-mr1
2384386f3132839bec0cf460a3f19d068ad28507 13-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Stop using shared DUN APN when tethering stops.

Backported from master, including a bug fix and a cdma enhancement.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using a carrier-
described APN when the tethering stops.

bug:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
8d27f20ac2d5ccbeacb66502309666e0db0ea268 08-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Add a config to set Dun capabilities.

Since CDMA doesn't use APN settings there was no place to say what a cdma
device's DUN connection would support, so by default normal device
originating traffic would be blocked on a tethering single-connection device.

With this change you can (via overlay) say that it supports everything
so mms and on-device browsing/email will still work even when on a dun connection.

The reason to allow both: some carriers will charge per byte for dun access
and so they don't want lots of non-tethering traffic used (costs the user alot)
but other carriers just use a dun connection to limit access to tethering, but
once there give unlimited data, so it makes sense to support everything there.

bug:5972599
Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
75400e775e7f291720aa43fbe6bf2b4ab41265b1 14-Feb-2012 Makoto Onuki <omakoto@google.com> Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."
1b6512127b11256b615c3f8e9049494fb0ad4f1b 08-Feb-2012 Wink Saville <wink@google.com> Merge "Add ril.test.emergency system property."
28900a7b36c372b953648a6ce4c8858de25e9197 08-Feb-2012 Wink Saville <wink@google.com> Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
d38e711dda8ce41d9f99fdffc51c83fc241f2174 07-Feb-2012 Wink Saville <wink@google.com> Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful.

Bug: 3481322
Change-Id: I1fcec7bc7ea2201c471f9fffdcfbc1bb028dbee7
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
17cbdd39ea0319ca2d50ab6ee4b5733312417ec6 07-Feb-2012 John Wang <johnwang@google.com> am 7e6295b3: am 9ad528d5: am 48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1

* commit '7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
7c70cefcae2d6a096112d746ae72f515898a3f45 06-Feb-2012 John Wang <johnwang@google.com> Don't use SNR in the invalid check.

Since some RILs use -1 instead of INVALID_SNR as invalid vlue for
LTE SNR, SignalStrength will not use LTE SNR to check if LTE valid.

bug:5970403
Change-Id: Ia948e076f8f5878e081e87680076b187857879c8
ndroid/telephony/SignalStrength.java
26cd243601fc05c5ed39c2d1e3ab203a8eb97c25 02-Feb-2012 Shaopeng Jia <shaopengjia@google.com> Fix the 3-parameter formatNumber to correctly handle IDDs.

Also added more unittests.

Bug: 5726454

Change-Id: I7fd96b47e7b0c34b66a2fe698308342e125ec0f3
ndroid/telephony/PhoneNumberUtils.java
2149014ed3dd99fb5f03321f96917ce72a7985de 09-Dec-2011 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Fix get_imsi and icc_io

Make get_imsi and icc_io requests to follow ril v6 interface

Change-Id: Ifdbdcfd943f985c759359e59ced82b67195f4163
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IccCardStatus.java
om/android/internal/telephony/IccFileHandler.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
8f241458051c8bd2a68b0e8b9fe0d0f326a0a56b 01-Feb-2012 Alex Yakavenka <ayakaven@quicinc.com> Telephony: Fix sim_refresh as per ril v6

Change-Id: I2d237601c6fd58760c6d5d080709381fddc5cbbe
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccRefreshResponse.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
7f8ab4b786321d8f298e7b4084b099b561481397 31-Jan-2012 Justin Ho <justinho@google.com> am 66146c4f: am 792d83c5: Merge "Use LTE SNR and RSRP to set signal level bar." into ics-mr1

* commit '66146c4f5b3930f7f5f08b845fb30f2bc24f8c3d':
Use LTE SNR and RSRP to set signal level bar.
5e39519396918f9e2312d1c355a9b6889851d887 31-Jan-2012 John Wang <johnwang@google.com> Use LTE SNR and RSRP to set signal level bar.

The LTE signal strength level is the smaller one
between lte rsrp level and lte snr level if both
rsrp and snr are valid.

The lte snr mapping are

Four bars: SNR >= 45
Three bars: 10 <= SNR < 45
Two bars: -30 <= SNR < 10
One bars: SNR < -30
No bars: No Service

The invalid value of lte snr is changed to INVALID_SNR
from -1, since -1 is a valid value of lte snr.

bug:5640958
Change-Id: If26aaba0c7fcc0fee3db488b5adfa02922f06715
ndroid/telephony/SignalStrength.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
7a41c7013d0ed319fcb4384cc4b5cf26b22d3580 30-Jan-2012 John Wang <johnwang@google.com> am 136704a8: am b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1

* commit '136704a803ed7dd419a452315d1c0fe4885ce441':
Adjust the LTE signal bar mapping.
4ed37ea81a239f189e65be89651b988e47e836ca 26-Jan-2012 Jean-Michel Trivi <jmtrivi@google.com> Bug 5567648 Request and abandon audio focus in calls

Up to now, audio focus was implicitly requested and abandoned
when changing the audio mode. This is no longer the case so the
behavior with regards to audio focus can be indepently set by
the CallManager.
The logic implemented here is the same as the one previously used
in AudioService:
- only request audio focus when the ring volume index is > 0
when ringing,
- request focus before setting the audio mode to a mode other
than normal
- abandon audio focus after setting the audio mode to normal

Change-Id: Ia543dc779563dbff09414771fee60e589dfaab9d
om/android/internal/telephony/CallManager.java
2c911b24163c9bcb50bc548c828b7fc2f6ef8bce 27-Jan-2012 John Wang <johnwang@google.com> Adjust the LTE signal bar mapping.

The new mapping are

Four bars: RSRP >= -95dBm
Three bars: -105 dBm <= RSRP < -95 dBm
Two bars: -115 dBm <= RSRP < -105 dBm
One bars: RSRP < -115 dBm
No bars: No Service

bug:5640958
Change-Id: I9efabaeac33b624ea0a58a4d3760169dff6544f6
ndroid/telephony/SignalStrength.java
b2bf3350a2c83b1eba43ae85ed1aa5bc59a59897 25-Jan-2012 Wink Saville <wink@google.com> Fix ClassCastException

In "Change I95ed2aae: Stop using shared DUN APN when tethering stops",
sha1: 8beff9586ff89a1e59469e9820fd9e9d704300d2, an assumption is made
that the msg.obj is always an ApnContext, this is not true for CDMA.
Eventually we plan on removing the destinction between GSM and CDMA but
for now we need to handle it handle it.

Bug: 5904734
Change-Id: I86873dc7aeda5234c14a6fe1e4ec7345ee30e957
om/android/internal/telephony/DataConnection.java
7c27ac64d5072b411a50419a0a08bf6d568d19ad 23-Jan-2012 Wink Saville <wink@google.com> Do not clear good TLVs when a error occurs decoding.

In change Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf with a sha1 of
e81932e92a773538e1ad1ad1d4bfd8f241860c8d it seemed like a good idea
to throw away all TLV's on errors. In retrospect that was probably
not a good idea. For example on the MTN Ghana SIM the error
occurs because of some 0 pad bytes at the end, all of the actual
TLV's are good, so throwing away everything is unreasonable. Instead
accepting what is valid seems a better approach.

Also, add a couple debug lines on error paths.

Change-Id: I4add0c9cd242f46e0ef8700229d0ec755b9e4c4c
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/ComprehensionTlv.java
18798131c611301a38e194deac91ff35278da9cc 21-Jan-2012 Wink Saville <wink@google.com> Merge "Additional logging information for Card Application Toolkit/SIM Toolkit"
ea7527eca9d82ef6c8f7bc4c84336116dfffe4a1 21-Jan-2012 Wink Saville <wink@google.com> Additional logging information for Card Application Toolkit/SIM Toolkit

Add an optional explanation field and toString to ResultException
Add toString to CommandDetails.
Add add a few more log statements on error paths.

Bug: 5852715
Change-Id: I8594178002a67798aa3fb38ce1ee15c1a41f1854
om/android/internal/telephony/cat/BerTlv.java
om/android/internal/telephony/cat/CommandDetails.java
om/android/internal/telephony/cat/CommandParams.java
om/android/internal/telephony/cat/CommandParamsFactory.java
om/android/internal/telephony/cat/ComprehensionTlv.java
om/android/internal/telephony/cat/ResultException.java
om/android/internal/telephony/cat/RilMessageDecoder.java
2772143eff6a69ae7182e0c2628809d8dbd8d355 20-Jan-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Stop using shared DUN APN when tethering stops."
170bfe32ab8971805d56f8870758cbc46060d1ef 19-Jan-2012 Wink Saville <wink@google.com> am 7b6231a4: am aba79851: Merge "Use new preferredAPN URI avoiding onApnChanged() call with self-change" into ics-mr1

* commit '7b6231a44e21fbf5b2bc2a5eff2231139ac4088f':
Use new preferredAPN URI avoiding onApnChanged() call with self-change
1e6329d4545955d5ebb440d09be9eb974ab3a2a6 17-Jan-2012 Wink Saville <wink@google.com> Use new preferredAPN URI avoiding onApnChanged() call with self-change

Solving the issue that setting preferred APN from GDCT triggers
back APN change event and force unnecessary data call disconnects
and setups.

The new URI is added in Telephony Provider so ContentObserver
callback (results in onApnChanged) will not be triggered.

Bug:5448858
Change-Id: I4c0bcf32cec69cf1d0a0430f7a27495b89e93625
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
70f52e6d795f1cd4d23efcbdc2b9e2f9d0c22eb6 13-Jan-2012 John Huang <jsh@google.com> am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1

* commit 'e65723044d6ad7fb2ff1bb760100a3cf40c6c5f2':
Fix teardown of secondary connections on CDMA
2fceb7fec09f903c8505f0889a09d431e7b743f1 13-Jan-2012 Robert Greenwalt <rgreenwalt@google.com> Fix teardown of secondary connections on CDMA

Restores functionallity from Gingerbread. We should tear down when the
enabledcount goes to zero, but we should always notify and attempt to
switch back to default when indicated.

bug:5830081
Change-Id: Ib8469bb5369da21e8cc05fb755b2d7e24c8e02a6
om/android/internal/telephony/DataConnectionTracker.java
140d0158c46c580c45f88f9b880906d517c4e96e 12-Jan-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Ignore case on apn type strings."
bcf1276830bfe44669fd4876a6ce933ae57de8fc 11-Jan-2012 Robert Greenwalt <rgreenwalt@google.com> Ignore case on apn type strings.

Found that if the type were not lowercase it wouldn't match.
That's silly. Do case-insensitive compares.

bug:5525764
Change-Id: Ibfe6be6c34116e00931594ec317fe192e1756ade
om/android/internal/telephony/ApnSetting.java
1f7b23dda211f419f0a140b871de44339c4a10c7 12-Jan-2012 John Wang <johnwang@google.com> am 70205788: am 6ad68ba9: Adjust the mapping of LTE signal bars.

* commit '70205788fa39968b8331085597e3d3b61e271fbe':
Adjust the mapping of LTE signal bars.
6ad68ba9d99d48cc5c189dc7e32e577f56ce51fd 11-Jan-2012 John Wang <johnwang@google.com> Adjust the mapping of LTE signal bars.

bug:5640958
Change-Id: I91efc5a81b505aae59dac9b1d69314efaffda6b6
ndroid/telephony/SignalStrength.java
7c20c4607c4402589ce4800a0c49127876dbc6bd 11-Jan-2012 Wink Saville <wink@google.com> Add ril.test.emergency system property.

This allows testing of emergency numbers by dialing an emergency
number but having it remapped to another number.

Bug: 5479306
Change-Id: Ia9bb53e2e2e47f78dc9f75d3add6f785d10e4b2a
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/gsm/GsmCallTracker.java
7a939077bd14521c7d351af98df7ed75a8ec9c15 07-Jan-2012 Wink Saville <wink@google.com> Merge "Add use of net.tethering.noprovisioning to fetchDunApn"
43420a49f942e5580ddef2311a8c5e872428116a 07-Jan-2012 Wink Saville <wink@google.com> Add use of net.tethering.noprovisioning to fetchDunApn

To make it easier to test tethering, have fetchDunApn
return null when the system property
net.tethering.noprovisioning is true.

Change-Id: Id6162967c6b8b25f04380fe009961c150fa714ef
om/android/internal/telephony/DataConnectionTracker.java
bbfec33d946aa66a2f1414d4f1ec69a5f2b80134 06-Jan-2012 Wink Saville <wink@google.com> am f817e941: am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1

* commit 'f817e9413356de2a303e14709e67457190e976c9':
Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
17907a7b7410498f9910d487e8cbf97d8e7d050e 06-Jan-2012 Wink Saville <wink@google.com> Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete

Instead of throwing an exception when the connection between
the DCT and a DC is broken (i.e. its null) it is treated as
an error with a new cause. And thus will be handled as other
typical errors.

Bug: 5798643
Change-Id: I46f1660ae78f118b54ab62504809723ca302b2ef
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9a03482c66b2f5c30c7fde38216239a1f233df02 05-Jan-2012 Wink Saville <wink@google.com> am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1

* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
Enhancement on ICS data stall polling logic
efd617e01f8c22a69fa6d458883933f059e43491 05-Jan-2012 Wink Saville <wink@google.com> am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1

* commit '0ad96f89401920486b68d8404f6a143870d57500':
Add support of dislaying Alpha tag for BIP commands
7da207b574f1281792dcd7022467180d24438315 05-Jan-2012 Wink Saville <wink@google.com> am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1

* commit 'a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
Support suggestedRetryTime in CDMA DCT
c697ebfdd671c7f4cf338d601917de16d2f1f135 04-Jan-2012 Wink Saville <wink@google.com> Merge "Enhancement on ICS data stall polling logic" into ics-mr1
d4d35168129d544f62cee7e1f83c5bf15d9f291d 04-Jan-2012 Wink Saville <wink@google.com> Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
7efb89b955a9f885835727b758e494714ee73beb 22-Dec-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Enhancement on ICS data stall polling logic

Put enhancements on data stall polling logic in ICS so that
stall recovery can kick in earler while screen is on.

Bug: 5767897
Change-Id: I4683fc45c0161f4374749c8e5840261c19a48f77
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
8beff9586ff89a1e59469e9820fd9e9d704300d2 14-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> Stop using shared DUN APN when tethering stops.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using
a carrier-described APN when the tethering stops.

bug:5525764
Change-Id: I95ed2aaed4d79519d233a62cf2945edead8114bc
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
81fa7f305b0b3427d33143cb800b7d6ca730ba64 04-Jan-2012 Wink Saville <wink@google.com> Add support of dislaying Alpha tag for BIP commands

While BIP data call setup is still handled in RIL/Modem,
this patch is adding support of Alpha tag display on UI.
Alpha tag is optionally included in "OPEN Channel", "Close Channel",
"Send Data" or "Receive Data" command.

"Open channel" will be notified via RIL_UNSOL_STK_PROACTIVE_COMMAND
which requires TERMINAL RESPONSE based on user input.
"Close channel", "Send Data" and "Receive Data" commands
are send via RIL_UNSOL_STK_EVENT_NOTIFY just to display
transient notice.

Bug:5165510
Change-Id: I873e55274c860886bc816ce6fb07cb882d339214
om/android/internal/telephony/cat/AppInterface.java
om/android/internal/telephony/cat/CatCmdMessage.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/CommandParams.java
om/android/internal/telephony/cat/CommandParamsFactory.java
e7f2cafc172e0671a40e46ce86107c50d884af1f 30-Dec-2011 Wink Saville <wink@google.com> Merge "Separate SIM states from Radio states"
fc2cbe9b46ab17a401dc50f8e0dbb677ed012299 30-Dec-2011 Naveen Kalla <nkalla@quicinc.com> Separate SIM states from Radio states

Radio state reflects the state of the modem. SIM_READY, RUIM_READY,
NV_READY are subscription states and it is possible that the new cards
have multiple subscriptions. Remove the SIM states from Radio State and
introduce a new VOICE_RADIO_TECH message to identify the exact voice
technology. SIM states will continue to be identified from the
SIM_STATUS messages.

Change-Id: Ia67d54f43b6c3340d9cf5c27fcb6f7ef49ef4d40
ndroid/telephony/ServiceState.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
2cc19b1cc93a176bf15d83f05e3c43b90bfe279c 20-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> Use shared connections over retries.

Old code would detect we were in a retry loop and ignore other active
connections we could share. We really want live shared connections to
dominate over retrying disconnected ones.

bug:5525764
Change-Id: If93383c52024113eec595b31e46897d1fcabc44c
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6de972a5c3bd614aefa1f17e9a1e00f08613a336 13-Dec-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Support suggestedRetryTime in CDMA DCT

Support suggestedRetryTime in SETUP_DATA response in CDMA DCT.

Bug: 5740832
Change-Id: I4abd884bec76f1d9ee29d1ba36c7ea2cac9e0fb3
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
a78a08b103efc0e2068678b0a05b547fa433739b 08-Dec-2011 Wink Saville <wink@google.com> am ea75b822: am 234a5ef6: Merge "When the SIM_READY set current preferred network type." into ics-mr1

* commit 'ea75b82221dc9086cf97a791aed3b79ff3731bba':
When the SIM_READY set current preferred network type.
975d348c18f7b9d378bebf3f69e6197b261705f0 08-Dec-2011 Wink Saville <wink@google.com> When the SIM_READY set current preferred network type.

This looks to fix a problem where the nv_data.bin file
file gets corrupted. When greping a radio log for "md5" if something
like following is seen:

RIL(s) : load_md5_state: MD5 state 1
RIL(s) : check_md5:
RIL(s) : compute_md5: path /efs/nv_data.bin
RIL(s) : check_md5: MD5 fail. orignal md5 '628647a8e5c6cac2d586199417c0103c' computed md5 '58a635cbaf5fe4ffb2797aeaa2b32709' (rild)
RIL(s) : check_md5:
RIL(s) : compute_md5: path /efs/.nv_data.bak

It means that corruption was detected and a back version was used
which is ok. Apparently that backup version can have the default
network type revert to 2G only thus causing the symptoms reported
in b/5695729 where after taking an OTA 2G becomes the default.

By calling setCurrentPreferredNetworkType when the sim is ready we
can reset the the network type to 3G.

Note: I also tried calling setCurrentPreferredNetworkType in
EVENT_RADIO_AVAILABLE but that didn't work and we would see
the response to setPreferredNetworkType failing as the ril wasn't ready.

RILJ : setCurrentPreferredNetworkType: 0
RILJ : [0004]> REQUEST_SET_PREFERRED_NETWORK_TYPE : 0
RILJ : [0004]< REQUEST_SET_PREFERRED_NETWORK_TYPE error: com.android.internal.telephony.CommandException: RADIO_NOT_AVAILABLE


Bug: 5695729
Change-Id: Ibbd29cda0b201a8c08f4dcfa5cec211611e1d599
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
10fd37dd9e502d40057abb8ab85614552b78b7ad 08-Dec-2011 John Wang <johnwang@google.com> am 2de0b07f: am ca0a68cc: Merge "Correct the dialing number of structured MMI." into ics-mr1

* commit '2de0b07f47c3561b6e550ff630901d2776a437e3':
Correct the dialing number of structured MMI.
ca0a68cc8afd023c94bcd5a1f3f2b2f9407fbe3b 08-Dec-2011 John Wang <johnwang@google.com> Merge "Correct the dialing number of structured MMI." into ics-mr1
269081781573ac6f830c00b24efe3cf8af80bd32 08-Dec-2011 John Wang <johnwang@google.com> Correct the dialing number of structured MMI.

According to TS 22.030 6.5.2 "Structure of the MMI", the dialing number
can not end with #. The format is like *SC*SI#DN. Correct the mmi pattern
to exclude DN# case. With this fix, processCode() will tread *NNN#DN#,
e.g. *400#16 digit number# in bug 5622718, as USSD and send via
RIL_REQUEST_SEND_USSD.

bug:5622718
Change-Id: Ifc8d0edff4308602a5f3fc651cf116bf6bad3cbc
om/android/internal/telephony/gsm/GsmMmiCode.java
86a943951b16b0da04ab64ef805d4a83da70a9b1 07-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1

* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
d4420ab2fbb85280d2f507072fe0bd820ac26a3f 07-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> Trim leading zeros from ipv4 addrs.

Underlying libraries will interpret leading zeros as octal values and
fail.

bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
2a1152ac96140b12836b19479e341b299dff7d9a 03-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1

* commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2':
Be careful sharing connections when dun is in play
7cb88dda5b9ee7c19f0f6c3c7a240eb1674fe2f4 03-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> Be careful sharing connections when dun is in play

A request for a DUN connection should only use the carriers requested dun connection. Don't
share another connection unless it matches the carriers settings.

bug:5701374
Change-Id: I75a65fcfce1b218bd9ca4ce2ab85cbe850813321
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
89b262990fc82b1b928519744b1640ead406f110 01-Dec-2011 Robert Greenwalt <rgreenwalt@google.com> am c8e643a8: am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1

* commit 'c8e643a86345ef7e2807946107062c9d8635455d':
Fix state synchronization problem.
645c80654ff55f129a7d87873ee2ad7cf3350678 30-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Fix state synchronization problem.

Don't report that we're disconnected immediately if we're disconnecting when another
disconnect comes in. Remove this behavior from the default handler and add a catch
all "yeah, we're disconnected already" to the inactive state.

bug:5568633
Change-Id: Iff7ccde2069b47f8ad8255f3bca0292b80041388
om/android/internal/telephony/DataConnection.java
f40e91c77ef32578554ced2ae28b585cf8e7f876 30-Nov-2011 David Brown <dab@google.com> Merge "Add support for country specific emergency number handling."
b74ecb1d455011b7b4e979c480048395f6a2fd7a 24-Nov-2011 John Wang <johnwang@google.com> Fix a build break.

Change-Id: I2a9ceaace02f442c5e36fa8425b051116c81e76f
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9b1080091c4ac97378db366cdd6961aba28756c5 23-Nov-2011 John Wang <johnwang@google.com> Check watingApns before access it.

bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
eaeb4f4e3c914550d28a042fb3d752efcf20ab9e 23-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix some policy-base routing issues." into ics-mr1
e83d181606981bcacd78e55b293fe9fa95b2551d 21-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Fix some policy-base routing issues.

Secondary nets sometimes come up with no routes, but parsing errors end up with null
routes getting added. Trim that away. Also added some dumpstate logging of the secondary
route tables and rules.

bug:5615697
Change-Id: I94c9d888bab958df44891b9117236436e046cc7f
om/android/internal/telephony/DataCallState.java
ab971d3c26346cfd94a37e40591318bf3b3ae4fd 20-Nov-2011 Shaopeng Jia <shaopengjia@google.com> Add support for country specific emergency number handling.

Bug: 5247602, 5615428
Change-Id: I1bdfbc987f45e0f2ebbe68adaab215395c83ca35
ndroid/telephony/PhoneNumberUtils.java
158f116eb7fdc23a12d6822d34a549f33605bc8c 17-Nov-2011 David Brown <dab@google.com> Fix a crash caused by SIP addresses containing "%40" instead of "@"

CallerInfo.doSecondaryLookupIfNecessary() was assuming that SIP addresses
would always contain the character '@', but that's not always true since
the username/domainname delimiter can actually be "%40" (the URI-escaped
equivalent.)

This would cause the in-call UI to crash if you ever called a SIP address
like "xyz%40example.com".

TESTED:
- Make an outgoing call to the SIP address "xyz%40example.com"
==> The call ultimately fails, but the in-call UI no longer crashes when
it first comes up.

Bug: 5637074
Change-Id: I62d15a7ccd509924d38b780b92e657b9efa26125
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfo.java
277b13e091aa81ddaf4ac40b9cf4073d997ea4fb 17-Nov-2011 David Brown <dab@google.com> SIP addresses containing "911" shouldn't be considered emergency calls

This change updates isEmergencyNumberInternal() to always return false if
you pass in a SIP address, since the concept of "emergency numbers" is
only meaningful for calls placed over the cell network.

Previously we *did* try to compare SIP addresses against the list of known
emergency numbers, which caused bad behavior with SIP addresses that even
contained "911"/"112"/etc as a substring (since we were filtering out
non-dialable characters before doing the comparison!)

TESTED:

- Before this change, calls to "abc911def@example.com" or
"911abcdef@example.com" were incorrectly detected as emergency
numbers, and fail.

- After this change, SIP addresses like "abc911def@example.com" and
"911abcdef@example.com" work fine.

- Also, confirmed that this change doesn't break the restriction that
3rd party apps shouldn't be able to make emergency calls.

Specifically, I fired off ACTION_CALL intents (using the CallDialTest
activity) for a bunch of numbers *similar* to emergency numbers, and
confirmed that none of them actually resulted in an emergency call
being placed.
The specific ACTION_CALL intents I tested were:
"911" ==> Didn't place the call; brought up dialer instead
"tel:911" ==> Didn't place the call; brought up dialer instead
"911@foo" ==> Tried to start a SIP call (which failed)
"911%40foo" ==> Tried to start a SIP call (which failed)
"tel:911@foo" ==> Tried to start a SIP call (which failed)
"tel:911%40foo" ==> Tried to start a SIP call (which failed)
"911@example.com" ==> Tried to start a SIP call (which failed)
"sip:911" ==> Didn't place the call; brought up dialer instead
"sip:911@foo" ==> Tried to start a SIP call (which failed)
"sip:911%40foo" ==> Tried to start a SIP call (which failed)

Bug: 5515452
Change-Id: I6f9f8690b08564c53c7a76f480654477b475d94d
ndroid/telephony/PhoneNumberUtils.java
33fe4a36b7d1ef84b13447f2a765db465ef96e56 16-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix TelephonyManager to grab the best context" into ics-mr1
8f4f814beb03400e9143b7c88307b2fd68abd77c 16-Nov-2011 Robert Greenwalt <rgreenwalt@google.com> Fix TelephonyManager to grab the best context

It may not be called from an app so the app context may not exist.
Check and grab the best one.
Also remove the log that nobody paid attention to if the constructor
is called again from the same process. One context seems to be as
useful as another.

bug:5572369
bug:5622514
Change-Id: Iad23b30c7c8fe5b8d1f81a1e060eaf0cd0e3019d
ndroid/telephony/TelephonyManager.java
bd7836846c1e5d3610ba6c26686674d429a4316c 16-Nov-2011 Jake Hamby <jhamby@google.com> am 7d4046e9: Merge "Fix 3GPP SMS send failure for 7-bit national language tables." into ics-mr0

* commit '7d4046e9b7b95e1d5de12a54109b44d8305a6fdc':
Fix 3GPP SMS send failure for 7-bit national language tables.
87d14a1756f2ff4abdc107de35d06739245a606e 15-Nov-2011 Jake Hamby <jhamby@google.com> Fix 3GPP SMS send failure for 7-bit national language tables.

Fix a NullPointerException when sending a single-part SMS containing
characters in one of the enabled national language tables.

Also added a few log messages for several error cases to help with
debugging any future problems in the SMS dispatcher.

Bug: 5553544
Change-Id: I61c1cbe297b2e222027f0db7c833df6a03c2974a
om/android/internal/telephony/SmsHeader.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SmsMessage.java
e81932e92a773538e1ad1ad1d4bfd8f241860c8d 12-Nov-2011 dujin.cha <dujin.cha@samsung.com> [maguro] Fix STK issues

1. Fix Bug 5574160 (Abnormal Setup menu)
2. Fix Bug 5558273 (GetInkey issue)
3. Fix BUg 5558612 (No default alpha id)
4. Fix Vodafone UK ALS issue.

Bug : 5574160, 5558273, 5558612

Change-Id: Ief74d0e4f4f28dff7a435e9dab1fab1ca1d9bfaf
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/CommandParamsFactory.java
om/android/internal/telephony/cat/ComprehensionTlv.java
om/android/internal/telephony/cat/ValueParser.java
a092ba5667e9c055f4d5c83296c8c81471695747 10-Nov-2011 Wink Saville <wink@google.com> am e562287c: Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0

* commit 'e562287c85662457864255028cd4bc3b04f13750':
[maguro] Update COMPREHENSION-TLV parser in CAT
e562287c85662457864255028cd4bc3b04f13750 10-Nov-2011 Wink Saville <wink@google.com> Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0
08b3ffe61182b60ded3bfa599778b6f5495e87db 10-Nov-2011 Wink Saville <wink@google.com> am 16ee60a5: Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0

* commit '16ee60a5ae0336a46a417a72bca64a1a04b0fce2':
Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.
16ee60a5ae0336a46a417a72bca64a1a04b0fce2 10-Nov-2011 Wink Saville <wink@google.com> Merge "Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes." into ics-mr0
6fc3ca7e195e9da551ee4878af56d0b959e222e7 10-Nov-2011 Wink Saville <wink@google.com> Increase DATA_STALL_ALARM_DELAY_IN_MS_DEFAULT to 6 minutes.

Initially set to 3 minutes this raised the standby current
by 12.5% so changing to 6 minutes.

Bug: 5534004
Change-Id: I602f5fe4de35d0db2dbacf0c615c300c57dd2d0d
om/android/internal/telephony/DataConnectionTracker.java
f08455451c5cca9b7e1bc22409df774c47b85e06 10-Nov-2011 Wink Saville <wink@google.com> [maguro] Update COMPREHENSION-TLV parser in CAT

1. Fix the ClassCastException while handling spec out 'Setup menu'
-Ghana MTN simcard and JDI simcard sends abnormal 'setup menu'cmd.
-Those 'setup menu' is spec out.
-At the end of the proactive cmd,extra bytes '0x00 0x00 0x00 0x00' is
followed.
- That cause ClassCastException and phone crash.

Bug: 5574160
Change-Id: Ieafb6c4efd94bb4e2a39a04612a6761c958654bb
Signed-off-by: dujin.cha <dujin.cha@samsung.com>
om/android/internal/telephony/cat/ComprehensionTlv.java
b6b44cef94a38b6f403b43f55d77d3602de18a3c 09-Nov-2011 David Brown <dab@google.com> am 59882fb8: Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0

* commit '59882fb8e0ba7c47b780d62c9a9c46b63d779677':
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
9c5c97f61818f4d20079616a98d62f888f07d285 09-Nov-2011 Jake Hamby <jhamby@google.com> am fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0

* commit 'fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.
59882fb8e0ba7c47b780d62c9a9c46b63d779677 09-Nov-2011 David Brown <dab@google.com> Merge "Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()" into ics-mr0
3f3115b27733a822104385284b1ec1f39d91f839 09-Nov-2011 Jeff Sharkey <jsharkey@android.com> Make policy data enabled flag static.

For devices with both CDMA and GSM stack, ConnectivityService only
connects with the GSM variant. Making this flag static communicates
the policy state between all DCT.

Bug: 5586935
Change-Id: Iff0384027303470dd382d5173558d2d091ce4bf6
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
1a811695f9ae2ac806a64fd3b6c440c83262dc52 08-Nov-2011 David Brown <dab@google.com> Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()

The phone app needs a way to distinguish between (a) numbers that are
definitely emergency numbers, and (b) numbers that *might* result in an
emergency call being dialed, but aren't specifically emergency numbers
themselves.

(The phone app needs this distinction in order to enforce the restriction
that 3rd party apps should not be allowed to make emergency calls using
the ACTION_CALL intent, while still making sure that the in-call UI only
displays the "emergency call" state for numbers that are *definitely*
emergency numbers. See bug 5493790 for the full details;)

So this change adds a full set of "isPotentialEmergencyNumber()" methods
to go along with the "isEmergencyNumber()" methods we've had all along.
The "potential" variants behave identically to the original methods,
*except* that they ultimately use number.startsWith() rather than
number.equals() when comparing against the list of emergency numbers.

TESTED:

- Unit test 'PhoneNumberUtilsTest#testIsEmergencyNumber' passes.
(The PhoneNumberUtilsTest class doesn't pass in its entirety, but it was
broken before this change also.)

- Also see the commit description of change
Ib949fea3c0ce6b341a90e617a03ba3f22c69018b for the exact tests I ran
against the phone app.

This change should be submitted along with
Change-Id: Ib949fea3c0ce6b341a90e617a03ba3f22c69018b
in apps/Phone (but this change must go in first to avoid breaking the
build.)

Bug: 5493790
Change-Id: Ic528cfcc555734cdaf4ca8a18a50199771ba49b1
ndroid/telephony/PhoneNumberUtils.java
141da403c0ad2d06b8f55e737ddf5d9e2b64c536 02-Nov-2011 bi4004.lee <bi4004.lee@samsung.com> Fix exception when sending multi-page SMS with Turkish characters.

- Precondition: config_sms_enabled_single_shift_tables is configured as
1 (Turkish) in frameworks/base/core/res/res/values/config.xml

- Cause: There is no consideration for National Language Shift Tables in
SmsMessage::fragmentText function.

- Solution: The header length is calculated properly according to
National Language Shift Table

- modified to add test cases and fix calculation bug (jhamby@google.com)

Bug: 5553544
Change-Id: I9eaefbbd6b3d75f8c41cbf9d0cb03a701cfa1cb3
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/GsmAlphabet.java
f885e878846e589d628149bcbae5216a30443876 08-Nov-2011 John Wang <johnwang@google.com> Remain in call audio mode while phone is offhook.

While offhook, even the call is on hold, setAudioMode() remains in
MODE_IN_CALL (or MODE_IN_COMMUNICATION for SIP) rather than
switching back to NORMAL.

bug:5546901
Change-Id: I0189dc010d1109895cc38e17b1b80418445d514a
om/android/internal/telephony/CallManager.java
9ca0f1222711b4cce1de56c6623790165870392a 04-Nov-2011 Wink Saville <wink@google.com> am e4ca9242: Fix the build.

* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
Fix the build.
8b77124395713de5e09c9b56fac03c244513dc25 04-Nov-2011 Wink Saville <wink@google.com> am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0

* commit '3d7084519b03da0681da13fb8d7d4a0914d11646':
Separate data stall detection and recovery from net stats.
e4ca92421cc07c2f7f152b774dd1ac7a8944028b 04-Nov-2011 Wink Saville <wink@google.com> Fix the build.

Needed to update EventLogTags.logtags

Change-Id: Ie7d13e012c52778892167380f4fd273f67bb7d62
om/android/internal/telephony/EventLogTags.logtags
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
2861d23d660c577c65faa7dfebd66d5b6f3f1a56 04-Nov-2011 Wink Saville <wink@google.com> Separate data stall detection and recovery from net stats.

Also use the AlarmManager instead of messages so the delays
are consistent whether sleeping or not.

Bug: 5534004
Change-Id: I24118b30214dddf8183c1200a89555d6c528e606
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e3a31d0340802352d568c8c35ff1fa1047018a42 28-Oct-2011 Jake Hamby <jhamby@google.com> am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0

* commit '31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
Fix bug in enabling/disabling SMS cell broadcast activation.
f044a370d41687e0546a63b747b7c383f7f41e3e 28-Oct-2011 Jake Hamby <jhamby@google.com> Fix bug in enabling/disabling SMS cell broadcast activation.

When enabling/disabling SMS cell broadcast channels, we were not calling
setGsmBroadcastActivation() with the correct value after updating the
message IDs. It should be called with true if any message IDs are enabled,
or false if the list is empty.

Added an isEmpty() method to IntRangeManager, and moved the call to
setGsmBroadcastActivation() in SimSmsInterfaceManager to the end of the
enableCellBroadcastRange() and disableCellBroadcastRange() methods,
where it sets the correct value using the new isEmpty() method to test
if there are any message IDs enabled after updating the range list.

Bug: 5525441
Change-Id: I7d1ebd54dacf1de20910947efbf5e87e1957fd1a
om/android/internal/telephony/IntRangeManager.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
e49cf107e2533b7ca71c500bc20a0f6dcdf9efdc 25-Oct-2011 Ed Heyl <ed@google.com> merge ics-mr0

Change-Id: I4f0b2bb1b1136c9467e9d55f57f5333153cae65d
cd3ec73f0ce164c718146bc1dbb7c430763be25a 24-Oct-2011 Wink Saville <wink@google.com> Add getAvailableNetworks.

To allow a operator test to pass we need to manually select
a network. Therefore getAvailableNetworks needs to be implemented
on CDMALTEPhone so that RIL_REQUEST_QUERY_AVAILABLE_NETWORKS is
sent to the RIL/radio.

Bug: 5420630
Change-Id: I8e138b211d42755399a9e30f3e45dde2f579401e
om/android/internal/telephony/cdma/CDMALTEPhone.java
ac09d2af145b4d820a34f5e7628bc42e2e211bdb 01-Oct-2011 Jake Hamby <jhamby@google.com> Add support for SMS-PP data download to USIM.

Devices supporting IMS may receive SMS-PP data download messages
which are normally handled in the radio baseband. Add support to
framework for these messages, passing the data to the UICC and
sending the response data as part of the SMS ACK.

Change-Id: I1da76982c6f8c402f82a6f535591e614f4e0de18
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IccIoResult.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/ComprehensionTlvTag.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SmsMessage.java
om/android/internal/telephony/gsm/UsimDataDownloadHandler.java
4db49b33b83ff15850fee961326798db60794be8 24-Sep-2011 Jake Hamby <jhamby@google.com> Add wrapper classes for UICC service tables.

The USIM application on the UICC contains an EF for the USIM service table,
a byte array containing a bit field of available services on the USIM.

IccServiceTable is an abstract class to manage a byte array containing a
service table and map it to human-readable enum values defined in the
subclass, e.g. UsimServiceTable. The availability of a service can be
tested with isAvailable(), which is implemented in the subclass to take
an enum, e.g. UsimService, as a parameter, and passes the ordinal to the
generic isAvailable() in the parent. IccServiceTable also provides a
toString() method that returns a human-readable list of enabled services.

The ISIM application for IMS contains a similar ISIM service table.
This can be supported with a new IsimServiceTable class in the future.

Change-Id: I9c3134672ed306e297dd35d633235cffca510aad
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/IccServiceTable.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/UsimServiceTable.java
094854091b63498f952f0a6c4bcedfdfefaf1cf7 26-Sep-2011 Jake Hamby <jhamby@google.com> Add new RIL requests to support SIM data download via SMS over IMS.

On an LTE device where incoming SMS messages over IMS are sent to
the framework via RIL_UNSOL_RESPONSE_NEW_SMS responses sent to
the RIL, it may be necessary to process USIM data download SM's
(message class 2). This requires the RIL to implement two new requests.

1) RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS:
send an ENVELOPE command to the UICC, receiving the SW1 and SW2
status bytes in addition to the command response.

2) RIL_REQUEST_SMS_ACKNOWLEDGE_WITH_PDU:
send an RP-ACK or RP-ERROR acknowledgement to the incoming SM,
including an acknowledgement PDU containing the envelope response.

Change-Id: If597a14fa8c4780c75da84fa96c49abcb05960f2
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
b7219108c241bc951acb123177d23c1cf8aeca58 20-Oct-2011 Wink Saville <wink@google.com> Merge "Non-default link should be cleaned up on telephony db change."
3119b96098a8ef9a0a8931b142f4ac8e87a48693 20-Oct-2011 Wink Saville <wink@google.com> Non-default link should be cleaned up on telephony db change.

Fixed onApnChanged method to handle multiple APN scenario.
Non-default links also needs to be cleaned up once telephony db
is updated.

Bug: 5333303
Change-Id: I6d8d2b4e2f5b07ebf0e22669c910e4ebaddfe392
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
7d505255111cea3f3d5d44b70861ddad5b492d25 19-Oct-2011 Wink Saville <wink@google.com> Do not always say OTASP_NOT_NEEDED for LTE.

Do not override CdamServiceStateTracker#getOtasp as we
should report the "real" status as OTASP can be needed
for LTE.

Bug: 5413788
Change-Id: Ia34c9e1169bfc9682f81f9c4935eb2853507bd04
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
09cd10c7e2f69d0f39e997d45a0548737cad7304 18-Oct-2011 Robert Greenwalt <rgreenwalt@google.com> am dd466152: Merge "Initialize Hipri correctly." into ics-mr0

* commit 'dd466152dd1b88f7b5bd73c47715eb84b76e6dab':
Initialize Hipri correctly.
dd466152dd1b88f7b5bd73c47715eb84b76e6dab 18-Oct-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Initialize Hipri correctly." into ics-mr0
7a0390b97c0a9dfa4a32cd472a83a9f7471ba569 18-Oct-2011 Wink Saville <wink@google.com> am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0

* commit '07848843b23e10e4728fa779cc79fc38a341cf6b':
Add DataConnection#isEmergency and use in trySetupData.
07848843b23e10e4728fa779cc79fc38a341cf6b 18-Oct-2011 Wink Saville <wink@google.com> Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0
977e8ec81071a7110be3357d28d067f62abd80d6 18-Oct-2011 Jake Hamby <jhamby@google.com> am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0

* commit 'f522e095e69406a5c6039b406237e9b30781a355':
Add wrapper method to GsmAlphabet for API compatibility.
f522e095e69406a5c6039b406237e9b30781a355 18-Oct-2011 Jake Hamby <jhamby@google.com> Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0
a4bc82aca55e8b7f4c2f1bc7957595aea06dfac4 18-Oct-2011 Robert Greenwalt <rgreenwalt@google.com> Initialize Hipri correctly.

The old code was dependent on the order of things in config.xml. This fixes that
so hipri will get the correct dependency-met value at startup. Good ITS test.

bug:5382518
Change-Id: Ie327ab1abbc5697ffab0ed4d8c9d6de321513adb
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9b61778d63ac41d489ecb40b385cf3f87bdee1f9 18-Oct-2011 Robert Greenwalt <rgreenwalt@google.com> am dba69061: Merge "Send availability info more reliably" into ics-mr0

* commit 'dba69061a6e9c25d968819cee47ab13e5b554b9a':
Send availability info more reliably
12e24ae7600f8297abcde0d7c29d6cfb64f59dfb 18-Oct-2011 Robert Greenwalt <rgreenwalt@google.com> Send availability info more reliably

We don't have a monolithic availability state, so the mAvailable variable
must go.

bug:5453318
Change-Id: I82af90907cc7a0173b74d661912f9c28ddc7dcb0
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
d8e147ce79e8424d22be501c87e43cd8f2427ddb 18-Oct-2011 Jake Hamby <jhamby@google.com> Add wrapper method to GsmAlphabet for API compatibility.

An internal method was changed to add parameters to support a new
feature (7-bit national language tables). Add a compatibility
wrapper for the original method signature, which is used by OEM code.

Bug: 5334032
Change-Id: I1acba369b1c1da52c4a950fd4ae21d693652e9c5
om/android/internal/telephony/GsmAlphabet.java
e025391bf499e41650fe6508ac78f097559a31a4 17-Oct-2011 Wink Saville <wink@google.com> Add DataConnection#isEmergency and use in trySetupData.

If an emergency is occurring we may not want to allow data calls.

An emergency is defined as in an Emergency call or in the
emergency call back mode. I've added isInEcm and isEmergencyCall
to PhoneBase and CDMAPhone. And in DataConnectionTracker added
isEmergency which is the or of isInEcm, isEmergencyCall.

Also, removed some optimization code in DataConnectionTracker
onSetInternalDataEnabled because mInternalDataEnabled defaults to true
when a DCT is constructed and without this change trySetupData will
not be called leaving ECM if the DCT was just created. Which is what
is currently happening on the ICS lead device.

Also see b/5471660 as there is similar optimizations in
onSetUserDataEnabled and onSetPolicyDataEnabled.


Bug: 5437885
Change-Id: Iba81366300fe46eaa9aa6e457d6659b42d6fe927
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6aa1e80e4f6b495e4b4d3dc144b60248cfd0c8f0 15-Oct-2011 Jeff Brown <jeffbrown@google.com> Merge "Use MatrixCursor instead of ArrayListCursor."
c755ae3b58096334aa25522b5212b1bb19dac1cf 13-Oct-2011 Jeff Brown <jeffbrown@google.com> Use MatrixCursor instead of ArrayListCursor.

ArrayListCursor is deprecated, and a duplicate private copy of it
is doubly so.

Delete some tests that are duplicated in the CTS package.

Change-Id: Ib5837b12e39dadba57595906ad621b1feb0d2c0d
om/android/internal/telephony/IccProvider.java
2e6c332962fb0f64ad65cda3b798c744e0124ad9 13-Oct-2011 Wink Saville <wink@google.com> Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0
f838b7c2b8c4f0f1c48f315f49fea340b2b10d83 13-Oct-2011 John Wang <johnwang@google.com> Merge "Support selectNetworkManually in LTEPhone." into ics-mr0
63bbd8d32ebbfaad0a3a36e4efc3810868c9f4aa 12-Oct-2011 Wink Saville <wink@google.com> Set roaming indicator to off if Perferred Roaming List is not loaded.

Bug: 5326176
Change-Id: I5cfef7df5b7ee0bad97425dcbe4c98b6127c2065
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
929ca5e49760c3d5af8c7455cd38e29336b5e262 12-Oct-2011 Jake Hamby <jhamby@google.com> Fix bug in CDMA WDP datagram handling (fixes incoming MMS).

CDMA WDP datagram handling was refactored to use the same method
that handles concatenated SMS messages. WDP datagram sequence numbers
start at 0, but GSM/CDMA concatenated sequence numbers start at 1.
Changed SMSDispatcher.processMessagePart() to count from 0 when
handling WDP datagrams.

Also changed CdmaSMSDispatcher.processCdmaWapPdu() to correctly
decode segment numbers > 127 (signed byte conversion bug)
and to reject PDUs with an out-of-range segment number (invalid
ranges are already rejected for regular concatenated messages).

Bug: 5433331
Change-Id: I25c9567769de8edca789c0d1707d4916a4c46885
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
58466cc146a16d8c3549c16d09a0c2b24100bf02 11-Oct-2011 John Wang <johnwang@google.com> Support selectNetworkManually in LTEPhone.

Support selectNetworkManually() in CDMALTEPhone, similar to what
GSMPhone did.

bug:5420630
Change-Id: I5214a08822aebd4cc46c7a8167982803736e776a
om/android/internal/telephony/cdma/CDMALTEPhone.java
df0c2a94b51ead16a8b7c7b3159295bc978d9831 29-Sep-2011 sj0110.kim@samsung.com(sophia kim) <sj0110.kim@samsung.com> Change DCS of MO SMS to the correct value for UCS-2 encoding.

An incorrect value for TP-Data-Coding-Scheme was used for MO SMS with
UCS-2 encoding. According to 3GPP TS 23.038 section 4, when bit 4 is
set to 0, bits 0 and 1 are reserved and have no message class meaning.
We were setting those bits to 1, when they should be set to 0.

This change is required to pass a GCF test case.

Change-Id: If47361f95b0e14accc6220854783dcff3d82abf6
om/android/internal/telephony/gsm/SmsMessage.java
32319dd852709b975e53360f479634e43db4d224 11-Oct-2011 Jake Hamby <jhamby@google.com> Add "format" extra to SMS delivery report intents.

The MMS app was updated for multiple SMS dispatcher support, passing
the "format" extra into SmsMessage.createFromPdu() so that the PDU
is interpreted as the correct format (3GPP or 3GPP2).

This change adds the "format" extra to the intents that are sent for
SMS delivery reports. The MMS app is already expecting this extra, so
this change fixes a NPE that was introduced with the last change.

Bug: 5434052
Change-Id: I38b97f166c78d246d721ca1db8a4a18a2c6529bd
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
bece9cb7944daa012ca95fc7f6c73f6fad035892 06-Oct-2011 Jake Hamby <jhamby@google.com> Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone."
b166bc81acfd521608a1ab1003c5d728598d6ec1 06-Oct-2011 Wink Saville <wink@google.com> Set mGotCountryCode properly.

mGotCountryCode needs to be set to false when we don't know
the country code and to true only when we do.

Bug: 2578334
Change-Id: I7cb21e627ae115880df5f9b2095cb4ba094ab751
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
b7945cae5ad0feaad09378d0db77f2b3105e5235 22-Sep-2011 Jake Hamby <jhamby@google.com> Enable support for multiple SMSDispatchers in CDMALTEPhone.

Refactor framework to support multiple SMSDispatcher objects on
dual-mode devices that require support for both 3GPP and 3GPP2
format SMS messages. Each dispatcher registers to receive events for
the appropriate message format.

Note: All applications which handle incoming SMS messages by processing the
SMS_RECEIVED_ACTION broadcast intent MUST pass the "format" extra from the intent
into the new createPdu() method in android.telephony.SmsMessage that takes an
extra format parameter. This is required in order to correctly decode the PDU on
devices which require support for both 3GPP and 3GPP2 formats at the same time,
such as CDMA/LTE devices and GSM/CDMA world phones.

- moved code to manage device storage events from SMSDispatcher to a
new class, SmsStorageMonitor, which is shared among all dispatchers.

- moved code to monitor per-application outgoing SMS usage from
SMSDispatcher.SmsCounter to a new class, SmsUsageMonitor, which
is shared among all dispatchers.

- fixed a bug that prevented CDMALTEPhone from setting the MCC/MNC
operator numeric value in the telephony provider from the UICC,
as GSMPhone does, when the SIM records have loaded.

Change-Id: I2789ac07b6ca2948138bca7f75481f9b31514f20
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/SmsStorageMonitor.java
om/android/internal/telephony/SmsUsageMonitor.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SmsMessage.java
2613e0064b4a43b7de4205d5a6aaae64416972ed 26-Sep-2011 Flavio Lerda <flerda@google.com> Do not format numbers starting with hash or star.

If the user asks to format a number that starts with either a hash or a
star symbol, do not further format the phone number since we are not
actually able to parse such a number correctly and current this results
in the star or hash being dropped.

Bug: 5362177
Change-Id: Iff8d317c087d0ca07f2b107459ce8c47882ef367
ndroid/telephony/PhoneNumberUtils.java
972244251add94f9906ac5ab6b25dd441ea7d8db 26-Sep-2011 Wink Saville <wink@google.com> am 2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom

* commit '2783e1ce7a9b2c82983223754228c06be6713a0f':
Remove unused persist.radio.imsregrequired.
9e2cc044fd6605a84867f706748fa54a92c734b2 26-Sep-2011 Wink Saville <wink@google.com> Remove unused persist.radio.imsregrequired.

Change-Id: I49a2360260917f3e1034c1106ff139375fa1c9ed
om/android/internal/telephony/TelephonyProperties.java
e45beeb7493070f3a2b9ff90f42009288e1372b2 23-Sep-2011 David Brown <dab@google.com> Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers."
c6027ee46486bcc6e0df457c5678eb697d6ed321 22-Sep-2011 Shaopeng Jia <shaopengjia@google.com> Temp fix to the problem of incorrectly classifying Brazilian local
numbers as emergency numbers.

Bug: 5247602
Change-Id: Ib1626ef25ced2e149c526601bfac72de39e3f1b9
ndroid/telephony/PhoneNumberUtils.java
5840639fd18c334c0df30ae03b270c452fee0a61 22-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> Fix apn bearer logic.

The original change said that if the RAT were X or Y we would only
accept APN's that explicitly called out X or Y. This meant that
any device using X or Y would stop working until their APN db were
adjusted.

This change changes it to be if a particular APN calls out X or Y
it will only be considered if the current RAT matches. If the APN
doesn't specify, it matches all RAT.

This allows just as tight a restriction, but the default is looser.

Change-Id: Ia5e92f13c5052e890bf169e0db9584302afb36f5
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
94097b44b86f15d2581af5f3df21b5afcab27d01 22-Sep-2011 Wink Saville <wink@google.com> am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom

* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
Notify people of empty proxies too.
0e09082559885528a37e48ab0a865ac6754d2fd5 22-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> Notify people of empty proxies too.

We were telling people when the proxy changed, except if it was changed to null.
bug:5263946

Change-Id: I83416dac8fe992168a8aafd5676f9faee4e484d0
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a71483c7be0d563edd0f1c163219850665eec770 20-Sep-2011 Wink Saville <wink@google.com> am c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom

* commit 'c69396973b8a496e298a7076842b0e34d193651e':
Remove isAnyActiveDataConnection and promote isDisconnected.
c69396973b8a496e298a7076842b0e34d193651e 20-Sep-2011 Wink Saville <wink@google.com> Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
3df8b23fd0661dfc6357144b331e6e3f6ec90b0b 20-Sep-2011 Wink Saville <wink@google.com> am f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom

* commit 'f946c282c2fbe851d6157ed34bbacabdff8f76ba':
Add PROPERTY_IMS_REG_REQUIRED.
d986c609074cda0737a6f06f10700e42fb1704e7 19-Sep-2011 Wink Saville <wink@google.com> Remove isAnyActiveDataConnection and promote isDisconnected.

As Yoonsung Nam pointed out in the bug using isDisconnected
is more precise here and this was the only place
isAnyActiveDataConnection was used. So I've removed it
and promoted isDisconnected to DataConnectionTracker.

It should also be noted that although the Framework should
be as graceful as possible, it is still a requirement that
the radio must be turned off/on anytime the Framework
issues the appropriate command.

Bug: 5306201
Change-Id: I95130451e11c51e43406b57eb538d01f8dde61be
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
d34ed1660afb7385c80f377623e12299bab0fa4c 19-Sep-2011 Wink Saville <wink@google.com> Add PROPERTY_IMS_REG_REQUIRED.

Bug: 5337311
Change-Id: Ic5f310f485b49b29385bc1427a1f156484896569
om/android/internal/telephony/TelephonyProperties.java
bb132eba71bc12a88416df01e2df539820c2d607 19-Sep-2011 David Brown <dab@google.com> Merge "Update code to use location aware isEmergencyNumber."
ea0d54b44e6e2a1319097fa8002ff841e603e652 17-Sep-2011 Wink Saville <wink@google.com> Have all connections disconnected before turning off radio.

Bug: 5306201
Change-Id: I8a121e5ed951f286b6f3edc70c468e86ccedfbf0
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6b7c3f8a1cd8b638defc28a3249746e99b8039ae 14-Sep-2011 Shaopeng Jia <shaopengjia@google.com> Update code to use location aware isEmergencyNumber.

Bug: 5247602
Change-Id: Ieeda4a17464795b3591db754bc991759609f88c2
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/gsm/GsmMmiCode.java
80c32a37b63ceff885199e22a8505ac557c86d35 15-Sep-2011 duckyoung.chai <duckyoung.chai@samsung.com> [toro] Add telephonyManager API ( getMsisdnNumber() ) for IMS Module.

IMS Module need the MSISDN value for IMS registration.(VZW Requirement)

Change-Id: I8713b6c55788276246ee1c2f91eaf2d3ab8cc813
Signed-off-by: duckyoung.chai <duckyoung.chai@samsung.com>
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/PhoneSubInfoProxy.java
11fed2b218eae1ea94e7c1055a49562efef87a90 14-Sep-2011 Robert Greenwalt <robdroid@android.com> Merge "Add OTADM feature for Verizon requirement. - GsmDataConnectionTracker.java <in function createApnList> : modify parameter type for new ApnSetting. (carrierEnabled has changed to boolean from integer, BEARER has changed to integer from string). <in function createAllApnList> : modify telephony db query statement using carrierEnabled. (carrier_enabled: 1 enable apn, 0: disabled apn) <in function buildWaitingApns> : modify apn management code when current RAT (radio access technology) is LTE or EHRPD. add internal function named needToCheckApnBearer to check current RAT is LTE or EHRPD. - ApnSetting.java : add two member variable (carrierEnabled: apn enable/disable , bearer : Radio Access Technology) - Telephony.java : add two static string CARRIER_ENABLED & BEARER. - ApnSettingTest.java : add two assertEquals in function assertApnSettingEqual. add CARRIER_ENABLED & BEARER parameters."
723facc20b6545b7ac4e65883be096d517fb3c10 01-Sep-2011 sinikang <sinikang@samsung.com> Add OTADM feature for Verizon requirement.
- GsmDataConnectionTracker.java
<in function createApnList>
: modify parameter type for new ApnSetting.
(carrierEnabled has changed to boolean from integer,
BEARER has changed to integer from string).
<in function createAllApnList>
: modify telephony db query statement using carrierEnabled. (carrier_enabled: 1 enable apn, 0: disabled apn)
<in function buildWaitingApns>
: modify apn management code when current RAT (radio access technology) is LTE or EHRPD.
add internal function named needToCheckApnBearer to check current RAT is LTE or EHRPD.
- ApnSetting.java
: add two member variable (carrierEnabled: apn enable/disable , bearer : Radio Access Technology)
- Telephony.java
: add two static string CARRIER_ENABLED & BEARER.
- ApnSettingTest.java
: add two assertEquals in function assertApnSettingEqual.
add CARRIER_ENABLED & BEARER parameters.

bug: 4991683
Change-Id: I9450c220009c3093b1e09e8ac9cd0faa0a975067
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
0042330e3b19426447cae0456c57f3ba14c189b6 13-Sep-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 30928eb6: am b1a3f0ca: Fix no data issue after system server crash

* commit '30928eb60395ac7c02ac45fd00a0d781ce364856':
Fix no data issue after system server crash
e112f1c91c08a7df67926bf56810c1cb22f4fca7 13-Sep-2011 Attila Bodis <attila@google.com> Merge "Adding isEmergencyNumber which also takes in a defaultCountryIso."
5d39ec4a37de500ada84225f8bd2c244db0cd287 13-Sep-2011 Jake Hamby <jhamby@google.com> Add method to retrieve MSISDN for CDMA/LTE devices.

For CDMA/LTE devices, the MDN and MSISDN may be different.
Add a new method getMsisdn() to the Phone interface to return the
MSISDN. For GSM/UMTS, this will be the same as getLine1Number().
For CDMA/LTE, getLine1Number() will continue to return the MDN
and getMsisdn() will return the MSISDN.

Change-Id: Iba0ca24858992b21f63ae7ec0c27d2e90d4b0903
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/SIMRecords.java
9683f990a282776ac8a588a9d5e1a73b61f43dcf 07-Sep-2011 Shaopeng Jia <shaopengjia@google.com> Adding isEmergencyNumber which also takes in a defaultCountryIso.

Also update CallerInfo and CallerInfoAsyncQuery to use the new method.

Bug: 5247602
Change-Id: I2bbb0806ad2787d53b19bc1e9bdfb0ee8be26980
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
30928eb60395ac7c02ac45fd00a0d781ce364856 10-Sep-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am b1a3f0ca: Fix no data issue after system server crash

* commit 'b1a3f0ca4b23b882fc1a5e83eaa412c0ed76696f':
Fix no data issue after system server crash
b1a3f0ca4b23b882fc1a5e83eaa412c0ed76696f 07-Sep-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix no data issue after system server crash

FW was checking "Radio Available" instead of "Radio On" when
broadcasting data availability. This was causing an issue in
a certain recovery case (system server restart/phone process
restart) where "Radio (modem) is available" but radio was
turned off.

This patch obsolete the use of mRadioAvailable attribute and
use RadioState from RIL directly to check if Radio is ON.

Bug:5077346
Change-Id: Ie7ac05e3d5e328e3d5303541ca41326754f309c1
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
52d51c42b6296a96287dd373558f576c18846a01 09-Sep-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants

* commit 'eb7763efa52bad67ff828ad895ff172190e86035':
DO NOT MERGE: Fix leak in SIM ready registrants
eb7763efa52bad67ff828ad895ff172190e86035 27-Aug-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> DO NOT MERGE: Fix leak in SIM ready registrants

SIM Ready registrants was keep growing after air plane mode
toggle or RIL recovery.

Bug: 5222722
Change-Id: Iac9fcb86f96f9e42440e641cd94736fed6f45813
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
a6d4248e21bd62a51ac4aaadaa67fdb55b666d98 03-Sep-2011 Robert Greenwalt <rgreenwalt@google.com> Pass roaming info to ConnectivityService.

bug:5215657
Change-Id: I77024141a7bbaa47eae021009e16b283699be53e
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9b2886e24301e5d4e7052ec4a6eaff273d3f516c 31-Aug-2011 Robert Greenwalt <rgreenwalt@google.com> Create new isNetworkSupported API

Useful for checking if on a wifi-only device.
Similar to asking for NetworkInfo for a network type and checking for
null, though here the intent is explicit.

bug:5087537
Change-Id: Ia3ddd09b6b735b8b3ceb7a347891e015fd96b218
om/android/internal/telephony/RIL.java
52d0f9882fc8f33d1aef1d0e79f15733daf4ebe2 31-Aug-2011 Jeff Sharkey <jsharkey@android.com> More robust check around TelephonyManager init.

Only complain when Context radically changed.

Bug: 4676714
Change-Id: Ia183f9ba51056c857e634d901c618a73e45d2d05
ndroid/telephony/TelephonyManager.java
960ba9132c02bfe2655268c2e5cb441c025c607f 31-Aug-2011 Wink Saville <wink@google.com> Merge "CDMALTE: Start reading SIM record on SIM_READY"
be1a0493a8bf589137874bec4222297fbb712185 30-Aug-2011 Jake Hamby <jhamby@google.com> Merge "Use the local timezone for CDMA SMS timestamps."
4144a060257004902fb53c967c408217399e3fc2 30-Aug-2011 Jake Hamby <jhamby@google.com> Use the local timezone for CDMA SMS timestamps.

3GPP2 uses the local timezone for timestamps in SMS messages.
Use the local timezone instead of UTC when decoding bearer data.

Bug: 5123883
Change-Id: Iec25bcbb7862f0794ead80b6923c815b68bdd2a5
om/android/internal/telephony/cdma/sms/BearerData.java
03605fa832ea42dedca00fc7798a6da6c8a6c8a3 30-Aug-2011 Wink Saville <wink@google.com> Merge "Fix leak in SIM ready registrants"
3ffb889746b881575d6ce4e33ef1835d71fb31ef 27-Aug-2011 Wink Saville <wink@google.com> Merge "Add timezone to the terminal response for provide local information command"
43c3204067ba65b498713cf3f4c5fce9e024d897 27-Aug-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix leak in SIM ready registrants

SIM Ready registrants was keep growing after air plane mode
toggle or RIL recovery.

Bug: 5222722
Change-Id: Iac9fcb86f96f9e42440e641cd94736fed6f45813
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
ef5acbc0d6176125c406d0d3448415d2cc699466 26-Aug-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> CDMALTE: Start reading SIM record on SIM_READY

Clean up early workarounds placed for CDMA LTE mode.
Now SIM_READY is used to start reading out SIM record which is
the same as the baseline behavior.

Bug: 4506200
Change-Id: Ib30b1710b60110957f8eb6483f39dbec6153d4a9
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
463f22114587344c96460179069a08d7381fbfd6 22-Jul-2011 Jake Hamby <jhamby@google.com> Add ISIM application support for LTE devices.

- Add methods to TelephonyManager to provide access to IMS records on
the ISIM application of the UICC, as well as access to the ISIM
AKA authentication algorithm.

- Add support for the new IMS methods to CDMALTEPhone, using the helper class
ImsUiccRecords to load the IMS records from the ISIM. The same approach
can be used to implement IMS support for UMTS/LTE devices.

- There is a new RIL request, RIL_REQUEST_ISIM_AUTHENTICATION, which is
used to perform IMS AKA authentication using the algorithm on the ISIM
application of the UICC. The challenge nonce and response are both encoded
as Base64 strings.

Change-Id: I73367c7d9bc573d0d883d68adf09891de1319129
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/PhoneSubInfoProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/ims/IsimRecords.java
om/android/internal/telephony/ims/IsimUiccRecords.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
d0b6ad9ec925bdc5b9ff4d125e76b32ab69c1563 26-Aug-2011 Wink Saville <wink@google.com> Merge "Allow 15 strings in RIL_REQUEST_VOICE_REGISTRATION_STATE response"
f976cf25f96c470a004b591f8bc69b5323a94de2 07-Jun-2011 Naveen Kalla <nkalla@quicinc.com> Add timezone to the terminal response for provide local information command

If timezone is sent in the NITZ message it needs to be part of the
terminal response sent to the provide local information command for
Date and time Setting. This is as per TS 31.111 section 6.4.15/ETSI TS 102 223
and 3GPP spec 22.042.

Change-Id: I3516911223bd5655dbe8189bba307f0765c63fa1
om/android/internal/telephony/cat/ResponseData.java
bcfa57ba529835adb1995894698146fbad64c21e 18-Aug-2011 yoonsung.nam <yoonsung.nam@samsung.com> Allow data during voice call if network type is LTE

Change-Id: Ibbf327ed709c8429232eb4e9088fe900a2e87980
Signed-off-by: yoonsung.nam <yoonsung.nam@samsung.com>
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
dc69a6b146f59092e8aa251c63a973e7471babf2 16-Aug-2011 Naveen Kalla <nkalla@quicinc.com> Allow 15 strings in RIL_REQUEST_VOICE_REGISTRATION_STATE response

RIL interface contains 15 strings in response to
RIL_REQUEST_VOICE_REGISTRATION_STATE. CdmaServiceStateTracker
throws an exception if response contains more than 14 strings.
Fix needed to comply with RIL interface.

Bug: 5204605
Change-Id: I6f266eb38b2bc52610999cd92449b8dc58dd3274
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
8e28b7d78232f6cf08739ca0d129cc7f9e650801 19-Aug-2011 Jeff Sharkey <jsharkey@android.com> Proactively disable data when over policy limit.

Add policy controls to NetworkStateTracker which are combined with
other user preference and internal flags to decide if data connection
should be established. Better locking around enabled flags.

When data network would be over limit, proactively disable data on
that network. Enable when policy is snoozed or when cycle resets.

Track and dismiss notifications from now-stale policies.

Bug: 4587023, 5178147
Change-Id: Ibfcc9f73cda7c369209af701b46eddd3d1943f2d
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9f1b94a14f03b3b9d2e9b6df697b0bf113c2f783 19-Aug-2011 Wink Saville <wink@google.com> Remove writing pin's to log.

Change-Id: Ib84397ac718ebcc3862c69fc7556e0403c2b3940
om/android/internal/telephony/IccCard.java
4eb45cc98bdcee575cc21f5ad5754cde57197a81 12-Aug-2011 inshik <inshik.shin@samsung.com> Add utility functions for pause and tonewait pause.

Add a function that converts a string with RFC3601 defintion
of pause and wait into android representation.

Change-Id: Id8a17c3a166422d62247acb227506549990ace12
ndroid/telephony/PhoneNumberUtils.java
e713576292fc72086de47066981b86ad2f27ab0f 12-Aug-2011 Shaopeng Jia <shaopengjia@google.com> Renaming com.google.i18n.phonenumbers to com.android.i18n.phonenumbers
to avoid name collision.

Bug: 5157607
Change-Id: Ic397f371e381a71f17b0b70b955e89d08f7a9867
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfo.java
1d1435a1ed84fdf8950ce1069b3b32585b907cd7 05-Aug-2011 Sangcheol Lee <goodsc.lee@samsung.com> Don't check provisioning when trying setup data call.

1. SIM is not provisioned before activation.

Change-Id: I04b16d77aaf28bfb8e0c2d7edd937bd44677de73
Signed-off-by: Sangcheol Lee <goodsc.lee@samsung.com>
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
cd62dfbc267dda92ee696aadf160cf465308e3ce 06-Aug-2011 John Wang <johnwang@google.com> Enable concurrent voice and data for LTE.

bug:5017062
Change-Id: I2c701c74710ce0f718d28babea88fb93d3219564
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
35a9c52791882bc58d3a6716e0fd8544889d90c3 28-Jul-2011 Wink Saville <wink@google.com> am 5ad5c9e3: am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE

* commit '5ad5c9e3efd26155ae7b5d0f3e9e2094e1f65dfe':
Support of LTE Only mode
5ad5c9e3efd26155ae7b5d0f3e9e2094e1f65dfe 28-Jul-2011 Wink Saville <wink@google.com> am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE

* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
Support of LTE Only mode
d20f60c8a71ca0aa853bc433f74b32dcfc98f984 28-Jul-2011 Wink Saville <wink@google.com> Merge "Support of LTE Only mode" into honeycomb-LTE
d5f8d84d4573e17d87dc41000314156b08d9beec 28-Jul-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Support of LTE Only mode

In CDMA-LTE hybrid mode, the service state is derived based on
CDMA state. However, CDMA radio is off while in LTE only mode
so thre will be no signal bar or data type icon displayed on
the status UI.

This patch handles LTE only mode scenario. The service state
is derived from LTE if CDMA is OOS and LTE only mode is used.

Bug: 5070240
Change-Id: Ie55daaf9eea1b16ca73312ebab208810b145d2bc
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
0aea293d1506cda672ccdf59f981fb2a5982e2f8 28-Jul-2011 Ramesh Sudini <ramesh.sudini@motorola.com> am 8ce53e38: am 9a87deb5: DataConnection: Clear cid when entering inactive state.

* commit '8ce53e387e2b4427265ae9e43bc15d9fe850643d':
DataConnection: Clear cid when entering inactive state.
8ce53e387e2b4427265ae9e43bc15d9fe850643d 28-Jul-2011 Ramesh Sudini <ramesh.sudini@motorola.com> am 9a87deb5: DataConnection: Clear cid when entering inactive state.

* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
DataConnection: Clear cid when entering inactive state.
9a87deb538caed347621e57c5c83e0185a963bb4 27-Jul-2011 Ramesh Sudini <ramesh.sudini@motorola.com> DataConnection: Clear cid when entering inactive state.

Bug: 5083242

Change-Id: I0657739da54bc424433063a2244d045e47411e5f
om/android/internal/telephony/DataConnection.java
22d93a0d71d965970f581cd9aa1cbf2efbb5998f 27-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp

Change-Id: If4dc99c558dc45c9a7ff8d3ea5be69578b4ee793
bfce70342f2cd8c66be48f00adf8aa4dbf8af169 26-Jul-2011 Wink Saville <wink@google.com> am 32d106e1: Filter out addresses that are 0.

* commit '32d106e154d0388ac13774fad3c58ff60ba9ae8f':
Filter out addresses that are 0.
32d106e154d0388ac13774fad3c58ff60ba9ae8f 26-Jul-2011 Wink Saville <wink@google.com> Filter out addresses that are 0.

If the address is "any" address, i.e. an address which is all zeros
for both IPv4 and IPv6 ignore it.

Bug: 5073048
Change-Id: I8b9f64103aaffd001114a672375ff5f99616c327
om/android/internal/telephony/DataCallState.java
895de9269fa125bf3903c21faf5e8d2750bfb000 24-Jul-2011 Wink Saville <wink@google.com> am 051660d4: am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE

* commit '051660d4d6d293f4b561bc6a772c70aa077a578a':
Configure RAT dependent retry pattern in GSM DCT.
d2dd1e657c06cc37227861c37243e714636efb89 24-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 9820a9d2: am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.

* commit '9820a9d299dc46f2a9037866ddf61c4782cf9186':
Allow suggestedRetryTime to indicate no retry is needed.
051660d4d6d293f4b561bc6a772c70aa077a578a 24-Jul-2011 Wink Saville <wink@google.com> am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE

* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
Configure RAT dependent retry pattern in GSM DCT.
9820a9d299dc46f2a9037866ddf61c4782cf9186 24-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 4281817f: Allow suggestedRetryTime to indicate no retry is needed.

* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
Allow suggestedRetryTime to indicate no retry is needed.
deb62be2e87b19e9bbbc668f8d9327b12dba4a3b 24-Jul-2011 Wink Saville <wink@google.com> Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE
4281817f6b624cb51926eb24fa78c68cd9431dce 24-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Allow suggestedRetryTime to indicate no retry is needed.

If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.

Bug: 4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
789df167fa31e684baa957aea1a4430963bf12b1 22-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Configure RAT dependent retry pattern in GSM DCT.

In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.

Bug: 5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
3372c1ef78f1c22d99dfe2aea47622f208bfc8c1 22-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am b7ad442c: am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME

* commit 'b7ad442c90146f736c6268c21e34a87fbcab6335':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
b7ad442c90146f736c6268c21e34a87fbcab6335 22-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME

* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
1a15b03f62e487103348d3e6a44cd31178dd1988 22-Jul-2011 John Wang <johnwang@google.com> Merge "Remove APN type in notifyDataConnection."
1c82f56f2453a8a7c83090017ab2427a74829b9a 21-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME

Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.

Bug: 5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
343112fb1515a9e9ea860168bb4d7eded8cc5e34 21-Jul-2011 John Wang <johnwang@google.com> Remove APN type in notifyDataConnection.

Using APN_TYPE_ALL in notifyDataConnection causes data
connection state to be set as DISCONNECTED all the time
because apnTypeToId returns INVALID_ID for APN_TYPE_ALL.

bug:4972999
Change-Id: Ieb79194575dd97fa4bd7ef2bd8202030aa282d84
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
aed294985cb54f27f93272928f59ecc9a94467fc 19-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 5abddc73: am bf361b59: Return IMEI SV if CDMA-LTE mode is used

* commit '5abddc73a57da304029b6034b13f69079dcbd83a':
Return IMEI SV if CDMA-LTE mode is used
5abddc73a57da304029b6034b13f69079dcbd83a 19-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am bf361b59: Return IMEI SV if CDMA-LTE mode is used

* commit 'bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
Return IMEI SV if CDMA-LTE mode is used
bf361b59e4e6c1c7c710e73260a77e9937f1fb59 19-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Return IMEI SV if CDMA-LTE mode is used

IMEI and IMEI SV should be available in CDMA-LTE hybrid system.
IMS SV value is not yet returned.

Bug: 5042972
Change-Id: I733825e95f802605e06887951e226d26baea8ff2
om/android/internal/telephony/cdma/CDMALTEPhone.java
865e68465284eca3c32a1a4c9398d08af86bbf63 19-Jul-2011 Wink Saville <wink@google.com> am 6e8c7dd2: am cd4636ec: Add LteOnCdmaDevice system property.

* commit '6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5':
Add LteOnCdmaDevice system property.
6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5 19-Jul-2011 Wink Saville <wink@google.com> am cd4636ec: Add LteOnCdmaDevice system property.

* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
Add LteOnCdmaDevice system property.
cd4636ec08a50ab890acab0cf0c3c3f07f91896a 18-Jul-2011 Wink Saville <wink@google.com> Add LteOnCdmaDevice system property.

Provide a system property which may be
optionally set at build time.

Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/TelephonyProperties.java
de4c26fa1a5adf3efa8995cbf69e45aa10111b8f 17-Jul-2011 Dianne Hackborn <hackbod@google.com> Fix a couple static leaks.

Change-Id: If2564dc822fbcb3bb3baf270ad2b3c29c78bf421
ndroid/telephony/TelephonyManager.java
d9212d3088d2ecb794933c2f96392ea160b857eb 15-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 8550f3b8 to master

Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
8550f3b86aabe04e149866839bde78b335cc1104 15-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp

Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
0a46db5d88461d9a6c85bb2e95982ac4c511d57e 14-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> Apply the dns and route diff which we get a change

bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
76326a9d7da1e1726142be4e9c6b770aae7a90ca 14-Jul-2011 Wink Saville <wink@google.com> am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE

* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
Remove STOPSHIP but allow seamless Handoff when possible.
726492eae99f8aa8b46eca45e45c9e7f6e7b8b45 14-Jul-2011 John Wang <johnwang@google.com> am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE

* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
Add getImei() to Phone interface.
3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d 13-Jul-2011 Wink Saville <wink@google.com> am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE

* commit '6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
6d1d16c324a681dd966d47497a71a02eac512234 13-Jul-2011 Wink Saville <wink@google.com> Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
e822225f7a01ef088ff01f7613f953d5d89945ed 13-Jul-2011 Wink Saville <wink@google.com> Remove STOPSHIP but allow seamless Handoff when possible.

If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
28d92afc0a17cbf9149a0c8be9c8795d6f3306a5 13-Jul-2011 John Wang <johnwang@google.com> am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE

* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
Add getImei() to Phone interface.
c4f5d33ea61743f1a7439f0052eccb08cf8977c4 13-Jul-2011 Wink Saville <wink@google.com> am 0ddd9960: am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE

* commit '0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
Add a property so that CSIM provision check can be bypassed
099b3d2179b981ea70a8d9d30bb6750260297d55 13-Jul-2011 Jeff Sharkey <jsharkey@android.com> Merge "Watch for external Secure.DATA_ROAMING changes."
64bd196fe4adf2d39b1e1bfd643043878c1714c0 12-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am a9e00a4a: am 89799e72: Fix incorrect ERI banner format

* commit 'a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
Fix incorrect ERI banner format
2ea7e443b27ff185104b8a8b5e7a08b5510125bd 12-Jul-2011 John Wang <johnwang@google.com> Add getImei() to Phone interface.

Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).

bug:4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
9e6615afab54db015b2b3348db3ba63b4b594c3e 12-Jul-2011 Jeff Sharkey <jsharkey@android.com> Watch for external Secure.DATA_ROAMING changes.

Continue reading/writing Secure.DATA_ROAMING, but also observe
external changes and reevaluate connection state.

Bug: 5011957
Change-Id: Idc6589cf251adcf3110d9c9eb4ef1bd5fb936d14
om/android/internal/telephony/DataConnectionTracker.java
0ddd99600675aaf5f514ac6bb30d345c4b66f8c2 11-Jul-2011 Wink Saville <wink@google.com> am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE

* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
Add a property so that CSIM provision check can be bypassed
12b91edc81763b69090bf5815bc8d59ab8d8f342 11-Jul-2011 Wink Saville <wink@google.com> Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE
e5d891e84e7ac3bfd56258e37e3f8b77f24d3045 09-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Add a property so that CSIM provision check can be bypassed

To support test environment where a call box is used with
non-provisioned SIM.

Bug: 5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
a9e00a4ac806751d8af0d9386ee3ae9bd18492b4 11-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 89799e72: Fix incorrect ERI banner format

* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
Fix incorrect ERI banner format
89799e72eee54935ec5830f89dfd0a7d32983917 09-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix incorrect ERI banner format

Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.

Bug: 5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
e2dece12ba4e9a0ea71135ea4e1d4bf1fc3ea125 09-Jul-2011 Wink Saville <wink@google.com> am 3ef341cd: am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE

* commit '3ef341cda51d5bc35b0bc919f7514653ec194410':
Disconnect ApnContexts in INITING state when error.
532fee45e22acdf779c7135db9a145fe9928c50c 08-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove unused setHttpProxy."
3ef341cda51d5bc35b0bc919f7514653ec194410 08-Jul-2011 Wink Saville <wink@google.com> am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE

* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
Disconnect ApnContexts in INITING state when error.
910e80478dbf2bd1f1b82ae62b12cd250b4ce8f5 29-Jun-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Disconnect ApnContexts in INITING state when error.

When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.

Bug: 4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
12f20ca200771bb2ecd7972118bfd98157eace3d 07-Jul-2011 Wink Saville <wink@google.com> am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE

* commit '19065008b820ea95530d49cf1894f7481929f8e6':
Reset FAILED ApnContext state to IDLE on data setup triggers
5fa49298bf080e80c7676b4350630e09994b9dbe 07-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 6716ac53: am c8e2916d: Bring back ERI into CDMA-LTE mode

* commit '6716ac5342de7e83e5ba47f28aac40a46d1363ac':
Bring back ERI into CDMA-LTE mode
19065008b820ea95530d49cf1894f7481929f8e6 07-Jul-2011 Wink Saville <wink@google.com> am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE

* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
Reset FAILED ApnContext state to IDLE on data setup triggers
378a4380f21486365bb712dfa69ad974b298b8cb 02-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Reset FAILED ApnContext state to IDLE on data setup triggers

Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.

Bug: 4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6716ac5342de7e83e5ba47f28aac40a46d1363ac 07-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am c8e2916d: Bring back ERI into CDMA-LTE mode

* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
Bring back ERI into CDMA-LTE mode
c8e2916d0bdbbda5fb6faf61d6f24100641d19f5 01-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Bring back ERI into CDMA-LTE mode

Use ERI mechanism for roaming determination in CDMA-LTE mode.
Also display SPN name from CSIM card as "SPN" field in the status bar.
PLMN field will be derived from ERI text as done in original CDMA phone.

Bug: 4970448
Change-Id: I21382b15e148a8451f4c3fcbbb5d1ed296e41b5a
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
23b444a2e4e808262c22fa5254db9861eb961879 01-Jul-2011 David Brown <dab@google.com> Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code."
647ebb50b1b16ef03dda508ab99695aa0707246e 01-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am c0c07d4f: am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting

* commit 'c0c07d4ff689a6050ef368933b9c53283a01520a':
DataConnection was cleaned up too early if it's already disconnecting
de89a4645822996e8d751d16c27f9e584f993076 01-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> am 672c468c: am a2267451: Don\'t ever report a null ServiceState

* commit '672c468c453ea0b5195f42150d6772ac33d1f7e3':
Don't ever report a null ServiceState
bc2e82d45432f7bd546d0fcc57e1ad1816ade9a3 01-Jul-2011 Shaopeng Jia <shaopengjia@google.com> Remove explicit toUpperCase after CountryDetector is fixed to return
uppercase region code.

Change-Id: I111d5792b67eb0e16a7278a731097f305cb9a059
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
om/android/internal/telephony/CallerInfo.java
ce43bc48588408e72aaa47ac1483837d5bfd1f59 01-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 0562efd1: am f3f9967e: Make sure to update data availability in call setup capable triggers.

* commit '0562efd1ea970ded01b1b47bbce790a269a60c45':
Make sure to update data availability in call setup capable triggers.
7675faa70d2baa290bb80b11b75ecc9aa29b2109 01-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> am 8745caaf: am dbcc57c6: Fix dependencyMet issues regarding hipri APN.

* commit '8745caaf25e9f2d50125a793b7d02fc4522ba4ba':
Fix dependencyMet issues regarding hipri APN.
c0c07d4ff689a6050ef368933b9c53283a01520a 01-Jul-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting

* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
DataConnection was cleaned up too early if it's already disconnecting
012b86d4294182497c4c72a318e0f4cbe5075a44 30-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> DataConnection was cleaned up too early if it's already disconnecting

Fix one logic failure introduced in patch for bug 4901019.

Bug: 4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
2bfa2e65f4cb620b937d0e0bc7bb6e64d03177cd 01-Jul-2011 Robert Greenwalt <rgreenwalt@google.com> Remove unused setHttpProxy.

bug:3487057
Change-Id: If5069a233dd787ff490a136a233e812ee17beef5
om/android/internal/telephony/gsm/GsmDataConnection.java
672c468c453ea0b5195f42150d6772ac33d1f7e3 30-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am a2267451: Don\'t ever report a null ServiceState

* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
Don't ever report a null ServiceState
a2267451ddf91cc330f4c283e86811e38328915b 30-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Don't ever report a null ServiceState

Report out of service if we don't know any better. Sometimes when switching radios
we were finding nulls reported - it crashed some code and highlighted this problem.
If we don't have a service state we're certainly out of service, so this isn't a lie.

bug:4553701
Change-Id: I094798a5f9f39f45c0ba30179aaa8f88f9b3e405
ndroid/telephony/ServiceState.java
om/android/internal/telephony/DefaultPhoneNotifier.java
0562efd1ea970ded01b1b47bbce790a269a60c45 30-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am f3f9967e: Make sure to update data availability in call setup capable triggers.

* commit 'f3f9967e22201276d65f4be6006aca1cecc2a604':
Make sure to update data availability in call setup capable triggers.
f3f9967e22201276d65f4be6006aca1cecc2a604 29-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Make sure to update data availability in call setup capable triggers.

As "startUsingNetworkFeature()" now can trigger the initial data
connection instead of default data, FW needs to make sure each
MobileDataStateTracker is updated with the data availability
on each "data-setup capable" trigger.

Bug: 4970825
Change-Id: I6a7e479ecc1534cd723a2e8beece6b8bcd398ea7
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
f9ab96f9d3d97e65537e487d1c05c69df2313618 17-Jun-2011 John Wang <johnwang@google.com> Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42

Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01
ndroid/telephony/TelephonyManager.java
8745caaf25e9f2d50125a793b7d02fc4522ba4ba 30-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am dbcc57c6: Fix dependencyMet issues regarding hipri APN.

* commit 'dbcc57c6f1602da324609ddbaf76f836504733ae':
Fix dependencyMet issues regarding hipri APN.
dbcc57c6f1602da324609ddbaf76f836504733ae 29-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Fix dependencyMet issues regarding hipri APN.

If the system says a dependency isn't met for accessing the default APN,
apps should not be able to turn on the hipri APN either. This change
prevents apps from adjusting the dependencyMet setting on hipri and
internally ties its dependencyMet to that of the default APN.

bug:4643411
Change-Id: I7e609ff9bb1b85a3a6a41095052f0194d03be979
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a099fefec5da9c59f162891a09ecc24a568a5673 28-Jun-2011 Wink Saville <wink@google.com> am cf2980ff: am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE

* commit 'cf2980ffef2780ab41eb196f398df482b105312e':
Data connection retry pattern could be broken by PDP sharing
cf2980ffef2780ab41eb196f398df482b105312e 28-Jun-2011 Wink Saville <wink@google.com> am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE

* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
Data connection retry pattern could be broken by PDP sharing
1e5c72c7041e0c8299cb5a5d028c022eb01036c6 23-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Data connection retry pattern could be broken by PDP sharing

If a DataConnection is pending re-connect alarm, the new request
from another ApnContext sharing the same DC could disrupt
the re-connection pattern currently engaged.

This patch is to ensure the new request for PDP sharing
scenario will not trigger another SETUP_DATA request if
reconnection alarm is set in AlarmManager.

Bug: 4901019
Change-Id: I98b0d9af8b58fb880efdbc0246009de5cb116a54
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
b81b1c91d81eb7f5706d3e16c6f0a3512596f16b 24-Jun-2011 Daisuke Miyakawa <dmiyakawa@google.com> Merge "Uppercase region code so that AsYouTypeFormatter works correctly."
5b0b167f7fd74d8e238508badb0af2cd6038d522 24-Jun-2011 Shaopeng Jia <shaopengjia@google.com> Uppercase region code so that AsYouTypeFormatter works correctly.

Change-Id: Iaf46ec5241a1a8984753bd6d8f9f842884efaa15
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
cec25c4e8afdc56451f7405f8605c1d67433e2ff 23-Jun-2011 David Brown <dab@google.com> CallerInfo query: Turn on "geo description" lookup for unknown numbers

With the latest version of the external/libphonenumber library
<https://android-git.corp.google.com/g/117190> we now have real data for
the PhoneNumberOfflineGeocoder.getDescriptionForNumber() feature.

So enable it in the CallerInfo query. This means that the incoming call
UI will now show a geo description like "California" or "Maryland" (along
with the number) for unknown incoming numbers.

I also needed to work around an issue with the latest phonenumber library:
The new library apparently requires countryIso to be uppercase (e.g. "US")
but the CountryDetector.detectCountry().getCountryIso() call currently
returns "us", which causes PhoneNumberUtil.parse() to fail. (This also
broke some ContactsProvider tests too.) So force the countryIso to
uppercase for now.

TESTED (on Crespo):
- Incoming calls from an unknown number:
==> State name is now displayed.
- Incoming calls from a number that matches a contact:
==> no change in behavior

Bug: 4595580
Change-Id: I03126e1eee99d428e76bbbad5b3856be3874f549
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
0824b928ce27e25e0bd9f81173c337f1e8007a8a 23-Jun-2011 David Brown <dab@google.com> Merge "Update CallerInfo to use the geocoder in the updated location."
9b897922e13fc4614905f274b4b5a6d130ead50c 23-Jun-2011 Wink Saville <wink@google.com> am 446a436c: am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE

* commit '446a436cf3d6eb0ee2feb628efc84fda746dfe52':
Use dataConnectionNotInUse to decide if a DC is free.
3b14c78466d409e07b37316c90fb8f52390b4e35 23-Jun-2011 Wink Saville <wink@google.com> am 66c37f5d: am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE

* commit '66c37f5df2b4cf469e90a0e9f7e0b336f56e8433':
Fix handling of unsol_data_state_change with PDP sharing scenario
7bfb80d1221d693a9feb8780fb6e0ae45f917748 23-Jun-2011 Wink Saville <wink@google.com> am 47e31924: am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE

* commit '47e319247e89ab4ba30f58e5f532454ef21d15e6':
Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
b939b4d36a3729c0f8fa9deb722add1c9c1bbc36 23-Jun-2011 Wink Saville <wink@google.com> am 1773120c: am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE

* commit '1773120c1e9aeebc917e1bb6c1241aecfe9d6500':
Special retry back-off timer in call setup failure.
33d0de69650093aeaa9a61f953a9f22164aafb99 23-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am e813ea5a: am 4906376f: Just a random fix.

* commit 'e813ea5a11db8070d2ca72cab416fa1a8fd3539c':
Just a random fix.
e4ae4347311dfb5529dd076ed0b30dbbe3225c86 23-Jun-2011 Shaopeng Jia <shaopengjia@google.com> Update CallerInfo to use the geocoder in the updated location.

Change-Id: I9d4507a50ae473964bf2d094b7a1072d79e61e85
om/android/internal/telephony/CallerInfo.java
446a436cf3d6eb0ee2feb628efc84fda746dfe52 22-Jun-2011 Wink Saville <wink@google.com> am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE

* commit '4d9261fad3e3bdfa056f377c10f2af0a6db62542':
Use dataConnectionNotInUse to decide if a DC is free.
66c37f5df2b4cf469e90a0e9f7e0b336f56e8433 22-Jun-2011 Wink Saville <wink@google.com> am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE

* commit '64a09341d8a16212855b7cdd16fe079e25d45838':
Fix handling of unsol_data_state_change with PDP sharing scenario
47e319247e89ab4ba30f58e5f532454ef21d15e6 22-Jun-2011 Wink Saville <wink@google.com> am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE

* commit 'aef70d3f73eec5b28e1255027f947d95a74b6ab9':
Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
1773120c1e9aeebc917e1bb6c1241aecfe9d6500 22-Jun-2011 Wink Saville <wink@google.com> am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE

* commit 'ac4ff8958eced1c56a2e9571dd754c98eaa43108':
Special retry back-off timer in call setup failure.
4d9261fad3e3bdfa056f377c10f2af0a6db62542 22-Jun-2011 Wink Saville <wink@google.com> Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
64a09341d8a16212855b7cdd16fe079e25d45838 22-Jun-2011 Wink Saville <wink@google.com> Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
aef70d3f73eec5b28e1255027f947d95a74b6ab9 22-Jun-2011 Wink Saville <wink@google.com> Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
7c2d6fd60d5af00b0c4570bc86deda96de45c20d 21-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Return USIM IMSI as subscriber ID in case of CDMA-LTE mode

Bug: 4764057
Change-Id: I0c7d6e2af6a597d70d2024205d358e8b9c56b57b
om/android/internal/telephony/cdma/CDMALTEPhone.java
d1ec23c206d09deb72453d30bef582b8f4751856 22-Jun-2011 Wink Saville <wink@google.com> Use dataConnectionNotInUse to decide if a DC is free.

Change-Id: I89cb2f46dca59d5738dd16eb657104c3158ebcd2
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e0acd0842f2de9b2bf02d34c0ed90ca7a6ab30a9 17-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Special retry back-off timer in call setup failure.

RIL might specify a special retry back-off timer only used for
temporary in a certain error scenario. This patch will be adding
new handling of "retry" override so RIL specified retry timer
can be used instead of the pre-configured one.

Bug: 4723641
Change-Id: Ia4784f022a029c79b35c4c4c01ad7e49efd56a3c
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e303d7b31800f1382982cd0117b44ecfbdec08c4 19-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix handling of unsol_data_state_change with PDP sharing scenario

The original logic was to go through each ApnContext to find
changes on the DataConnection if applicable. This was causing
an issue when an DC is shared by multiple ApnContexts. Only
the first ApnContext associated with the updated DC was detecting
the link properties change.

The change in this patch is to go through the changes by DC instead
of ApnContext. And make sure the update on a DC is propagated to
all associated ApnContexts.

Bug: 4744006
Change-Id: Ie52d62d1d5671005f9e74b1ddc24822c9013e3e4
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e813ea5a11db8070d2ca72cab416fa1a8fd3539c 21-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 4906376f: Just a random fix.

* commit '4906376f58d617083034c5899d06a73b7c1cc114':
Just a random fix.
2ef46c65877a7188868cec440fbe93086e011f5b 20-Jun-2011 David Brown <dab@google.com> Use a static flag to enable/disable CallerInfo "geoDescription" lookup

...and disable the lookup for now, since we don't have the latest
PhoneNumberOfflineGeocoder (from the libphonenumber library) integrated
into our tree yet.

Bug: 4595580
Change-Id: I7391cbf1558b5a23eebfff6c4ad1f6363213c9a3
om/android/internal/telephony/CallerInfoAsyncQuery.java
4906376f58d617083034c5899d06a73b7c1cc114 20-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Just a random fix.

Don't re-lookup something - use the local holding the early lookup.

Change-Id: I6d9fac89651c99a84060238c8a6f6a936b1167ea
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e510fa4c0b56814aadd938596847aec9ab0290cc 17-Jun-2011 David Brown <dab@google.com> Fix permissions check in IccSmsInterfaceManager.sendText()

In android.internal.telephony.IccSmsInterfaceManager, we currently use
enforceCallingPermission() rather than enforceCallingOrSelfPermission()
to enforce the SEND_SMS permission.

The difference is that enforceCallingPermission() will ALWAYS throw a
SecurityException if you're not handling an IPC, i.e. if the request is
from the same process as the telephony framework.

In other words, the current code prevents the phone app from ever using
SmsManager.sendTextMessage() :-(

This change fixes IccSmsInterfaceManager.sendText() to use
enforceCallingOrSelfPermission(), and I confirmed I can now send SMSes
from the phone app.

NOTE there are a bunch of other uses of enforceCallingPermission() in the
telephony framework (all SMS-related) that we probably want to fix too,
although I'm fixing just this one for now since it's blocking a hi-pri
phone UI feature. I opened bug 4686733 to cover the rest of the cleanup,
though.

Bug: 4686733
Change-Id: Iaffcf62c54493fa4961fb20894c974697f26e3a7
om/android/internal/telephony/IccSmsInterfaceManager.java
e21217af6480c45212517a68b2b6e583c4dc27c9 17-Jun-2011 John Wang <johnwang@google.com> am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
Revert "Do not merge. Return null id for Non-phone device."
c6b32054c67901b0627ad99e4bd8b15c5cc2fb90 17-Jun-2011 John Wang <johnwang@google.com> am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
fe9aa2706ff9e5059d5e2737d751122fb5d692b9 17-Jun-2011 John Wang <johnwang@google.com> Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
ndroid/telephony/TelephonyManager.java
1766974b02a1accf6b0b553e3e7239b7c8416199 16-Jun-2011 John Wang <johnwang@google.com> am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE

* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
Support SIM permanently disabled state.
03cbb58e2418dc22ae18a8648404382da4ee46e8 16-Jun-2011 John Wang <johnwang@google.com> am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE

* commit 'ff42c04d15e000f6295e796e154cc60c54aa078b':
Support SIM permanently disabled state.
ff42c04d15e000f6295e796e154cc60c54aa078b 16-Jun-2011 John Wang <johnwang@google.com> Merge "Support SIM permanently disabled state." into honeycomb-LTE
f4a9e1a8a4e1bbefd5dbd16562e192a1f8ef23e1 16-Jun-2011 John Wang <johnwang@google.com> Don't clean up operator properties in RuimRecords.

Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and
PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA
devices have RUIM, these properties should keep the original
values, e.g. build time settings, when there is no RUIM but
set new values when RUIM is available and loaded.

bug:4552029
Change-Id: I37c2cea32b582a00873b7f85b70abe30253e1241
om/android/internal/telephony/cdma/RuimRecords.java
3d8fcebc98f1e56ca91eb4d5c76e3f53fbe431bf 15-Jun-2011 Wink Saville <wink@google.com> am ec18268e: am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

* commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021':
Always clear settings when entering Inactive state.
ec18268eb42641cd2a6ae9c8b26e35d67bb41021 15-Jun-2011 Wink Saville <wink@google.com> am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
Always clear settings when entering Inactive state.
1146bddf92fc91dad384bdaea740f9472bebd911 15-Jun-2011 Wink Saville <wink@google.com> Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
f3e3edb2f9cb3f353c57cf7b2e02937306e72703 15-Jun-2011 Wink Saville <wink@google.com> am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE

* commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a':
Clean up some debug statements.
aff9ec70e22abb64149e335ae2eb519c6027eb4a 15-Jun-2011 Wink Saville <wink@google.com> am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE

* commit '4d6233b2edd24c83efe10f4403456b8d0c87241a':
Clean up some debug statements.
eddc3a579c44f4573fc9815029961d28265923ca 15-Jun-2011 Wink Saville <wink@google.com> Clean up some debug statements.

Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
181aafd75c339d5c420c5755ab3889e0a7e909b9 15-Jun-2011 Marco Nelissen <marcone@google.com> am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp

* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
Ignore duplicate WAP push PDU source/destination port if configured
9c3c3004c4206da3f2579e863ce89a2f99269dd6 15-Jun-2011 Marco Nelissen <marcone@google.com> am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp

* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
d8f9a83cab34de38981dc3ba5ca9df8dda02dbc0 15-Jun-2011 Marco Nelissen <marcone@google.com> resolved conflicts for merge of d027329c to gingerbread-plus-aosp

Change-Id: I169c415bf998b9935ab36812511573db05717b91
0e765f8b731540e4645b7b727fa8bcda2f4f9dc8 15-Jun-2011 Wink Saville <wink@google.com> Always clear settings when entering Inactive state.

Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
om/android/internal/telephony/DataConnection.java
b0b24b3df50988d23f571b83d829fecc986ec497 11-Jun-2011 John Wang <johnwang@google.com> Support SIM permanently disabled state.

SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.

This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.

bug:4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccCardApplication.java
om/android/internal/telephony/IccCardStatus.java
om/android/internal/telephony/RIL.java
02f4e4f9811a2a1720f76aba2744e4380f0fa5d4 15-Jun-2011 Wink Saville <wink@google.com> am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE

* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
Enforce provision check for CSIM record only.
35831f198a2bf1f28eea2f61291f2542724cc228 15-Jun-2011 Wink Saville <wink@google.com> am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE

* commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
Make APN re-connect delay configuable
3bcc33fdec6adf8f774ce0c494f2d173f57a8849 15-Jun-2011 Wink Saville <wink@google.com> am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE

* commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
Revert "CDMALTE: Get roaming status based on SID/NID"
5d47d203fb60f4e7c91d97fa852a23863861b011 14-Jun-2011 Wink Saville <wink@google.com> am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE

* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
Enforce provision check for CSIM record only.
aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a 14-Jun-2011 Wink Saville <wink@google.com> am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE

* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
Make APN re-connect delay configuable
46cd4a4bfe432ed6b483c0d6fc1045e387f22710 14-Jun-2011 Wink Saville <wink@google.com> am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE

* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
Revert "CDMALTE: Get roaming status based on SID/NID"
fbef26eb55cf8a5b5a25a2b748bf16b54d398abc 14-Jun-2011 Wink Saville <wink@google.com> Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
c2d17d3bea02991df378237ea7058ccedb7c6a14 14-Jun-2011 Wink Saville <wink@google.com> Merge "Make APN re-connect delay configuable" into honeycomb-LTE
98e1e28f30b4de2c762bd6c4aea98a20670a175d 14-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Enforce provision check for CSIM record only.

Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
c65d52b148cf89bb81f97ac1f964266c856164b0 14-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Make APN re-connect delay configuable

Add configurability on hard coded timer.

Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
om/android/internal/telephony/DataConnectionTracker.java
23f646367ddecc26b95db683c752791ab3ea7fa1 14-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Revert "CDMALTE: Get roaming status based on SID/NID"

This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
94202fe1217b9f63e1f5c314379a9f0021e96ea8 11-Jun-2011 David Brown <dab@google.com> Add "geoDescription" to CallerInfo

As of change https://android-git.corp.google.com/g/111296 the
libphonenumber library now provides an API ("PhoneNumberOfflineGeocoder")
to look up a geographical description string for a given number.

This change adds a new CallerInfo field called "geoDescription", and
uses the PhoneNumberOfflineGeocoder to look it up (if the contact lookup
fails) during the CallerInfoAsyncQuery sequence.

See https://android-git.corp.google.com/g/114715 for the corresponding
change under apps/Phone, to display this string (along with the raw
number) in the incoming-call UI.

Also some other minor cleanup:
- fixed spelling of the "normalizedNumber" field
- tiny javadoc and code style cleanup
- slight CallManager and CallerInfo debug output cleanup

Bug: 4595580
Change-Id: I900d8f48e953d1b24983602cb5467a5c6a6c518a
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
e1a4fcdeaa5f5755fe4ec8b156c4d095347bf1ed 11-Jun-2011 John Wang <johnwang@google.com> am cc44bea0: am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE

* commit 'cc44bea0400bc6b6e995d66b705a4db0a77a7dfa':
Add toString for IccCard Status and App.
cc44bea0400bc6b6e995d66b705a4db0a77a7dfa 11-Jun-2011 John Wang <johnwang@google.com> am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE

* commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a':
Add toString for IccCard Status and App.
2addaf97b319e257677ac3e5bbb772ba40cfa78a 11-Jun-2011 John Wang <johnwang@google.com> Merge "Add toString for IccCard Status and App." into honeycomb-LTE
8b7eede0bc4e11e6f8ddeffa2b349c29c5e47b7e 11-Jun-2011 Robert Greenwalt <robdroid@android.com> am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE

* commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca':
CDMALTE: Get roaming status based on SID/NID
75612e9c3f92364ba1f0a7fce46f1df11b0a14ca 10-Jun-2011 Robert Greenwalt <robdroid@android.com> am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE

* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
CDMALTE: Get roaming status based on SID/NID
d027329cd6105c05c157e3858a170e4f04eb0e3e 10-Jun-2011 Soojung Shin <sj46.shin@samsung.com> Ignore duplicate WAP push PDU source/destination port if configured

Some carriers duplicate the OMADM wap push PDU source/destination
port.

e.g. MSGTYPE-TotalSegments-CurrentSegment
-SourcePortDestPort-SourcePortDestPort-OMADM PDU

So the client has to ignore the duplicate source/destination
port.

Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
9e7c20635f8b9fb1195f1b6c56a9387105d765dc 10-Jun-2011 Robert Greenwalt <robdroid@android.com> am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE

* commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
Set locale based on SIM preferred language.
c7a58b4de012bd01c4798e44f3e8cbe9fb45aded 10-Jun-2011 John Wang <johnwang@google.com> Add toString for IccCard Status and App.

Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.

Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
om/android/internal/telephony/IccCardApplication.java
om/android/internal/telephony/IccCardStatus.java
3fc9055c7f3bc25948f17bc29582abae72fe7de1 04-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> CDMALTE: Get roaming status based on SID/NID

Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
5a8455c3c625201f3ae6b9ce32913bf97ba61cc8 10-Jun-2011 Robert Greenwalt <robdroid@android.com> am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE

* commit '75749ab1a03f5b4a9f1aaee64dd1c6f36e22dc22':
Set locale based on SIM preferred language.
e9b46c3ac53edd5381fc232ea9f1b6a7126a88e4 07-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Set locale based on SIM preferred language.

Unless user had selected a desired locale, EFli or EFpl will be
used to decide the locale to be used.

Note this locale setting is not persistent - only valid while
SIM card is present.

Change-Id: I1f3945f7bc02624dff94b90e7f1a658a136033e8
om/android/internal/telephony/MccTable.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
599b1029974cc7ddaf9e5676f3de92369d4345a7 09-Jun-2011 Wink Saville <wink@google.com> am 2d8500d2: am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE

* commit '2d8500d21a3fe6af36040a5dcd0599e00a242766':
Report data status from ApnContext even if data is detached
62bd659a09fb40189519ecc4d5f53c682664eb32 09-Jun-2011 Wink Saville <wink@google.com> am a384ff32: am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE

* commit 'a384ff32827cf6383ead48ec4e0da42365ed3584':
Use CSIM to get provision information
023180409516b463b7358ec42bd3a810b2e225c3 09-Jun-2011 Wink Saville <wink@google.com> am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE

* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
Fix default preferred network.
0cf353e0527983fcb239d3896cf8084c309cecec 09-Jun-2011 Jake Hamby <jhamby@google.com> am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
Fixes for SMS Cell Broadcast support.
3fa5f373467054c673c5fd6296adba4c6de41520 09-Jun-2011 John Wang <johnwang@google.com> am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit '229d3a0cbce70db82003705abf6844deec136d20':
Make getDeviceId return null for Non-phone device.
d4f1bacca50a74a74a02bf6a242bb22c495e4034 09-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 7ca13deb to master

Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
2d8500d21a3fe6af36040a5dcd0599e00a242766 09-Jun-2011 Wink Saville <wink@google.com> am 799f04c0: Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE

* commit '799f04c09cc7284e0660d419bcb24af57b86f08e':
Report data status from ApnContext even if data is detached
a384ff32827cf6383ead48ec4e0da42365ed3584 09-Jun-2011 Wink Saville <wink@google.com> am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE

* commit '33e1424b2e924e9b0162aa648137e8254f729161':
Use CSIM to get provision information
799f04c09cc7284e0660d419bcb24af57b86f08e 09-Jun-2011 Wink Saville <wink@google.com> Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE
cea03df201dc6659654234bc5fbfebf1b6a06e42 08-Jun-2011 John Wang <johnwang@google.com> Do not merge. Return null id for Non-phone device.

For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
ndroid/telephony/TelephonyManager.java
2e994586ed0aa09f93951dbc4de35d56a93abe95 04-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Report data status from ApnContext even if data is detached

While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
0da86d4fef70f94a02a504f8500df2833719da6b 08-Jun-2011 Wink Saville <wink@google.com> am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE

* commit 'a558fdf156601a477964139fee57da29de7f31b3':
Fix default preferred network.
53f67f7e9d5534cc7d4fe882e100c221ce0b193b 01-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Use CSIM to get provision information

In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a558fdf156601a477964139fee57da29de7f31b3 08-Jun-2011 Wink Saville <wink@google.com> Merge "Fix default preferred network." into honeycomb-LTE
d6bcfd1cd081b9fe553976a0191a814b929c583e 08-Jun-2011 Wink Saville <wink@google.com> Fix default preferred network.

Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
8a02401129e5805025d3a39e552a2840e73fb8cf 08-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of e139167c to master

Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
d2a458750e5a3d490af09cecb5c28370baf0a913 29-May-2011 Jeff Sharkey <jsharkey@android.com> Map network identity using ConnectivityService.

Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService. Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates. Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
ndroid/telephony/TelephonyManager.java
2b2c31f603b2dd5a9740e7cf14d926892ec267df 08-Jun-2011 Wink Saville <wink@google.com> am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE

* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
Preferred network discrepancy after rild is restarted.
22165bb54af1cd3cb636c1d65da7c643d854c385 08-Jun-2011 Jake Hamby <jhamby@google.com> am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
Fixes for SMS Cell Broadcast support.
ae62b7b0bca9c46dea30ee81a7aada3e7576638b 08-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
229d3a0cbce70db82003705abf6844deec136d20 08-Jun-2011 John Wang <johnwang@google.com> am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
Make getDeviceId return null for Non-phone device.
fc94d45fc209dbcfdf7f57e0c04c581e1e51988b 08-Jun-2011 John Wang <johnwang@google.com> Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
e19736f0520689747b9e703a40b5f574bd9a7fce 08-Jun-2011 John Wang <johnwang@google.com> Make getDeviceId return null for Non-phone device.

For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
ndroid/telephony/TelephonyManager.java
7d259626d009a45195ec341646ce06658b842e40 08-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
e139167c9109aee203f5fbbdeeab656994d9c9ac 07-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE

* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
5df69fad6e5021d2862bff0553a510f8d6729fbd 07-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 8de47a2f to honeycomb-LTE

Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
7f13d0ed408c3ddce5b061c4370d99ba15d027b7 07-Jun-2011 Wink Saville <wink@google.com> am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE

* commit 'c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
Preferred network discrepancy after rild is restarted.
05d69edc0ba9b016a1bd7cb89a03b24c5659bf8d 07-Jun-2011 Wink Saville <wink@google.com> Preferred network discrepancy after rild is restarted.

If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.

bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/RIL.java
66040bbb087b04c4bbac8429f91bbff1029e1440 03-Jun-2011 Jake Hamby <jhamby@google.com> Fixes for SMS Cell Broadcast support.

Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.

Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
ndroid/telephony/SmsCbConstants.java
ndroid/telephony/SmsCbMessage.java
om/android/internal/telephony/IntRangeManager.java
om/android/internal/telephony/gsm/SmsCbHeader.java
0cb17a52ee278e6fd1575a086dac155e11574287 07-Jun-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp

Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
cc19d9059f8da001cbc81f2edae753ad4c1cdb3d 06-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."

* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
Adding support for parsing of SMS-CB pdus in UMTS format.
59242cf65ec775ccb6cb3639df4eab6af09f3108 06-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."

* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
1e36ddabed8e78c289846f55dacb044a9cbfa82c 04-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 89c1eb8e: am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE

* commit '89c1eb8edcf2920b4f72e2ca63817a901e2340d7':
Promote Telephony's isDataPossible.
03133d50a39e0793c2d7f6f5399d2928aac5e057 04-Jun-2011 John Wang <johnwang@google.com> am 0b1923ce: am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE

* commit '0b1923ce512d278336aab0c780d439b655e29b1c':
Add supplyPuk to do SIM puk unlock.
cd11cc711a87fdd28e2e0013380d3cc9d26e82a2 04-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 76273dd1: am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"

* commit '76273dd16d856f98de3f063a6c04caad2d374728':
Data recovery failure due to apn/dc state stuck in "disconnecting"
da3505993ce8f6e3c207b97813e0e0818e253187 04-Jun-2011 Wink Saville <wink@google.com> am 3699c3d7: am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE

* commit '3699c3d7c8a450cc39fd1c3db23b64208bd43353':
Refactor ServiceStateTracker handling of radio technology.
ed1a9022a19a9003931ce47ff7a0a0b5564255a5 04-Jun-2011 Wink Saville <wink@google.com> am 14751014: am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE

* commit '147510145f7b619f86a71065f2d62f444aee7f3d':
CdmaLte: Use SPN from SIM card if SIM card is presend
3144ca294b6e877d0b0d937cc4a863bdf0adaa0f 04-Jun-2011 Wink Saville <wink@google.com> am ade2a546: am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE

* commit 'ade2a5467c8f6fbb115df6a1e5730758db4e620c':
Read CSIM records in LTE on CDMA mode
89c1eb8edcf2920b4f72e2ca63817a901e2340d7 04-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE

* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
Promote Telephony's isDataPossible.
80a19e67d1cd3710dbbfa52767a994512d20f694 04-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
0b1923ce512d278336aab0c780d439b655e29b1c 03-Jun-2011 John Wang <johnwang@google.com> am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE

* commit '3b71239aca01fb029d9acd2c606b7be9b8f32d66':
Add supplyPuk to do SIM puk unlock.
3b71239aca01fb029d9acd2c606b7be9b8f32d66 03-Jun-2011 John Wang <johnwang@google.com> Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
c5e626c3934d00bbfb13d48c640ba86a06aad49d 03-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am 903cd57f: am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE

* commit '903cd57f67fee8708cc6349ca1aac4de01831798':
Remove redundent getCurrentCdmaDataConnectionState
76273dd16d856f98de3f063a6c04caad2d374728 03-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"

* commit '77c9411306b6b3d210d22214d596272c9728cf5e':
Data recovery failure due to apn/dc state stuck in "disconnecting"
77c9411306b6b3d210d22214d596272c9728cf5e 03-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Data recovery failure due to apn/dc state stuck in "disconnecting"

If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.

This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
to ensure DC won't be stuck in DcDisconnectingState so force
reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
can be reset to IDLE even if no reference to DCAC.

Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
3699c3d7c8a450cc39fd1c3db23b64208bd43353 03-Jun-2011 Wink Saville <wink@google.com> am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE

* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
352dbc44a4e30dea1d447e6da0898cf58627c3d9 03-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> Promote Telephony's isDataPossible.

bug:3481357
Change-Id: I83cb40cd5bb86d98abbb7152190b2277470fa160
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
db09b5db60fa05ba65662faa86422b9ec69493a1 03-Jun-2011 Wink Saville <wink@google.com> Refactor ServiceStateTracker handling of radio technology.

Also add a little more debugging.

Change-Id: I832872c876b290a3e83a79068059a21894472a1d
ndroid/telephony/ServiceState.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
e30277b091c05b07a14d65d7004ecfa1544035b4 03-Jun-2011 Conley Owens <cco3@android.com> am 1bbcc695: am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."

* commit '1bbcc6953ae692206052e62b6adae15e221ec356':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
31e61185a6c34c8fd80c3283b9d80dc136b57b63 03-Jun-2011 Ed Heyl <ed@google.com> resolved conflicts for merge of 39ddeae0 to master

Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
147510145f7b619f86a71065f2d62f444aee7f3d 03-Jun-2011 Wink Saville <wink@google.com> am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE

* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
CdmaLte: Use SPN from SIM card if SIM card is presend
ade2a5467c8f6fbb115df6a1e5730758db4e620c 03-Jun-2011 Wink Saville <wink@google.com> am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE

* commit '1076f5ff27d35a5a807043bdea49aa40404d9c6b':
Read CSIM records in LTE on CDMA mode
2e543dc188c3c2e8f8a785e403c95b7e22fa6262 03-Jun-2011 Wink Saville <wink@google.com> Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
98c7781ca89348992e3cb455e83cbc774bbe4d3e 03-Jun-2011 John Wang <johnwang@google.com> Add supplyPuk to do SIM puk unlock.

Change-Id: I48654091ac3133a0c405448871b0a2f1ed3ded4b
om/android/internal/telephony/ITelephony.aidl
7ec9ab88d7c8e6a888b3269bc6937ebcdd54ab00 03-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am a36c8f69: am 57675037: Further fix for SIM detection.

* commit 'a36c8f693d935d75657271d89f57884f5df1a92d':
Further fix for SIM detection.
2d6ebd559c2361faf42c00efd254c95dd88f8a77 03-Jun-2011 Wink Saville <wink@google.com> am 205a2c3a: am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE

* commit '205a2c3a3e6f50039bf296ad0af22f9a93f7eaf9':
DataConnection FailCause should use errorCode rather than ordinal.
8806be91fd65c1a10dc9839e0bf362facd4df95b 03-Jun-2011 Wink Saville <wink@google.com> am 08c00205: am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE

* commit '08c00205a7df0c9af94e4869b800be05eb38c660':
DataConnection : Have a separate alarm for each APN type.
ce7aa22515cb7849097e41a16b26232045dbd3a6 03-Jun-2011 Wink Saville <wink@google.com> am 37a4069f: am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE

* commit '37a4069ff957ee64caba52b3f9f5d4ac70f4ea7b':
Derive ICC status from multiple application status for UICC
c46a085eedef8c7c59df4b182d90d787f1ff0f04 24-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Read CSIM records in LTE on CDMA mode

In case of CDMA and LTE hybrid system, UICC card contains
both USIM and CSIM data. FW needs to read out from both
to aqcuire information required for the service.

Change-Id: I4a714252bc97c037fa419352f23d8f38f6206406
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/IccFileHandler.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaLteUiccFileHandler.java
om/android/internal/telephony/cdma/CdmaLteUiccRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
c91c7f92c9d2da557d4187fa24519f1dc1f1e2ec 02-Jun-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> CdmaLte: Use SPN from SIM card if SIM card is presend

Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
ndroid/telephony/ServiceState.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
ab79ee4adcbc6eb9fb9c509766753f65d3857739 27-Apr-2011 Jake Hamby <jhamby@google.com> Enable full support for SMS Cell Broadcast.

Implement full support for SMS Cell Broadcast (3GPP TS 23.041).
Includes support for ETWS and CMAS emergency message types.
Includes GSM and UMTS support (CDMA will be added later).

Note: the change to GsmAlphabet.java is only necessary if the
SMS national languages support patch has been applied. If that
change has not been applied, then the changes to GsmAlphabet.java
in this patch set can safely be ignored.

Change-Id: Ia0362c53695b8ef9a0982f558f1cffa912def34b
ndroid/telephony/SmsCbConstants.java
ndroid/telephony/SmsCbMessage.java
ndroid/telephony/SmsManager.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/ISms.aidl
om/android/internal/telephony/IccSmsInterfaceManagerProxy.java
om/android/internal/telephony/IntRangeManager.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
om/android/internal/telephony/gsm/SmsCbHeader.java
903cd57f67fee8708cc6349ca1aac4de01831798 01-Jun-2011 Robert Greenwalt <rgreenwalt@google.com> am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE

* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
Remove redundent getCurrentCdmaDataConnectionState
d1a1c09cb06fef6ade48063fe1171ff25cd38050 01-Jun-2011 Wink Saville <wink@google.com> am 7f9d3210: am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE

* commit '7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
Remove or disable some verbose debugging.
a4e82851e9c8a75dfb371403c500e3b3cf3e4565 27-May-2011 Robert Greenwalt <rgreenwalt@google.com> Remove redundent getCurrentCdmaDataConnectionState

replace with existing and generic getCurrentDataConnectionState.
bug:3487138

Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
97ab2d4f86ee9c2b661a00688e934fc7030df22e 27-May-2011 Robert Greenwalt <rgreenwalt@google.com> Reveal some network constants.

Since we've already decided to inc the sdk version we should try to get these in too.

bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
ndroid/telephony/TelephonyManager.java
1bbcc6953ae692206052e62b6adae15e221ec356 29-May-2011 Conley Owens <cco3@android.com> am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."

* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
39ddeae0b647519f205e8d4cc334ad548ffe2ac8 29-May-2011 Ed Heyl <edheyl@google.com> Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp
a36c8f693d935d75657271d89f57884f5df1a92d 28-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 57675037: Further fix for SIM detection.

* commit '57675037aa279e715a966e2888a31c97381a5fe4':
Further fix for SIM detection.
57675037aa279e715a966e2888a31c97381a5fe4 28-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Further fix for SIM detection.

Refining SIM ready condition on UICC w/ multiple apps.
Also migration for RIL to use SIM_READY indication in case of UICC
presence instead of current NV_READY message.

Change-Id: I3445a628e2d32a24292e6a69785fe72422481221
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
205a2c3a3e6f50039bf296ad0af22f9a93f7eaf9 27-May-2011 Wink Saville <wink@google.com> am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE

* commit '178b066096d94f078fdb32bf9f66755bae34819d':
DataConnection FailCause should use errorCode rather than ordinal.
178b066096d94f078fdb32bf9f66755bae34819d 27-May-2011 Wink Saville <wink@google.com> Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
98288aa3de8d562f33d2431cc344709ddf2452a6 27-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> DataConnection FailCause should use errorCode rather than ordinal.

Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89
om/android/internal/telephony/DataConnection.java
08c00205a7df0c9af94e4869b800be05eb38c660 27-May-2011 Wink Saville <wink@google.com> am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE

* commit '885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
DataConnection : Have a separate alarm for each APN type.
37a4069ff957ee64caba52b3f9f5d4ac70f4ea7b 27-May-2011 Wink Saville <wink@google.com> am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE

* commit 'e55e5e7c406bdedc67c6e536c981146e2b335b43':
Derive ICC status from multiple application status for UICC
885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c 27-May-2011 Wink Saville <wink@google.com> Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
e14a59e96c2a4362a7d72685a0669a5c3338f421 26-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Derive ICC status from multiple application status for UICC

If UICC with multiple applications are used, delive the status
based on both status instead of just looking at one.

Change-Id: I98cf689327e5302bb4174985935511aff02939f6
om/android/internal/telephony/IccCard.java
69d0855ed262ca1760bd81bae72a0565f53ca495 27-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> DataConnection : Have a separate alarm for each APN type.

Change-Id: I0769f3e2a7c60bd833af7c24eb661d368bac2598
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
62388cfc1fb2483eb6582ccb8e36d47f16bf01fa 26-May-2011 Simon Wilson <simonwilson@google.com> resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp

Conflicts:
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
7f9d3210cbef5c5e797f78fd3a2f836979de32e3 26-May-2011 Wink Saville <wink@google.com> am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE

* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
Remove or disable some verbose debugging.
3b13b2c9d1ee6035996766d332ba8b85cc3bf3d2 26-May-2011 Wink Saville <wink@google.com> Remove or disable some verbose debugging.

Change-Id: I930689502f2a76bf72e315331d66a9259135c6b8
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/RIL.java
54ab72e1c389905adb074bd7c799a33b4f513679 25-May-2011 Jean-Baptiste Queru <jbq@google.com> am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."

* commit '038e8f99845e171c0d9d606f5697e36b1b684d01':
Adding support for parsing of SMS-CB pdus in UMTS format.
038e8f99845e171c0d9d606f5697e36b1b684d01 25-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
c9e3608fa6625e845ef718156ce7fcdc6f705e16 25-May-2011 Wink Saville <wink@google.com> am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE

* commit '5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7':
Handle ProvideLocalInfo stk command.
10b364b4bea8537f955bbbb8b9b40061264b29c9 25-May-2011 Conley Owens <cco3@android.com> am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."

* commit '4cf0eee755046734568959ac01f207b108e449c0':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
4cf0eee755046734568959ac01f207b108e449c0 24-May-2011 Conley Owens <cco3@android.com> Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7 24-May-2011 Wink Saville <wink@google.com> am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE

* commit '543c3146cb011380e4328e049abf97bc797db95a':
Handle ProvideLocalInfo stk command.
38b6999d9e7f6a1193fd3105235afa2502013740 23-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Handle ProvideLocalInfo stk command.

Change-Id: I4cb685f7d8e7442185e927fa0d49531b96eeab08
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/CommandParamsFactory.java
om/android/internal/telephony/cat/ResponseData.java
fb9eebc42744598ed3360c1dc485cf2509145b79 24-May-2011 Wink Saville <wink@google.com> am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE

* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
Map multiple apnType to one DataConnection fixes.
9a4285474c2eddf45dc5c184a58fe8113afbe1b9 24-May-2011 Wink Saville <wink@google.com> am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE

* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
Data Connection: Use Alarm for all delayed data retries.
3dbc571e62d8c63a55f5e2e58ea22aa6ebf0df39 24-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 6056e326: am f96a6150: Data reconnection issue after airplane mode

* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
Data reconnection issue after airplane mode
eb1fbf7a4516dcb44bf5acb2e17ae5955db2afdb 24-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links

* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
GSM DCT: Update poll stats to support multi-links
cb3fad5cbeffd876057921ddae3752a740fb7590 24-May-2011 Wink Saville <wink@google.com> am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change

* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
Tear down connection with unwanted linkproperty change
28793432911055e27b735ecd9be169a701d7e69a 24-May-2011 Wink Saville <wink@google.com> Fix build.

A merge accidentally included a line that was deleted.

Change-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989
om/android/internal/telephony/IccCard.java
595881ee5ebc6b7d12246eb4c0458fb0f9f17bb9 24-May-2011 Wink Saville <wink@google.com> am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE

* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
Notify RIL that PDP reset is triggered due to data stall
5ea7a29387f28c8b8b8bc745ba2190a944be3c34 24-May-2011 John Wang <johnwang@google.com> am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE

* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
Add UI to handle SIM swap.
9ddcdd98d97b2d5026d62d2b60c8582515381eaf 24-May-2011 Wink Saville <wink@google.com> am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE

* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
Fix broken data retry
ed5af6d93b2758b86175b13c380fcd164e537a7c 24-May-2011 Wink Saville <wink@google.com> am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE

* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
Change getLteOnCdmaModeStatic to dynamically determine its result.
a38fad37c21a13ddf1cc14e5a960f395af558ee8 24-May-2011 Soojung Shin <sj46.shin@samsung.com> am 4e4ad341: SmsMessage: convert + to international dialing prefix

* commit '4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7':
SmsMessage: convert + to international dialing prefix
4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7 13-May-2011 Soojung Shin <sj46.shin@samsung.com> SmsMessage: convert + to international dialing prefix

When sending an SMS to an international number in the format
+401234567890, the "+" should be converted to the International
Dialing Prefix (in the US, 011). However, the device drops this
"+" altogether in the outbound data burst message causing the message
to fail or be sent to the wrong address.

Change-Id: If25c092d283f1703b49cf52d0379efa54639f093
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
om/android/internal/telephony/cdma/SmsMessage.java
9a8ea20d4b3975d3f771364fb9f2272c32f8cad1 23-May-2011 Wink Saville <wink@google.com> am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE

* commit '070eecef394175d7344cdadde675e8977a1609f0':
Map multiple apnType to one DataConnection fixes.
b1817383050986413805fbbf2c1cc5c03417574d 23-May-2011 Wink Saville <wink@google.com> am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE

* commit 'd3924fe9f6c99bc92ed86195e07ba82d39043812':
Data Connection: Use Alarm for all delayed data retries.
070eecef394175d7344cdadde675e8977a1609f0 23-May-2011 Wink Saville <wink@google.com> Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
a95bce0b29dd629b512b5e5aec8ece35f12be049 17-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Map multiple apnType to one DataConnection fixes.

With current design the code maps to the same DC, but no indications go out.
With this, making it more async in nature that the request goes all the way
to DC and all the data indications would be triggered by parallel paths through DCT.

Change-Id: I4c6e64912dafe19154d910bbd0441b10ada36cff
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a88d76b7721d3a4e0be33fe990ba2d900f923241 22-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Data Connection: Use Alarm for all delayed data retries.

Change-Id: I5045c3a10808b75f1ca3174bd1c16f332d5f7fa8
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e 21-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am f96a6150: Data reconnection issue after airplane mode

* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
Data reconnection issue after airplane mode
8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e 21-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 4c88be65: GSM DCT: Update poll stats to support multi-links

* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
GSM DCT: Update poll stats to support multi-links
f96a6150e4e6c37f8952456bf9f84714f622713d 21-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Data reconnection issue after airplane mode

ApnContext and DC were not disassociated when force
"cleanUpConnection" was called. Causing the setup
request was not happening if applyNewStatus() was
the trigger.

Change-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
4c88be655e387011c6d57c6d68b5deb94f6ce601 21-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> GSM DCT: Update poll stats to support multi-links

Change-Id: I654e38e71f9576ed2c4da59af563be04bc87045c
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
7abbf93c854cd7d272183b674373e989a05da6dd 21-May-2011 Wink Saville <wink@google.com> am 15cd6ec2: Tear down connection with unwanted linkproperty change

* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
Tear down connection with unwanted linkproperty change
15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1 21-May-2011 Wink Saville <wink@google.com> Tear down connection with unwanted linkproperty change

Make sure to disconnect the link when RIL reported link property change
which could cause connectivity issue. (i.e. IP address)

Change-Id: I6601ef53e4561bdc7d2760d00e134b8431512cb2
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
f7bc0e28bf66c20ef233a161cd1d50a009013ab0 21-May-2011 Wink Saville <wink@google.com> am 16e8d22b: Fix build.

* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
Fix build.
16e8d22b206fb0c8b8b5a243ea13e08597f60ebc 21-May-2011 Wink Saville <wink@google.com> Fix build.

A merge accidentally included a line that was deleted.

Change-Id: I991488ace290e5eb8eef3ca73f49c07d391028f5
om/android/internal/telephony/IccCard.java
f8d70b14e4285d17d83cc4853f50b44d6a55fbc7 21-May-2011 Wink Saville <wink@google.com> am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE

* commit '5f353de96beca0a400796887e737314a62e35b6a':
Notify RIL that PDP reset is triggered due to data stall
5f353de96beca0a400796887e737314a62e35b6a 21-May-2011 Wink Saville <wink@google.com> Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
b7a13791a12eef57434b84a97609d98e03e17009 21-May-2011 John Wang <johnwang@google.com> am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE

* commit '393eb0d06b4536591584a8d4c5fb03c2962835a9':
Add UI to handle SIM swap.
393eb0d06b4536591584a8d4c5fb03c2962835a9 21-May-2011 John Wang <johnwang@google.com> Merge "Add UI to handle SIM swap." into honeycomb-LTE
10e9f668eec105699b8f10d544a418e5bf9605c5 10-May-2011 John Wang <johnwang@google.com> Add UI to handle SIM swap.

bug:4364964

Change-Id: Iadf466401a24dfbd638353d689e6ae89506afc97
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/gsm/SimCard.java
edbe2cc386147dbac52b3bc74d8a15ad1f95b268 20-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Notify RIL that PDP reset is triggered due to data stall

Additional deactivate cause so RIL could take intelligent action
on data stall occurrence if necessary.

Change-Id: Iae4accda879efb5679085c518117617fb16631c3
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RILConstants.java
0ba625259e8c4af3df2c7823fc1d18b42d760a44 21-May-2011 Wink Saville <wink@google.com> am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE

* commit '2b534e770dadc4b3180863a393fd89094d0f07a7':
Fix broken data retry
d7784628368404ff53caf080640cd9ff32775fd3 17-Apr-2011 David Sobreira Marques <dpsmarques@gmail.com> Fixing concurrency issue on IccPhoneBookInterfaceManager.

All the reads/updates methods are synchronous calls that rely
on an unique lock object in order to wait for the asynchronous
simcard operations to complete and return appropriate results

Concurent calls to these methods will cause errors when one
completed operation will unlock all waiting calls generating
inconsistent results on some of the method calls.

Change-Id: I8b87004ac039bcb971b8369f7640281f1bf9eb35
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0 21-May-2011 Wink Saville <wink@google.com> am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE

* commit 'f89ea7a5ec3af366a825c2e2cfc4f4c1f05de4c4':
Change getLteOnCdmaModeStatic to dynamically determine its result.
5ce6268faae8cb3114b64416ec336a528517f436 18-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix broken data retry

Change I2b737efa6092ad1254c8dc25840ec429f5c6e882 brought side
effect that retry count is reset at every setup.

Change-Id: I6f20d2e82110b2873ff5acbb60a747fd11c09c60
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
fe071d3d37c8b3e2f332b5ad8c30f02717501153 20-May-2011 Wink Saville <wink@google.com> Change getLteOnCdmaModeStatic to dynamically determine its result.

bug: 4202572
Change-Id: I956b61840e2043229df29054dd2a6daccd7a845f
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/TelephonyProperties.java
b568b51255256a8c9bdf6463cca185f813f28caa 19-May-2011 Wink Saville <wink@google.com> am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE

* commit '09ded82b784b9f6e01d4cd4298097fd2b459560b':
Reset connection while data state changed.
09ded82b784b9f6e01d4cd4298097fd2b459560b 19-May-2011 Wink Saville <wink@google.com> am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE

* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
8904c3d814b5959b17a0523177f4142db6a18f1e 19-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change.

* commit 'b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
Linkproperties update via unsol data call state change.
bf7e83689b290d3766effcb1a251e0dec1b672eb 19-May-2011 Wink Saville <wink@google.com> am e34a7686: am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE

* commit 'e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce':
Remove SIM operator name hack
be2b058ec1e11e1d33b6d03230c21e5d2d7ac40c 19-May-2011 Wink Saville <wink@google.com> Reset connection while data state changed.

Check data call states and reset connection if any link properties changed.


Change-Id: I008aea969378648192852161959fdf4aad6211a1
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe 18-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 01758e81: Linkproperties update via unsol data call state change.

* commit '01758e81b3ad89934581885bb2fc7006510ec639':
Linkproperties update via unsol data call state change.
01758e81b3ad89934581885bb2fc7006510ec639 01-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Linkproperties update via unsol data call state change.

Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.

Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce 18-May-2011 Wink Saville <wink@google.com> am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE

* commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47':
Remove SIM operator name hack
066704ddb4c657a68ea7a8c63bccc762582dce52 18-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Remove SIM operator name hack

Change-Id: I28c6f94dd6c6bab3a3025f67013a39b3ea0fb0a1
om/android/internal/telephony/gsm/SIMRecords.java
a77f4c530b173dc0b4968fea3d9c9e21fae6e082 17-May-2011 Wink Saville <wink@google.com> am 360f5533: am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE

* commit '360f553311ab697995d24c2a42e45659a5436efa':
No data icon switch seen between LTE to EHRPD Handover
360f553311ab697995d24c2a42e45659a5436efa 17-May-2011 Wink Saville <wink@google.com> am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE

* commit '7b0339a8adca1347fe7ac3ac118c903ff32442a8':
No data icon switch seen between LTE to EHRPD Handover
212129118645bae324b92b36e9818f110563284d 17-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> No data icon switch seen between LTE to EHRPD Handover

Change-Id: Ifc8e9e8d88b6617d75322f743ae96fd897a45c3b
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
cbdfd801ff5a86cc9e355a110e20936f69b0a3d6 17-May-2011 Wink Saville <wink@google.com> am 648831cc: am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE

* commit '648831cc85f895e95ce65509f5e9e67ed4bf2926':
Fix data attempt while PS is not in-service
648831cc85f895e95ce65509f5e9e67ed4bf2926 17-May-2011 Wink Saville <wink@google.com> am 99f04c49: Merge "Fix data attempt while PS is not in-service" into honeycomb-LTE

* commit '99f04c4943368ea7ea7f9d28fa941a1b387e7477':
Fix data attempt while PS is not in-service
c1a4e7093e5461868c09800b7f9303a9eddefcff 11-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix data attempt while PS is not in-service

mAutoAttachOnCreation flag was incorrectly initialized which was
causing invalid data attempts while PS is not in-service.

Change-Id: Iaf16b70b1997631309a4918a99ac5f3c3ea74d02
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
188b9e9ec081b52d77800488b317b2ccac1aa276 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Fix ISO country code of Slovenia.

Misread an IBM site and thought it was sl-sl, but really it is sl-si.

fixes public bug 16021

Change-Id: Ibc9fa4d18fd66fc90f361674159a97e2acb1681d
om/android/internal/telephony/MccTable.java
c6aa9e8cc2bd6738fa6136b63f27ebd37c7efab0 16-May-2011 Wink Saville <wink@google.com> am 2ead69e1: am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE

* commit '2ead69e11631b9bc2b12fe0cd8dbd27155559276':
Implement incremental data stall recovery in GSM DCT
2ead69e11631b9bc2b12fe0cd8dbd27155559276 16-May-2011 Wink Saville <wink@google.com> am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE

* commit 'fe5b5d3700a5c67b5e8fcee324efe0fa24c4622c':
Implement incremental data stall recovery in GSM DCT
47e326c8acaf7ebb51de96ceb567ef14d7ff7dcf 14-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Implement incremental data stall recovery in GSM DCT

Change-Id: Ibc43845c618fd1bf0b5a697568ba475e78e9d58e
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
32ebca5ba2ebd58a41a5b1ede1105db896bef060 15-May-2011 Wink Saville <wink@google.com> am 58779700: am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE

* commit '58779700df18d52edf1102c6fcb3731f28d37a94':
Telephony: Handle Icc Status Changed Event.
58779700df18d52edf1102c6fcb3731f28d37a94 15-May-2011 Wink Saville <wink@google.com> am 92cc1d20: Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE

* commit '92cc1d20ae0e3dc7e0618027967145e26c1cb6e2':
Telephony: Handle Icc Status Changed Event.
92cc1d20ae0e3dc7e0618027967145e26c1cb6e2 15-May-2011 Wink Saville <wink@google.com> Merge "Telephony: Handle Icc Status Changed Event." into honeycomb-LTE
859b72bb184c19b81bbf3660d28660489daf5ee9 15-May-2011 Robert Greenwalt <rgreenwalt@google.com> am a71a81b6: am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE

* commit 'a71a81b69a6e5757ff29f083783a4b704b6a9ae9':
Fix bevhavior of fetchDunApn.
a71a81b69a6e5757ff29f083783a4b704b6a9ae9 15-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 9713e3c6: Merge "Fix bevhavior of fetchDunApn." into honeycomb-LTE

* commit '9713e3c60def9d755ae828d389fced4793a3c86a':
Fix bevhavior of fetchDunApn.
3ce5de7fe2c2854f9a1d97d77fc6be98a029a04d 03-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Handle Icc Status Changed Event.

Change-Id: I8203d3b863ea9a27251823d3fed209673c45206c
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/gsm/SimCard.java
2b5a3ec757c0b6cbc3d321258bf24532c326d23b 14-May-2011 Robert Greenwalt <rgreenwalt@google.com> Fix bevhavior of fetchDunApn.

If nothing secure is set let us fall back to use general APN db entries.

Change-Id: Ic6908dd301c432c11a6f773e06dd6e207d45a037
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
5a84de6ee6f5de075ba8f90bc56eaa4ce0f4baea 13-May-2011 Wink Saville <wink@google.com> resolved conflicts for merge of 74af525e to master

Change-Id: I60a6d7ecd1809dd13b1ca791baff52d82d846f2d
74af525e400bb9da80082b1bd6beea3ea0e5a7de 13-May-2011 Wink Saville <wink@google.com> am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE

* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
Add getLteOnCdamMode.
5e9270bfd566c32a60dfeb34435a158eb4ceb9a9 12-May-2011 Wink Saville <wink@google.com> Add getLteOnCdamMode.

Change-Id: Iebf027f956d543d7a69cad64aaba47900937a785
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
1dd21d27512e1919d795694759cc379b715086cf 11-May-2011 Wink Saville <wink@google.com> am e86dbac5: am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE

* commit 'e86dbac583f442e37bfaa95f9427f491b62d53f3':
Refactor IccRecords and IccCard
afd28ac6ecec88065968fff66b8fc1a10e8f28ac 11-May-2011 Jake Hamby <jhamby@google.com> am ee60f3fb: resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

* commit 'ee60f3fb1b4e61ac8027293a658ba710e36d36b6':
Enable support for SMS national language shift tables.
e86dbac583f442e37bfaa95f9427f491b62d53f3 11-May-2011 Wink Saville <wink@google.com> am db08ff76: Merge "Refactor IccRecords and IccCard" into honeycomb-LTE

* commit 'db08ff768b144c6ad8b326300d95c0c60e40f2eb':
Refactor IccRecords and IccCard
db08ff768b144c6ad8b326300d95c0c60e40f2eb 11-May-2011 Wink Saville <wink@google.com> Merge "Refactor IccRecords and IccCard" into honeycomb-LTE
ee60f3fb1b4e61ac8027293a658ba710e36d36b6 11-May-2011 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp

Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
1f3278e111c8abadedf71a9bcdbbaffe154be738 10-May-2011 Wink Saville <wink@google.com> Refactor IccRecords and IccCard

IccRecords is now full base class for RuimRecords and SIMRecords
so we can use the IccRecords to represent both Ruim and SIM records
class.

Rename mSIMRecords to mIccRecords in PhoneBase.

Remove mRuimRecords.

Change-Id: If6afff3f99d41830c947de13c26586deff923c6f
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
37eca253af7fb158684a72234f1c4d73d0a03c57 10-May-2011 Wink Saville <wink@google.com> am d649887a: am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE

* commit 'd649887a43efb435f1ea2255c364d8c214552aef':
Fix issue on infinite retry config in RetryManager
c2e6a104aa1ce60076337e9cc412687d45f4ba06 10-May-2011 Wink Saville <wink@google.com> Add unset and setOnIccRefresh.

A temporary hack as some binaries are using these methods.

Bug: 4401309
Change-Id: I046f78f56c4a9300355e68488735da227991a773
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
d649887a43efb435f1ea2255c364d8c214552aef 10-May-2011 Wink Saville <wink@google.com> am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE

* commit 'eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc':
Fix issue on infinite retry config in RetryManager
d1736a3ddae04f5cbe4ebc0ba31e605b6bdae72c 10-May-2011 Wink Saville <wink@google.com> am d237bcb2: Merge "Add unset and setOnIccRefresh." into honeycomb-LTE

* commit 'd237bcb241b2be8b2f3f3baed87fce973de00fa7':
Add unset and setOnIccRefresh.
eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc 10-May-2011 Wink Saville <wink@google.com> Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE
987cd49966d0b52088f1650176cb413e4ef4a39e 10-May-2011 Wink Saville <wink@google.com> Add unset and setOnIccRefresh.

A temporary hack as some binaries are using these methods.

Change-Id: I4ee63df82acf167ab5f434e63bd073e84e1fdf71
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
28e77e616d8f005c8e07d6f28a83f8ca9772aedf 10-May-2011 Wink Saville <wink@google.com> am ba54feb0: am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE

* commit 'ba54feb094fdf0eb2201eae5751104a144a2a31d':
Telephony: Signal Strength Changes.
9dd0cb89771adbe50fe0cf079280c29964f0971a 10-May-2011 Robert Greenwalt <rgreenwalt@google.com> am b98b56c2: am a142512a: Broadcast SIM Refresh to all registered components

* commit 'b98b56c21faac16cea97e8cdcba485365f86c50f':
Broadcast SIM Refresh to all registered components
ba54feb094fdf0eb2201eae5751104a144a2a31d 10-May-2011 Wink Saville <wink@google.com> am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE

* commit '45364dc4bfe3e6118ad61f1d38489fe63418699a':
Telephony: Signal Strength Changes.
192122e7061803ea46417b79639c719e53fbf640 06-May-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix issue on infinite retry config in RetryManager

"infinite retry config is lost when "resetRetryCount" is called.

Change-Id: I2b737efa6092ad1254c8dc25840ec429f5c6e882
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RetryManager.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
b98b56c21faac16cea97e8cdcba485365f86c50f 10-May-2011 Robert Greenwalt <rgreenwalt@google.com> am a142512a: Broadcast SIM Refresh to all registered components

* commit 'a142512a5009d7b4c422d23b1d7bab8d219eb50b':
Broadcast SIM Refresh to all registered components
45364dc4bfe3e6118ad61f1d38489fe63418699a 10-May-2011 Wink Saville <wink@google.com> Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
a142512a5009d7b4c422d23b1d7bab8d219eb50b 10-May-2011 Robert Greenwalt <rgreenwalt@google.com> Broadcast SIM Refresh to all registered components

There could be multiple registrants like SIM, STK.
Port of 6228 from partner repo.

Change-Id: I0756d8b69e30058409e0279f65a99a1aa091e13d
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
5d7b9271b3f8a5f27c789a2b673e4bfd532b280c 09-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Signal Strength Changes.

Change-Id: Ia406d21d860533e699a90d15130edcbc705ec645
ndroid/telephony/SignalStrength.java
1127372a0470ae362d9d577c1244f00229071266 07-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 56e8e0bc: am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE

* commit '56e8e0bc8008d2bd60f04fc78ff036236a44f598':
Fix 2 functions getting connections up by apnType
56e8e0bc8008d2bd60f04fc78ff036236a44f598 07-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE

* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
Fix 2 functions getting connections up by apnType
2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe 07-May-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
06ce569b76d06a730eb228f99aeba62b28e27211 07-May-2011 Robert Greenwalt <rgreenwalt@google.com> Fix 2 functions getting connections up by apnType

A bad impl that only effected non-default connections on CDMA.
bug:4392820

Change-Id: If178dba90c4525289098fc88b80cf918e35f4d32
om/android/internal/telephony/DataConnectionTracker.java
103c5f9343e3de7d47717200632eaca327070254 07-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 04f2ad1c: am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE

* commit '04f2ad1ce1378e115940ecc7ab49ed3b929795dc':
Mark a disable apn so we don't reconnect.
04f2ad1ce1378e115940ecc7ab49ed3b929795dc 06-May-2011 Robert Greenwalt <rgreenwalt@google.com> am 2499da83: Merge "Mark a disable apn so we don\'t reconnect." into honeycomb-LTE

* commit '2499da83cb3db5f1d87a52e3e390139c98ff4210':
Mark a disable apn so we don't reconnect.
2499da83cb3db5f1d87a52e3e390139c98ff4210 06-May-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Mark a disable apn so we don't reconnect." into honeycomb-LTE
51a8610f9ad7100194d9afe196e5477215645966 06-May-2011 Robert Greenwalt <rgreenwalt@google.com> Mark a disable apn so we don't reconnect.

Strip out the pending-action stuff so things are more clear.
bug:4378382

Change-Id: I0e98559c88dccd50169c29d1e74421acb4246b78
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
06f20d3e0e56137b37505fb24de6b3545288cfd1 06-May-2011 Wink Saville <wink@google.com> am 3bebae43: am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE

* commit '3bebae4332144004db9f774bfde1abcd6c656b2c':
Add Delay for data connection retry.
49240336cffe84fd5a096916f36ce3458376c125 06-May-2011 Wink Saville <wink@google.com> am 0b45723f: am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE

* commit '0b45723f80ecb6038b15d791650d46f60f70f45f':
DataConnection: Fix handling of PDP setup failure.
3bebae4332144004db9f774bfde1abcd6c656b2c 06-May-2011 Wink Saville <wink@google.com> am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE

* commit 'd237d05c6f36d4e514eac95a9bcc07106c3d97eb':
Add Delay for data connection retry.
0b45723f80ecb6038b15d791650d46f60f70f45f 06-May-2011 Wink Saville <wink@google.com> am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE

* commit '8bc60413b9840c7fa724e52f1271936640e97736':
DataConnection: Fix handling of PDP setup failure.
d237d05c6f36d4e514eac95a9bcc07106c3d97eb 06-May-2011 Wink Saville <wink@google.com> Merge "Add Delay for data connection retry." into honeycomb-LTE
cf7db80a9a2f65c74780ad87fd6e33a0375a4a9b 05-May-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Add Delay for data connection retry.

Change-Id: Id2c6db09827f29198e38fb9ade4141fab9fa29fc
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a29e094a9882b725533fe4706114e49fc48b8520 26-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> DataConnection: Fix handling of PDP setup failure.

Change-Id: Ib73c5aad1f9f07ddca7e2e0b3dfba6ed40aa47ef
om/android/internal/telephony/DataConnection.java
18cc814c94edb188b73a92f0d34878d9dc054ff6 05-May-2011 Jake Hamby <jhamby@google.com> am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread

* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
Enable support for SMS national language shift tables.
600fc592e7668033913ba376a8a10486db0662c9 05-May-2011 Wink Saville <wink@google.com> am ece6eb56: am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE

* commit 'ece6eb5625ac8b597f60d67f30f431ea13f237a5':
Fix 4379712 NPE in GsmDataConnectionTracker
ece6eb5625ac8b597f60d67f30f431ea13f237a5 05-May-2011 Wink Saville <wink@google.com> am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE

* commit '676db0d301caf4fa64c2c1b8427fe2efd5cc7811':
Fix 4379712 NPE in GsmDataConnectionTracker
ed2989a9e16e7d3ff5b35afcef7f8d3a51059649 05-May-2011 Wink Saville <wink@google.com> Fix 4379712 NPE in GsmDataConnectionTracker

Releasing the apnContext too soon and move getting the dc and dcac
into the ok path.

Bug: 4379712
Change-Id: I0296b65ec5842b0219269a73d48ac39086c382fd
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
f45f13bd152ce2743b3da06b83e9d25abe8b0917 03-May-2011 Wink Saville <wink@google.com> am 3165f1a8: am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE

* commit '3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd':
Make DataConnection asynchronous.
3165f1a8eb707b36a6b2c66379c3fde85d9cc2fd 03-May-2011 Wink Saville <wink@google.com> am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTE

* commit 'd0d44c4e988ecdea86c2bb04e29d8f6d20c1c631':
Make DataConnection asynchronous.
d0d44c4e988ecdea86c2bb04e29d8f6d20c1c631 03-May-2011 Wink Saville <wink@google.com> Merge "Make DataConnection asynchronous." into honeycomb-LTE
0b80114a2d80c359a1b462c388247995ef653c00 03-May-2011 Wink Saville <wink@google.com> Make DataConnection asynchronous.

Change-Id: Ic0e01dded25ba1fdb3b2c6d0f95a1193f608a0e0
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionAc.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a8e0dfae06298b375637813a3263a62749dd0b82 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of db46fa25 to master

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
db46fa25be0a3e8040b118f688b69dd526aed86d 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE

* commit 'a47c40193fcbe9ca07facea78b2828afdae5e025':
Add RouteInfo objects for tracking routes.
a47c40193fcbe9ca07facea78b2828afdae5e025 02-May-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
c56e87e72147dbda9929b2e2363a7ded5608db1d 02-May-2011 Wink Saville <wink@google.com> am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState.

* commit '0fa7d106d4e34559c6e208f731c319cf681c0583':
Fix bug in RIL#getDataCallState.
0fa7d106d4e34559c6e208f731c319cf681c0583 02-May-2011 Wink Saville <wink@google.com> am aa44b52e: Fix bug in RIL#getDataCallState.

* commit 'aa44b52ee07eb4937d23bb3c2464007a2eb3f50f':
Fix bug in RIL#getDataCallState.
aa70f101e08098ed9cb190abe2d7f952561026b8 28-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Add RouteInfo objects for tracking routes.

Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
om/android/internal/telephony/DataCallState.java
981db85bf2a204f681c845f21332e5327f464a75 02-May-2011 Conley Owens <cco3@android.com> am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."

* commit '737b5c58c9094e5759bd4162f23f73be2b71faaf':
Fixing wrong Japanese phone formatter.
aa44b52ee07eb4937d23bb3c2464007a2eb3f50f 02-May-2011 Wink Saville <wink@google.com> Fix bug in RIL#getDataCallState.

Change-Id: I568e25d85888aa40b6a0b5e7f2d016e409f73ce1
om/android/internal/telephony/RIL.java
737b5c58c9094e5759bd4162f23f73be2b71faaf 30-Apr-2011 Conley Owens <cco3@android.com> am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."

* commit '520dd927cbe02ae52add1f90e282750582a9e95e':
Fixing wrong Japanese phone formatter.
3304f8fa8dbb301ffe8c0c51933f2ff08b18f324 30-Apr-2011 Wink Saville <wink@google.com> am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE

* commit 'dd177518b5438bf12a0ee5e1c99970cd48eb025f':
CDMALTE: Evaluate data network type in pollStateDone()
dd177518b5438bf12a0ee5e1c99970cd48eb025f 30-Apr-2011 Wink Saville <wink@google.com> am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE

* commit '6e748780ef01174235975508090f2e0af6c16d4d':
CDMALTE: Evaluate data network type in pollStateDone()
280a0c17d75ec6563d45233c25997bc3df542c35 30-Apr-2011 Conley Owens <cco3@android.com> am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."

* commit '889bb20f1bb47437331d404a59b86e6dfa4e2e93':
Removing unnecessary computation.
889bb20f1bb47437331d404a59b86e6dfa4e2e93 29-Apr-2011 Conley Owens <cco3@android.com> am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation."

* commit 'eef8f148881f39feb0b1aded121bbfc63e8d30c2':
Removing unnecessary computation.
f0055d5e3cfd7779a3ad3596149db1cdb2731ffd 01-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> CDMALTE: Evaluate data network type in pollStateDone()

During LTE to HRPD handover, CDMA data network type (1X, DO, RevA)
was not detected immediately as the checking was not done without
waiting for the LTE state. The patch will wait for pollStateDone
to determine new data network state.

Change-Id: I2d63d43df1f3124ba27f77897abef30f06be650d
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
9355a24af2a4985902f1e9ab4233df3fb831ef72 29-Apr-2011 Conley Owens <cco3@android.com> Merge "Fixing wrong Japanese phone formatter."
11d7ec24a55319b68bcc96443372c263a41b7dc5 28-Apr-2011 Conley Owens <cco3@android.com> Merge "Removing unnecessary computation."
9a51519dfc20d5ed1fb9e25270b8e46e0e3ab8db 28-Apr-2011 Wink Saville <wink@google.com> am 418e486a: am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

* commit '418e486a1cae97fccaa4da0128f255685d9a7e12':
Telephony: Data availability indication upon records loaded.
418e486a1cae97fccaa4da0128f255685d9a7e12 28-Apr-2011 Wink Saville <wink@google.com> am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

* commit 'a68a61dfe37969426c535d076a20181155493226':
Telephony: Data availability indication upon records loaded.
1dcb01e3860804ff229780a128771c5512dd13b7 28-Apr-2011 Wink Saville <wink@google.com> am f49a96aa: am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

* commit 'f49a96aa7683bba0536a68f2c043905c6c5f92fb':
Telephony: Corrections to signal strength values.
fd1803071ddc3b07504fc2b46a74d8e7778fa6db 28-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 5bc9d478: am 379cbb1d: Send STK Service Running RIL Request after sim module is ready

* commit '5bc9d478517739bdcd79951e865f26481b79ddfc':
Send STK Service Running RIL Request after sim module is ready
f49a96aa7683bba0536a68f2c043905c6c5f92fb 28-Apr-2011 Wink Saville <wink@google.com> am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE

* commit '05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
Telephony: Corrections to signal strength values.
5bc9d478517739bdcd79951e865f26481b79ddfc 28-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> am 379cbb1d: Send STK Service Running RIL Request after sim module is ready

* commit '379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d':
Send STK Service Running RIL Request after sim module is ready
a68a61dfe37969426c535d076a20181155493226 28-Apr-2011 Wink Saville <wink@google.com> Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
05fcd239abcdfe0c39e1d1d1f462478bf1e68e04 28-Apr-2011 Wink Saville <wink@google.com> Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
11cee41f3e2b0082a9b569fd8862a3d019b22104 28-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Corrections to signal strength values.

RSRP is already -ve.

Change-Id: Ieff689a98088ad6aad9cfc6516169c92bbb0015d
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
662b016d6ef0cc95c057e573c26bf9eeae59470b 28-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Data availability indication upon records loaded.

This will make sure if records loaded comes after radio availability we dont miss sending
out dataAvailability.

Change-Id: Ibbecaa89f28e1441e799bf1681d0b4692cf0f13a
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d 27-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Send STK Service Running RIL Request after sim module is ready

Currently "STK Service Running" is sent as soon as phone app is
started. And depending on the timing of vendor RIL initialization
the event may not be handled. This patch waits for SIM_READY,
RUIM_READY or NV_READY indicating vendor's SIM (equivalent) module
become ready to process the event.

Change-Id: I4182a5413201f11856989664c8f19ae1eca48e2f
om/android/internal/telephony/cat/CatService.java
cb95894bc7ed2f5f4fc541be62631e5456f442d3 28-Apr-2011 Wink Saville <wink@google.com> am 7848b71b: am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

* commit '7848b71b4ff0d50030b528db931d5460b2a3e9e8':
GsmDCT: Reset DataConnection upon APN disable.
a81490c0ca4e254e15bbb9ed29af05f9e617e579 28-Apr-2011 Wink Saville <wink@google.com> am e4c7f3ba: am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

* commit 'e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae':
Remove subclass cast for calls to isDnsCheckDisabled.
d4e264e2fae4a5de981eebd858895edbdff6525a 28-Apr-2011 Wink Saville <wink@google.com> am 69e830dc: am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE

* commit '69e830dc31a4f6fc19d8392efede114afd20fe7b':
Delay data reconnection after disconnected.
7848b71b4ff0d50030b528db931d5460b2a3e9e8 28-Apr-2011 Wink Saville <wink@google.com> am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE

* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
GsmDCT: Reset DataConnection upon APN disable.
e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae 28-Apr-2011 Wink Saville <wink@google.com> am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE

* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
Remove subclass cast for calls to isDnsCheckDisabled.
69e830dc31a4f6fc19d8392efede114afd20fe7b 28-Apr-2011 Wink Saville <wink@google.com> am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE

* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
Delay data reconnection after disconnected.
7353301f73bfd0fd54ca515f3385946abe56d620 28-Apr-2011 Wink Saville <wink@google.com> Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
1a517d0c251d2ca577500ec6c0e434725c3ddd21 28-Apr-2011 Wink Saville <wink@google.com> Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
38d284d3235a003e1d330892a1fbde805b2f6669 27-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Remove subclass cast for calls to isDnsCheckDisabled.

Change-Id: Ic9121db810b295d9f614046932badf04f07a42db
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnection.java
315f107109cb30205f96dc6095753aa3d33f283f 25-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> GsmDCT: Reset DataConnection upon APN disable.

Change-Id: I36a715830604d0fe34f1ab5c8b1bf56eb5777e0f
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
5ccc801a97070322ec2895b2670a945da8bdd9ef 25-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Delay data reconnection after disconnected.

Change-Id: Iede631b5e92a48883ef87c66dd79490e92ec196a
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a2b0c87872c2c747439aea24a406d6a0a595db00 27-Apr-2011 Conley Owens <cco3@android.com> am ca15bf7a: am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit 'ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26 27-Apr-2011 Conley Owens <cco3@android.com> am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit '54a952c84317afc64034ded8baad3d788a54026d':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5 27-Apr-2011 Conley Owens <cco3@android.com> am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit '17ba30b549a847f3aab854173a9484851f694453':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)
bfc57acdb8789a97300fee3daecb31072d90bd44 26-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> am 9d5ac7bd: am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."

* commit '9d5ac7bd8ac92ac8fda2e1ac500438ffe6e3aa0f':
Telephony: Fix merge issue "Set enabled state before notification is sent out."
9d5ac7bd8ac92ac8fda2e1ac500438ffe6e3aa0f 26-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."

* commit 'dcbba67afc08d0ac9af53e95d5997af11f869853':
Telephony: Fix merge issue "Set enabled state before notification is sent out."
dcbba67afc08d0ac9af53e95d5997af11f869853 25-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Fix merge issue "Set enabled state before notification is sent out."

The original change-id was I6e84920b8d082fd6da838bccb5333051362bc4bc

Change-Id: I758641f8b29346a868e1b6b454ccd3f2341dffb8
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
c199ff6466567827f29a6db87c595adac87a9552 20-Apr-2011 Wink Saville <wink@google.com> am a4017f8d: am afa79585: Remove getCurrentDataConnectionList.

* commit 'a4017f8d1b0ac04873c5b0389d5a0cabe744a3f0':
Remove getCurrentDataConnectionList.
a4017f8d1b0ac04873c5b0389d5a0cabe744a3f0 20-Apr-2011 Wink Saville <wink@google.com> am afa79585: Remove getCurrentDataConnectionList.

* commit 'afa79585e0e517d9fdfe6065bc5084cab9bb2300':
Remove getCurrentDataConnectionList.
afa79585e0e517d9fdfe6065bc5084cab9bb2300 19-Apr-2011 Wink Saville <wink@google.com> Remove getCurrentDataConnectionList.

This should not be exposed externally and is used only by
RadioInfo.java a hidden application used for debugging.
I'll another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.

Change-Id: Ic21cc8d45bd3172c2ceeab154eca6118d94580e9
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
343c1ad7200619230a55caa6aa8a9d041e62b29d 19-Apr-2011 Wink Saville <wink@google.com> am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

* commit '37677849998e6c9a39afe0a730b2f0131a371f3b':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
37677849998e6c9a39afe0a730b2f0131a371f3b 19-Apr-2011 Wink Saville <wink@google.com> am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
64c42cae4482fe0157e977b8ddd0f2c2436b3f31 18-Apr-2011 Wink Saville <wink@google.com> Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/cat/RilMessageDecoder.java
94319f62da296e5ca5a0b3fb9412cbd576150a9d 18-Apr-2011 Wink Saville <wink@google.com> am 9a2c9390: am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE

* commit '9a2c93905a2a65db7135f48ca5653d3cf614faed':
Data connection attempts/retries for multiple APNs
9a2c93905a2a65db7135f48ca5653d3cf614faed 18-Apr-2011 Wink Saville <wink@google.com> am 6f200f73: Merge "Data connection attempts/retries for multiple APNs" into honeycomb-LTE

* commit '6f200f738ed0bbdef5c433b5f571fcb591e1760c':
Data connection attempts/retries for multiple APNs
6bb582a00c1d0be2d76a49d3854564a315554c6b 18-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Data connection attempts/retries for multiple APNs

Fixing issues found in IOT. GsmDCT was only attempting to connect
default APNs. This patch will try to attempt to connect/reconnect
all APNs as long as they are ready and in right state.

Change-Id: I6e872936330654dcb25198c800728cb4d033e731
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
d20d9652fbdea2d54fb82ea2e763b51673a61002 16-Apr-2011 Wink Saville <wink@google.com> am 5f7edb2c: am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE

* commit '5f7edb2c53b2432ea3426c563d9743338ba1d064':
Telephony: GDCT - Set enabled state before notification is sent out.
982db1c3a57ea49d6dba900a780321b5246c8586 16-Apr-2011 Wink Saville <wink@google.com> am d86e06f7: am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

* commit 'd86e06f7db0705b5fa64f23dcecf305133d2acc7':
Telephony: Set Radio turned off reason when powered off.
e7683c5f78508ab36374d749c2e487d35cfa4f10 16-Apr-2011 Wink Saville <wink@google.com> am fa65533e: am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE

* commit 'fa65533ef11e794b21580e5583a74d2d8ffb7047':
Clean up calls immediately if cid become inactive in unsol data state changed
5f7edb2c53b2432ea3426c563d9743338ba1d064 16-Apr-2011 Wink Saville <wink@google.com> am a9378485: Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE

* commit 'a9378485cb8d0968a9a177f730875e0f1d49d689':
Telephony: GDCT - Set enabled state before notification is sent out.
c7d9f1e673e222b6fb10643d6e5a2ce432267397 16-Apr-2011 Wink Saville <wink@google.com> am 6708e008: am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

* commit '6708e008ef29b5221960d3b42ca8fcc192108192':
handle missing constants when creating a Phone instance
517cab6c8d06cb7fcb90952d300231f190188afa 16-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> am dff90b7d: am a5c9c724: Data Availability Indication changes.

* commit 'dff90b7d161bd7d11d931a43aad79d87e7f4dfc1':
Data Availability Indication changes.
d86e06f7db0705b5fa64f23dcecf305133d2acc7 16-Apr-2011 Wink Saville <wink@google.com> am df43e321: Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE

* commit 'df43e321778a02f9eaeb8faacf4ae7917c434106':
Telephony: Set Radio turned off reason when powered off.
fa65533ef11e794b21580e5583a74d2d8ffb7047 16-Apr-2011 Wink Saville <wink@google.com> am dc26a0c8: Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE

* commit 'dc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4':
Clean up calls immediately if cid become inactive in unsol data state changed
a9378485cb8d0968a9a177f730875e0f1d49d689 16-Apr-2011 Wink Saville <wink@google.com> Merge "Telephony: GDCT - Set enabled state before notification is sent out." into honeycomb-LTE
6708e008ef29b5221960d3b42ca8fcc192108192 16-Apr-2011 Wink Saville <wink@google.com> am 585b7acb: Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE

* commit '585b7acb16183ae31e71912dc2bfceea421be157':
handle missing constants when creating a Phone instance
dff90b7d161bd7d11d931a43aad79d87e7f4dfc1 16-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> am a5c9c724: Data Availability Indication changes.

* commit 'a5c9c7246b065710227395ec4a7c1df0168363ef':
Data Availability Indication changes.
df43e321778a02f9eaeb8faacf4ae7917c434106 16-Apr-2011 Wink Saville <wink@google.com> Merge "Telephony: Set Radio turned off reason when powered off." into honeycomb-LTE
dc26a0c8d4ce4edcddcfc6b8e810ae5f8e73cda4 16-Apr-2011 Wink Saville <wink@google.com> Merge "Clean up calls immediately if cid become inactive in unsol data state changed" into honeycomb-LTE
585b7acb16183ae31e71912dc2bfceea421be157 16-Apr-2011 Wink Saville <wink@google.com> Merge "handle missing constants when creating a Phone instance" into honeycomb-LTE
1aac25187ff3dca0856177559ff15c670208e775 16-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: GDCT - Set enabled state before notification is sent out.

Change-Id: I6e84920b8d082fd6da838bccb5333051362bc4bc
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
96a5f00abe95acfe39fad363c24528ca0fab82ba 12-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> handle missing constants when creating a Phone instance

Change-Id: I6089881830842cbaa5bf6d757c6f723c62c5878d
om/android/internal/telephony/PhoneFactory.java
157f9a0449228f8e3fe5d285c9746875aeff1581 12-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Set Radio turned off reason when powered off.

Change-Id: Ie538c888d09b189b30c24fa0fd637265ccce954f
om/android/internal/telephony/ServiceStateTracker.java
a43db7f48dd27e80d2eb54b58f1c7099cfa414be 13-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Clean up calls immediately if cid become inactive in unsol data state changed

Do not perform extra data call list query. Just trust the message sent up
from RIL.

Change-Id: Ic03f5cc13ef05fe1de8fb5826fa37a68708e8e18
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
19e4be42616c7a337229a9a17dc982374dec8980 16-Apr-2011 Wink Saville <wink@google.com> am 9bd1368b: am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE

* commit '9bd1368bb431d701604a48b226ee362fc7838c6a':
Cleanup/add log statements.
9bd1368bb431d701604a48b226ee362fc7838c6a 16-Apr-2011 Wink Saville <wink@google.com> am 6ed4798c: Merge "Cleanup/add log statements." into honeycomb-LTE

* commit '6ed4798c70bf4ba253a8cdd37bf48008af81da7d':
Cleanup/add log statements.
a5c9c7246b065710227395ec4a7c1df0168363ef 11-Apr-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Data Availability Indication changes.

Change-Id: I92bcff10763658cadd4ac1ea98745212c765ecfe
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6ed4798c70bf4ba253a8cdd37bf48008af81da7d 16-Apr-2011 Wink Saville <wink@google.com> Merge "Cleanup/add log statements." into honeycomb-LTE
5ae172b97e3dd9ae670f41753f8cf96b401d5dca 16-Apr-2011 Wink Saville <wink@google.com> am 93a3f72a: am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE

* commit '93a3f72aa0475e08bbe7de8d512f7149428aaf2d':
Change RIL initialization.
93a3f72aa0475e08bbe7de8d512f7149428aaf2d 16-Apr-2011 Wink Saville <wink@google.com> am cb0c5f16: Merge "Change RIL initialization." into honeycomb-LTE

* commit 'cb0c5f16e9131e73cda38ce18c00a31b1d5be2c3':
Change RIL initialization.
56b4965f5b429fdd01831c2652f37047c04fcf3e 15-Apr-2011 Wink Saville <wink@google.com> Cleanup/add log statements.

Change-Id: Ia9e1dfab0dd6eb0ac08e6ce2f3d414d358652d80
om/android/internal/telephony/RIL.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
66958c73674673274bf08266b60ad3c1791c9179 15-Apr-2011 Wink Saville <wink@google.com> Change RIL initialization.

- When creating RIL use lte_on_cdma property to set initial
cdma subscription source. Later we will use
RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED and or some other
dynamic method.

- Instead of using mInitialRadioStateChange use UNSOL_RIL_CONNECTED
to initialize ril to a known state.

- Rename RIL_UNSOL_CDMA_SUBSCRIPTION_CHANGED to it "proper" name.
RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED.

bug: 4287155
Change-Id: I477ece19dbe381171e0f468184821d6a6d6877b9
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
26b05f7dc35f47bc62bf9630df288ae2d6e4657e 13-Apr-2011 Wink Saville <wink@google.com> am 05be003f: am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit '05be003f7f3dd758c44c2cdb3e7aa638d8daa446':
Fix occasional phone app crash
05be003f7f3dd758c44c2cdb3e7aa638d8daa446 13-Apr-2011 Wink Saville <wink@google.com> am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE

* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
Fix occasional phone app crash
921c9d242587d32f0a264522d67c61de9594d25e 01-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Fix occasional phone app crash

bug #4263503

if GsmDCT is just initialized and LTE/GPRS attach happens
before SIM is completely loaded, phone app would crash
as there is no DataConnection associated with ApnContext.

Change-Id: Ie8007c718c3f68a7b3e42154e60e5b25631ec3c8
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
2037b5a8b206cfdc6748ad777ad1e275053d2163 12-Apr-2011 Masanori Ogino <ogino.masanori@sharp.co.jp> Load mnc/mcc configuration value from SIM (KDDI-CDMA)

Now support to load mnc/mcc value from IMSI on KDDI-CDMA.

Change-Id: I6f1d137ecf2e3130ca8f1a782dccec13b51f9933
om/android/internal/telephony/cdma/RuimRecords.java
a58ee55f490953247882298d56003cbf94285344 09-Apr-2011 Wink Saville <wink@google.com> am 6e797566: am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE

* commit '6e797566650c10ba8655aea914d521f5999073e8':
Cleanup all functions overridden from DCT in GDCT
6e797566650c10ba8655aea914d521f5999073e8 09-Apr-2011 Wink Saville <wink@google.com> am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE

* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
Cleanup all functions overridden from DCT in GDCT
442b08bc7c934f601a111bf97ea96842d69cdc23 09-Apr-2011 Wink Saville <wink@google.com> Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
862da792c07839a566c77407895708748ef4e17e 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Cleanup all functions overridden from DCT in GDCT

Also removed use of iterator.

Change-Id: I58e505d641cc2b84b6522a6793665c2a3c839580
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6cab9a6e3fc660ca9c2b32e01f86c71da222c181 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am da2790fa: am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE

* commit 'da2790fa0adc187440c35261256c9989ca1b6ed8':
Make ApnSettings threadsafe.
da2790fa0adc187440c35261256c9989ca1b6ed8 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE

* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.
658779f5d81031dc2c34ef6bc374fad394d01465 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Make ApnSettings threadsafe." into honeycomb-LTE
561538879bdec19cb0cd2306f1ecacff3ea7a199 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Make ApnSettings threadsafe.

Also fixes getActiveApnString.

Change-Id: I2278b30505cc8a6be484341cba12d14f7b6316e8
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
2270d05698c161bb10f7a63c2c4d246c95448fb0 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
Fix getActiveApnTypes for GsmDCT.
9e1e1360d3f8910e9f0c7d6f16ea0e4f12bcf8cc 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE

* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
Fix notification of disconnected networks.
ede9ed9f704979a373b6b8676373611409cff92f 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
Fix getActiveApnTypes for GsmDCT.
de78352c6c048e009fbeefb40a2b06a8573f7b7e 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE

* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
Fix notification of disconnected networks.
1eeeae59d07ccc6b7db865b942d3e0b9394b1a59 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
ac9c73ae619aee63f49cf1f845ef5588bd46dce8 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix notification of disconnected networks." into honeycomb-LTE
1b6c758c29c68f19767f31e637077df79ab24151 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Fix getActiveApnTypes for GsmDCT.

Change-Id: I42e71f0cbe31289f16623de38141213f547aa13f
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6b01e4cdf8b9d9bfebdf58c34091d2c670a4e7d9 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Fix notification of disconnected networks.

Reorder - set state and then report the state, else we always report disconnecting which
is interpreted as still connected.

Change-Id: I95f5fe9ccee0d7ee9a03f78ae5b614af2ba0860b
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
d5226cff8d4f7e323c73c287f3eb5e01cc7e5790 09-Apr-2011 Wink Saville <wink@google.com> am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

* commit '4a28096dec16666d9425cb8e23641985f963a4f3':
Check different CellLocation type in GsmDataConnectionTracker
f034932be64c9387022bf0711397695d70fa2f97 09-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.

* commit '01f8f290cd2c01c7ed9a1966f39fa74032352dc8':
Rename PhoneBase's DataConnectionTracker member.
de56db46c4d2cacc8a0bc4d9839507e3d333ca9e 08-Apr-2011 Wink Saville <wink@google.com> resolved conflicts for merge of 4b1a37d7 to master

Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188
4a28096dec16666d9425cb8e23641985f963a4f3 08-Apr-2011 Wink Saville <wink@google.com> am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
Check different CellLocation type in GsmDataConnectionTracker
73ad388aae28213dd3f47bcac1b52c671e3cacc7 08-Apr-2011 Wink Saville <wink@google.com> Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
01f8f290cd2c01c7ed9a1966f39fa74032352dc8 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.

* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
Rename PhoneBase's DataConnectionTracker member.
63edf6c4f5795009e55f2ae9556550c38daa9774 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Rename PhoneBase's DataConnectionTracker member.

Was called mDataConnection, but this is more confusing now that we have multiple
DataConnections. Changed it to the more correct mDataConnectionTracker.

Change-Id: I3cdc4f2897d60e5b0885891744aa6ff2db27af37
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
8968f9f6d47585daf0f81db3ba7f54b1d7ae3498 02-Apr-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Check different CellLocation type in GsmDataConnectionTracker

Addressing phone app crash in GsmDataConnectionTracker when CDMALTEPhone
is used. CDMALTEPhone uses CDMA SST so getCellLocation() was returning
an instance of CdmaCellLocation. This was causing a crash when GsmDCT
type casts the instance as GsmCellLocation.

This patch tries to check the instance type before retrieving corresponding
cell id.

Change-Id: I6ac9cd4dc078552dc58d4d9350494a7b608c2b98
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
4b1a37d7255dcc1a5fb22d08c5167d565636be39 08-Apr-2011 Wink Saville <wink@google.com> am 5203a5bc: Cleanup debugging.

* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
Cleanup debugging.
5203a5bc28a5ae432eab236780b2f97bdec71dbf 08-Apr-2011 Wink Saville <wink@google.com> Cleanup debugging.

Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
5008e92d1fd573d926cd55c39ca723a6fbdf7c4b 08-Apr-2011 Wink Saville <wink@google.com> am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
DataConnection: set CID to the correct value.
b93811091d8e412d1247ee1f4506b7db1439235d 08-Apr-2011 Wink Saville <wink@google.com> am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

* commit '1905e166ed40ee11e80476848ef40e817512f740':
DataConnection: set CID to the correct value.
1905e166ed40ee11e80476848ef40e817512f740 08-Apr-2011 Wink Saville <wink@google.com> Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
c9fb9888ce3f15e7776fd113449a5e82965baed6 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

* commit '2ce73e77c99effb9521db15c882529ccbafd57a6':
Fix isApnTypeActive in GDCT.
2ce73e77c99effb9521db15c882529ccbafd57a6 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
Fix isApnTypeActive in GDCT.
9c7f433c80fd2014562f8d161e6a34710fe475d6 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
2915875fb635f9c17441e181481938255aa4cfc6 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.

* commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727':
Fix ISO country code of Slovenia.
37c75ae06be67c85c5d8ffe9371f5b41fdaac310 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> DataConnection: set CID to the correct value.

import of partner change 5930

Change-Id: Iaa2d282f6f9292a57dfceedad676c9e3ad64f903
om/android/internal/telephony/DataConnection.java
e3e535a9c6b35971b54becc912e45da0f8b3f727 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> am 4410660e: Fix ISO country code of Slovenia.

* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
Fix ISO country code of Slovenia.
4410660e02c04b29d323c6d3bf81633fd07b6411 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Fix ISO country code of Slovenia.

Misread an IBM site and thought it was sl-sl, but really it is sl-si.

fixes public bug 16021

Change-Id: I5b262a2b424fe2a0904f623f82449a539ede0fdb
om/android/internal/telephony/MccTable.java
7a093b2c35d020fa46d2d2e20ddc6b3ff2c2bc30 08-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Fix isApnTypeActive in GDCT.

The single active APN makes no sense now. Add override function to
do the right thing.

Also makes ApnContext threadsafe.

Change-Id: I4302595e8818b7d31bdd32b5fdf4e3de1cd81ed8
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
43a17654cf4bfe7f1ec22bd8b7b32daccdf27c09 07-Apr-2011 Joe Onorato <joeo@google.com> Remove the deprecated things from Config.java. These haven't been working since before 1.0.

Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/gsm/GsmConnection.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SmsMessage.java
5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b 08-Apr-2011 Wink Saville <wink@google.com> am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

* commit '7183a7a584397142ab7347d6f721011d743fb699':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
1dd2ada5cf7d0c95afb4731d082473f34ee7f433 07-Apr-2011 Wink Saville <wink@google.com> Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.

Added CommandsInterface.registerForRilConnected which allows components
to register for when the ril connects and provides the version of the
ril to the registrants or a -1 if the ril disconnects.

For ril version 6 RIL.setupDataCall needs to have RadioTechnology + 2
as the radioTechnology parameter when the rilVersion is >= 6.

DataConnection then uses registersForRilConnected to get the ril
version and provide the proper radioTechnology value to
RIL.setupDataCall

Change-Id: Iacba764b9e38a4a138d186ccf1625fea760cc56d
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnection.java
f4a29403ae5b6d3e8e754a025d33f0c33adecb21 07-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
70c3d1c23b5d4398cc561ec9ddbe868b3182cc74 07-Apr-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add external dependency API." into honeycomb-LTE
91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e 07-Apr-2011 John Wang <johnwang@google.com> am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
Refactor onSetupConnectionCompleted.
574d3c4b2cb120314b68bffa34aed2545d1b1158 07-Apr-2011 John Wang <johnwang@google.com> Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
d3ba7d5bec8243d56cc7af43aea284f6a623e6f8 04-Apr-2011 John Wang <johnwang@google.com> Refactor onSetupConnectionCompleted.

Refactor the part of setting linkProperties based
on data call responses.

Bug:3501569
Change-Id: I02bf0558e2f8a5924197b8c06f19673279dec815
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/DataConnection.java
d55a6b498d66d8fc415908ecf63e50f46cce67e8 25-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Add external dependency API.

An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
004da7e2e0287cdad63a9009841309d45f038787 07-Apr-2011 Wink Saville <wink@google.com> am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
Add getCdmaSubscriptionSource to CommandsInterface.
d31fdf05659bcd87fb8b989931f540f5e739fb22 07-Apr-2011 Wink Saville <wink@google.com> Add getCdmaSubscriptionSource to CommandsInterface.

This was accidentally not added previously and it had an
extra parameter.

Change-Id: Ic48ab9e637a5343b63d3e03377acd2679b0f77e0
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
b49a73dfc4c9817bba1f227e9330555acdf9b56f 16-Mar-2011 Jake Hamby <jhamby@google.com> Enable support for SMS national language shift tables.

Add support for encoding and decoding SMS 7 bit user data using the
national language shift tables defined in 3GPP TS 23.038 (GSM/UMTS only),
including the new tables added in Release 9 for Indic languages.

Decoding is always supported, but encoding is only enabled for the
specific language tables added to the new integer array resources
"config_sms_enabled_single_shift_tables" and
"config_sms_enabled_locking_shift_tables" defined in
frameworks/base/core/res/res/values/config.xml. The default empty arrays
should be overridden in an OEM overlay for the specific nationalities where
SMS national language shift table encoding is allowed/mandated (e.g. Turkey).
GsmAlphabet.countGsmSeptets() will try to find the most efficient encoding
among all combinations of enabled locking shift and single shift tables.
If no 7 bit encoding is possible, 16 bit UCS-2 encoding will be used.

This change also fixes a bug in the decoder: when an escape septet
is followed by a septet with no entry in the extension (single shift)
table, TS 23.038 Table 6.2.1.1 states that the MS shall display
the character in the main GSM 7 bit default alphabet table, or the
active national language locking shift table. Previously, we were
decoding this sequence as a space character. Two consecutive escape
septets will continue to decode as a space character, according to
Note 1 of table 6.2.1.1.

Change-Id: I4dab3f0ffe39f3df2064ed93c9c05f26e274d18b
ndroid/telephony/SmsMessage.java
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/SmsHeader.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SmsMessage.java
om/android/internal/telephony/gsm/stk/ResponseData.java
22cfcaee24829e52c636ca2f5df0285569c6e7c1 02-Apr-2011 Wink Saville <wink@google.com> am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE

* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
Data Retry fix after failure due to permanent causes.
44ff718f62ccaffb3ea7fbeb6c2e2c74f3d9b063 01-Apr-2011 Wink Saville <wink@google.com> Data Retry fix after failure due to permanent causes.

Change-Id: I86d5a2dc9394dac93c4350159f4d99cf19aedec9
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
7c6f532ae9b90734edcfe68f8dee078ea8c4b8a5 01-Apr-2011 Wink Saville <wink@google.com> am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE

* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
Airplane mode on always timed out when camping on LTE
4aff3e363cae550a95c8082ec153bc739fe97db4 01-Apr-2011 Wink Saville <wink@google.com> am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.

* commit '0198fff90430d9f974b0284fc3659434406c751b':
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
dacb80901dfbd7cc18a6f1ede6ca334ed42c038f 01-Apr-2011 Wink Saville <wink@google.com> Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
95bc2b7564b201d10f2a5e319f69972e18c58261 01-Apr-2011 Wink Saville <wink@google.com> Airplane mode on always timed out when camping on LTE

While on LTE, GsmDataConnectionTracker is implicitly associated with CdmaServiceTracker.
CdmaServiceTracker asynchronously waits for the disconnection of data before turning off
the Radio but GsmDataConnection does not notify the disconnection due to different logic
in GsmServiceTracker.

This fix is to have common airplane mode toggle logic on both GSM and CDMA flavors.

Change-Id: I67ff82a59a2243856ae3e7c5e37b5726bcbf3c94
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
0198fff90430d9f974b0284fc3659434406c751b 01-Apr-2011 Wink Saville <wink@google.com> Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.

This allows the system property to be updated at runtime and
for testing.

Change-Id: I75788e5fa70efdbb9186b9f03baac1d9e6b3febd
om/android/internal/telephony/TelephonyProperties.java
2a936154f607d9454864045bd798ff22618de41a 01-Apr-2011 Wink Saville <wink@google.com> am b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE

* commit 'b90f9c370e5b1b1825016e48b864e8eda6d5f89c':
Telephony: Add Powerdown Cause to PDP Deactivate Message.
b90f9c370e5b1b1825016e48b864e8eda6d5f89c 01-Apr-2011 Wink Saville <wink@google.com> Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
261306889e75ecc2b2fcac1165cfc39f03610979 01-Apr-2011 Wink Saville <wink@google.com> Telephony: Add Powerdown Cause to PDP Deactivate Message.

Modem needs to know if PDP deactivation is due to UE power down so that it can do detach.

Change-Id: Ie63f90f005845fcd6bfab421f193058b6e2e78d5
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
cac1411e9966b155a099f24720104a84de7aa50b 31-Mar-2011 Wink Saville <wink@google.com> am 11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE

* commit '11feacb348e624bcdbb073a32c1fc1d8bdc7bae3':
Telephony: Cleanup of SIM handling in CdmaLteSST.
11feacb348e624bcdbb073a32c1fc1d8bdc7bae3 31-Mar-2011 Wink Saville <wink@google.com> Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
72ec108b0c1f6aa8615974c3dbb63cc02d1b1391 31-Mar-2011 Wink Saville <wink@google.com> am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE

* commit 'b136aa6c9a1c043ff91357cea9e0b6597c904507':
Telephony: Update LTE RILConstants to match ril.h
e80d327676e929d9b1dcf21d0d3c4f1d2be31483 29-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Cleanup of SIM handling in CdmaLteSST.

Change-Id: I41ae595bae035b2dfd2e32e4d54a754c27962567
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
afaf4c8fa9d8be822e8a871fd9493f59e9bf9db8 28-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Update LTE RILConstants to match ril.h

Change-Id: I3abc88a98f3ce152df1d8de27da1132c05ee136f
om/android/internal/telephony/RILConstants.java
8a395624042ed06732703c4e272ad416a45ecf10 30-Mar-2011 Wink Saville <wink@google.com> am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE

* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
Cleanup DataConnectionTracker
fc151b6eb4a682510f3591879037b524bc8d59d0 29-Mar-2011 Wink Saville <wink@google.com> Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
fae5e2894ff3c09f27efac2a7ee6b9cfd4ed14b0 29-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."

* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
Making it possible to call SIP calls with special allowed chars.
3bbe33d703cc42ed4d0ee4015510219c6f5e6964 28-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> DataConnectionTracker cleanup when disposed.

Change-Id: I4db442ae110531f33280ceb626fc260d392a1bd5
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
09e4eea1355ff4eb2c1ff722ffe041b963f04b99 27-Mar-2011 Wink Saville <wink@google.com> Cleanup DataConnectionTracker

Promote apn members from GsmDCT to DCT.
Change getState to have a apnType parameter
Move abstract methods to they are together.


Change-Id: I19bc5d07859c9398076ae32647d8c211d19817d1
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e 27-Mar-2011 Wink Saville <wink@google.com> Merge "Work around for operator not being correct." into honeycomb-LTE
3420f85cc65af8e3ec6c651667c8cffbac60ba4e 27-Mar-2011 Wink Saville <wink@google.com> Merge "Add some debug to apn list creation routines." into honeycomb-LTE
2a3aa2a32ea63b65805adb32dd5cadaa6c6d056a 26-Mar-2011 Wink Saville <wink@google.com> Work around for operator not being correct.

This is a STOPSHIP work-around until we figure out why
getSIMOperatorNumeric is not returning valid values.
It has returned NULL, "00000", "310004", "311480" and
once a value "83????", I don't remember the exact value.

Change-Id: I4f1d16c853047b72dd987572d3d67dcc2cd697a2
om/android/internal/telephony/gsm/SIMRecords.java
fbe284b6756b44819e9f4d13938bad06b238d112 24-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Telephony: Fix eHRPD Service State Mapping.

Change-Id: I415c11dc0e1817f7772160c1103105d6007ffdff
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
c6c7ebd92cbdb1b3cc67eb5d9bc6fec264850c74 26-Mar-2011 Wink Saville <wink@google.com> Add some debug to apn list creation routines.

Change-Id: Ic5055daefd50b6371f129d82313c533a04cd75b1
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6b68779ab31f410acb3036eafba73d0781db4d91 23-Mar-2011 Wink Saville <wink@google.com> Fix NPE in CatService.encodeOptionalTags.

If cmdDet.typeOfCommand is bad fromInt returns null we now log the
error instead of causing a Null Pointer Exception.

Change-Id: Id6a0d295d988c2bdbd46a0c0dd6b20f5baf02b27
om/android/internal/telephony/cat/CatService.java
6f67e7bf831147257e078dd72a22f2e43e009122 23-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."

* commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
Making it possible to call SIP calls with special allowed chars.
a97f49c02b68d94119f5171472bbadbbad26ba14 23-Mar-2011 Wink Saville <wink@google.com> Merge "Tweak RIL.java debug." into honeycomb-LTE
5d612f160180f6c1f59e6cece41c7c3b97b19bf1 22-Mar-2011 Wink Saville <wink@google.com> Merge "Remove unused onResetDone." into honeycomb-LTE
8b84377f7dd0678f07c1056575d9f2bbf392adbd 17-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Remove unused onResetDone.

Refactor things a bit. Promoting GsmDataConnection's apn (ApnSetting) to DataConnection.
Use DataConnection's resetSynchronously rather than tampering with it from another thread.

bug:3486066

Change-Id: I2a7f7368f73c7d5c81e821976efafd56aca7aa69
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
1d1a373f5c7637de545ad815ad21aa325aaa970f 20-Mar-2011 Wink Saville <wink@google.com> Tweak RIL.java debug.

Changed the one use of DBG to RILJ_LOGD and make
RILJ_LOGV a STOPSHIP if true. I then use that to
output IMSI, IMEI and IMEISV to assist in initial
bring up of RIL's.

Change-Id: Ieb9d1120f76c89c130cbecb2992603fc6af71b96
om/android/internal/telephony/RIL.java
b5c72ead014a509c0f84884d1f2dac1ff9deec8e 22-Mar-2011 Magnus Strandberg <magnus.strandberg@sonyericsson.com> Making it possible to call SIP calls with special allowed chars.

Since String.replaceFirst uses regex and since SIP user names are
allowed to include regex charaters such as '+', the code must
fist convert the string to a literal pattern String before using
replaceFirst method.

Change-Id: I25eac852bd620724ca1c5b2befc023af9dae3c1a
om/android/internal/telephony/sip/SipPhone.java
94191d43491a38305ca17456a9b806e58fbda99d 18-Mar-2011 Wink Saville <wink@google.com> am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1

* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
Change stopship to todo.
e5d6e10a73cc93676cd8a6b70cda1b78fd0a99b6 18-Mar-2011 Wink Saville <wink@google.com> Change stopship to todo.

For MR1 LTE isn't supported so the various lte routines aren't used
and are not a stopship.

bug: 4126216
Change-Id: I2a5f86161b616b57c6fe4b9de85db2492914009a
ndroid/telephony/SignalStrength.java
5a1634639514fcb3bf632520baf47abd49e4ccc6 22-Feb-2011 Jozef BABJAK <jozef.babjak@gmail.com> Removing unnecessary computation.

Change-Id: Id201e56fa60baa64204cd204169d119f7b4db3d7
om/android/internal/telephony/IccUtils.java
b8c5fe004dce258eeca5fbba1925b9b1f513d650 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."

* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
Lazy initialization must be synchronized to avoid parallel instances cretation.
36ca1d3a693f0a416e758bb52801a3381a34a605 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."

* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
Removing self-assignment statement.
d927e2742871dec1cf9a8d861a24d5bcc73c542e 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."

* commit 'b7d573e901e07fc249df0bc531cf94c574107556':
Removing repetitive conditional; it simply does nothing except slowing down things.
6f80f395b71cb641b77097e14a1906c7842c9ba6 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."

* commit 'c86ea5e260a70f7c48890da702f86466d587904e':
Removing repetitive conditional; it simply does nothing except slowing down things.
a74887e87c720fd100f10b2e69a027c493036e20 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."

* commit '56c4c442c0309aa91958dee6b6ed2d65db7ba17d':
Lazy initialization must be synchronized to avoid parallel instances cretation.
9ac9b28576834b69561a48a4050e7ad027543bcd 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am b98c8fca: Merge "Removing self-assignment statement."

* commit 'b98c8fca954718cb61d6513e623a78f1b0bd0edb':
Removing self-assignment statement.
b7d573e901e07fc249df0bc531cf94c574107556 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."

* commit '7972e382802348e7914c14507426af450aa7e30c':
Removing repetitive conditional; it simply does nothing except slowing down things.
c86ea5e260a70f7c48890da702f86466d587904e 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."

* commit '38c6e31c88dec226271e02fbfed675181ae938b7':
Removing repetitive conditional; it simply does nothing except slowing down things.
56c4c442c0309aa91958dee6b6ed2d65db7ba17d 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
b98c8fca954718cb61d6513e623a78f1b0bd0edb 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Removing self-assignment statement."
7972e382802348e7914c14507426af450aa7e30c 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
38c6e31c88dec226271e02fbfed675181ae938b7 15-Mar-2011 Brad Fitzpatrick <bradfitz@android.com> Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
eea577e0c41babadf4f07fd9d5e822bd7faa9385 15-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Remove redundant network types.

ServiceStateTracker can use the ServiceState values.
bug:4083436

Change-Id: I5b5b72392d9d48adc55731c44417d622930c4bec
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
e62dee25e50c04c235cd37df66e4ef123b761663 09-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Do not merge: Telephony: Rename lte_on_cdma property.

Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/gsm/SimCard.java
f57276154aaa587524374db8e0d7228383611bf3 08-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Do not merge: Telephony: Corrections to LTE and eHRPD constant values.

LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
ndroid/telephony/ServiceState.java
f90c26090402a517aa68cade7f452bc1ad85e654 04-Mar-2011 Wink Saville <wink@google.com> Do not merge: Add outputting "on" or "off" setRadioPower.

Change-Id: I0865f17e63f4b9867a8d33e7e147613010683a27
om/android/internal/telephony/RIL.java
124e28728b16cb63c700a323b9dfb1348580c896 08-Mar-2011 Wink Saville <wink@google.com> Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.

Change-Id: I131c8323737b0b5122a5087c77d8c6102d74b138
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
321b730a9d34b237c26075d963c8febf8d62eff1 07-Mar-2011 Wink Saville <wink@google.com> Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.

DataConnection now wraps its retry manager instead of exporting it.

Change-Id: Ibda6a235430b8ec51d1518c2956de71f964e3f39
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9d7d5b44355f0554ed13851ec11ec68a273ba56b 05-Mar-2011 Wink Saville <wink@google.com> Do not merge: Fix 3G connectivity bug 3513741.

ServiceStateTracker the registerForDataConnectionDetached needed to
test for !STATE_IN_SERVICE so that the other values for state also cause
the detached notifciation.

CdmaServiceStateTracker needed to use the ServiceStateTracker lists
and not the cdma specific lists for registration, which are now deleted.
Also removed an unused import.

CdmaLteServiceStateTracker cannot use the deleted cdma specific
registration lists.

Bug: 3513741
Change-Id: I0939a47251ffc70ea5c9e4675a4b4179d9c718b1
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
df6542d5cabf6e1e44dc7b0b82d2183a27fb97d3 03-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Do not merge: RIL: Merge Issue. LTE SIM additions.

Change-Id: Ide70b523d376e1c3f2979051c083365346bf41f6
om/android/internal/telephony/RIL.java
074f83515f2f1a790d025a856ada8923abbf3f42 01-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.

Bug: 3479209
Change-Id: I08b30c4868a12342221b6428eca8ffbb08f2b22a
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
75acebd02d2b3478d98cc8da98fa9229c53c32d5 04-Mar-2011 Ramesh Sudini <ramesh.sudini@motorola.com> Do not merge: LTE: Fix SST for CDMALTEPhone.

Change-Id: I4dc3d3bb4dba968694a5856624448b7ba1e35601
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
88d852969a0ffd2ce228defe96ecae0173574f55 28-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Do not merge: Clean up LTE code change

Promoting RestrictedState so fewer callsites need be technology specific.
Promoting ServiceState change registration code.
bug:3487388

Change-Id: Iac3abca1a2943c1626553e1fd4bdd5baace86492
om/android/internal/telephony/RestrictedState.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmConnection.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/RestrictedState.java
9d7d62801ddb206d2ea96d74864a9edfe54d2eee 12-Mar-2011 Wink Saville <wink@google.com> Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
ndroid/telephony/ServiceState.java
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccCardApplication.java
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
fe99eb7548929e7eaa275c62f5ffe7e76e176e98 11-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp

Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
55b53d351073238f9083e185eae213639e1937ff 10-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> am dfcb8c51: Merge "Don\'t accept a user-defined dun-capable connection" into gingerbread

* commit 'dfcb8c511635431d536fd3ef1894378f4424ef1a':
Don't accept a user-defined dun-capable connection
77359e7af334a9c976e8d597ede59c74cd45dac5 26-Feb-2011 Keiji Ariyama <keiji_ariyama@c-lis.co.jp> Fixing wrong Japanese phone formatter.

http://code.google.com/p/android/issues/detail?id=15383

Adding rules that Japanese number start with 050 and 060.

Change-Id: Id324d7ecfb18b348230a3903b356647045700d80
ndroid/telephony/JapanesePhoneNumberFormatter.java
4c89b14db431dc1c9c2c8d8f14b88f991a29ab62 10-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Don't accept a user-defined dun-capable connection

If we're asked to connect to a DUN APN and we have a carrier specified
DUN APN setting, verify what we're connected to is the same as what the
carrier specified before accepting it.

bug:4048013
Change-Id: I91edc4a1342cb40c1f6959e149303b7d76710f96
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
92fb16685fd8d28b231a02bfa3ef76d3924210ad 08-Mar-2011 Simon Wilson <simonwilson@google.com> am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread

* commit '10993b2d1e3614073970aad119ffb2cc9bc8f73f':
mms: mms wap push length check before pdu processing.
10993b2d1e3614073970aad119ffb2cc9bc8f73f 08-Mar-2011 Simon Wilson <simonwilson@google.com> am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread

* commit '6b6869d5c1a203e79dc272f2f0e53c184f44f24a':
mms: mms wap push length check before pdu processing.
7ac1cb787ca0386e285a8cd10e095b12821aaf7f 07-Mar-2011 Soojung Shin <sj46.shin@samsung.com> mms: mms wap push length check before pdu processing.

Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
om/android/internal/telephony/cdma/sms/BearerData.java
3fe49d8168ab7344d495ea5ee8ed6b9ef3145495 07-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.

* commit 'fa680a18f617de202912b8a9fe3fc0890a9fe09e':
Added to check for supporting mms content-disposition, utf8 decoding.
fa680a18f617de202912b8a9fe3fc0890a9fe09e 05-Mar-2011 Soojung Shin <sj46.shin@samsung.com> am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.

* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
Added to check for supporting mms content-disposition, utf8 decoding.
ff5a09904fb05f2776f1bbf1dd3915f38031190c 02-Mar-2011 Soojung Shin <sj46.shin@samsung.com> Added to check for supporting mms content-disposition, utf8 decoding.

Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
om/android/internal/telephony/cdma/sms/BearerData.java
362da509897a497848860ea8b9944ab192ad1e4c 04-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread

* commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69':
Add a protocol property to the APNs and use it.
ba76f2ac2a2edf9b3a2c67ab57f9514289473549 04-Mar-2011 Lorenzo Colitti <lorenzo@google.com> am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread

* commit '6987036fabbd2c0351986efcfd11e714ae75fdf8':
Make setupDataCall take a protocol parameter.
eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7 03-Mar-2011 Wink Saville <wink@google.com> DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82.

Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
ndroid/telephony/ServiceState.java
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccCardApplication.java
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
17eb45fff83387d4132b1ed94e927896ddb1ef5a 22-Feb-2011 Jozef BABJAK <jozef.babjak@gmail.com> Lazy initialization must be synchronized to avoid parallel instances cretation.

Change-Id: I9c6887c714f42534a465c266689dc03ee7298900
om/android/internal/telephony/cat/CatService.java
7e48e76cab10377367b925790cf3a840651009fa 02-Mar-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Start using NetworkUtils.numericToInetAddress."
e590373ea71251cfffc8f22f011e2e6335dce716 23-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Start using NetworkUtils.numericToInetAddress.

Generates InetAddresses without risking an accidental dns lookup. For use with supposedly
numeric-only ip address strings.

Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
om/android/internal/telephony/DataConnection.java
3c4e929cfdfe5573e1be3ee0331fc6029e45c382 29-Dec-2010 Lorenzo Colitti <lorenzo@google.com> Add a protocol property to the APNs and use it.

1. Database changes:
- Add a protocol and a roaming_protocol column to the
carriers table in the telephony provider database.
- Set the protocol and roaming_protocol fields when
creating APN objects from the database.

2. ApnSetting class changes:
- Add protocol and roamingProtocol fields to the
ApnSetting class that encapsulates APN settings within
the framework.
- Add the fields to ApnSetting.toString and support a new
syntax containing the fields in ApnSetting.fromString.
- Add a unit test for ApnSetting.

3. Telephony changes:
- Specify the APN protocol when setting up a data call,
using protocol when not roaming and roaming_protocol
when roaming.

This change depends on #86896 in the telephony provider,
which adds the new column to the database schema on
upgrades.

Bug: 3333633
Change-Id: If3d9ed4c851d0192849df0d64581db03b066e052
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
93faa3239e4bd8d70efb85405bc9c8849ab77897 02-Sep-2010 Lorenzo Colitti <lorenzo@google.com> Make setupDataCall take a protocol parameter.

Backport the protocol changes to setupDataCall and its
callers from master. As in master, hardcode IPv4
connectivity for now. When we add the protocol field to
ApnSettings, it will be fetched from there.

Bug: 3333633
Change-Id: I51880bc0ec192cbf964ac7bbd6a4b7d2eed41d27
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
7719436342611a106df5d379fedf180a5dd0809e 28-Feb-2011 Xavier Ducrohet <xav@android.com> am b732b7b5: am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'b732b7b5e8192501360edc15fb8c6399d11fb97d':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
b732b7b5e8192501360edc15fb8c6399d11fb97d 28-Feb-2011 Xavier Ducrohet <xav@android.com> am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'ce57a7f35344e76689d30f45964d1e37b78280cb':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
ce57a7f35344e76689d30f45964d1e37b78280cb 28-Feb-2011 Xavier Ducrohet <xav@android.com> am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit '6504490cde3ec5d48321d539e654d1f2072b33f9':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
6504490cde3ec5d48321d539e654d1f2072b33f9 28-Feb-2011 Xavier Ducrohet <xav@android.com> am dff6b8e7: Merge "Add --non-constant-id to aapt."

* commit 'dff6b8e71dda9f5d841fa26408714aec2aef1505':
GpsLocationProvider: Clean up HAL initialization/cleanup sequence
Fixed GSM encoded network initiated position request
Ensuring thread-safe usage of DateFormat.
Fixing infinite loop for zero duration.
Fix for an infinite loop while scrolling lists.
WAPPushManager, WAP Push over SMS message handler
Add --non-constant-id to aapt.
4b7c6fa2c0707b7e5b451b31de8a113e945c8e09 25-Feb-2011 Samyeoul Choi <sy310.choi@samsung.com> am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint

* commit '350799b72c3180e04ec91469509f6079c932b971':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
350799b72c3180e04ec91469509f6079c932b971 25-Feb-2011 Samyeoul Choi <sy310.choi@samsung.com> am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint

* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf 25-Feb-2011 Samyeoul Choi <sy310.choi@samsung.com> am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint

* commit '092238916fd5d10090c0bcad33644778a1f366e7':
Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
092238916fd5d10090c0bcad33644778a1f366e7 24-Feb-2011 Samyeoul Choi <sy310.choi@samsung.com> Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint

'*86' which is set now as a default at CDMAPhone.java,
is default voicemail number for Verizon.
For Sprint, we use user's own number for voicemail.

So we add codes in CDMAPhone.java to use
'config_telephony_use_own_number_for_voicemail',
and use config.xml to set this value as false.
Then we overlay Sprint's own config.xml file to
override 'config_telephony_use_own_number_for_voicemail' as a true.

Change-Id: I110914bdfa9a79aaba89d3b80edbcf044e9aabee
om/android/internal/telephony/cdma/CDMAPhone.java
2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82 25-Feb-2011 Wink Saville <wink@google.com> LTE Changes for Telephony including Multiple PDN support and IPV6 support

Added init for CDMAPhone.java

Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
ndroid/telephony/ServiceState.java
om/android/internal/telephony/ApnContext.java
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccCardApplication.java
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMALTEPhone.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
df3c4b45c85cc33e83f2d37cd34752493b334d12 24-Feb-2011 Wink Saville <wink@google.com> am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only.

* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
Do not start RILReceiver if wifi-only.
ee38808dcca92fa8677e7d03401f6bb7b54ec781 24-Feb-2011 Wink Saville <wink@google.com> am 0dc8618d: Do not start RILReceiver if wifi-only.

* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
Do not start RILReceiver if wifi-only.
0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6 24-Feb-2011 Wink Saville <wink@google.com> Do not start RILReceiver if wifi-only.

By not starting RILReceiver we don't waste any cycles
trying to communicate with a vendor ril which may
not exist. This allows a wifi-only device to operate
as expected and the system to gracefully handle the
missing radio as ril requests will report RADIO_NOT_AVAILABLE.

Change-Id: I6c6f60830486c5f0447b3b9eb44c8b1f2d70c517
om/android/internal/telephony/RIL.java
bf87c1159036b926ddac52d8145edc786e322e2b 24-Feb-2011 Wink Saville <wink@google.com> Merge "WAPPushManager, WAP Push over SMS message handler"
4360d7c678536a451dde6f4229e6d8c427b48523 23-Feb-2011 Wink Saville <wink@google.com> Add queryFacilityLockForApp and setFacilityLockForApp for v6 ril.h.

Change-Id: Ib802e77fb03567c619e911e5f975be3077947e05
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
c007925423f4ffcefa3bfd17e40288305ebe5ae2 22-Feb-2011 Jozef BABJAK <jozef.babjak@gmail.com> Removing self-assignment statement.

Change-Id: I429235093de4539bde3950075fbdaa4ef5bdeedd
om/android/internal/telephony/cdma/sms/BearerData.java
c28480a1b44bb2eb40801b7fc9ff7e870aa9a3a8 22-Feb-2011 Jozef BABJAK <jozef.babjak@gmail.com> Removing repetitive conditional; it simply does nothing except slowing down things.

Change-Id: I53a176cebae0051a33647317e2f269ebf149f7d2
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
4a64ab84d2cb89c989fb06a668c040c62a6b9570 22-Feb-2011 Jozef BABJAK <jozef.babjak@gmail.com> Removing repetitive conditional; it simply does nothing except slowing down things.

Change-Id: Ibe76c1ed49bdf66eb57702e5f89363a5132d9617
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
5284090631e638b916d9a453212e9dc802656a67 18-Feb-2011 Wink Saville <wink@google.com> Changes for ril.h version 6.

Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
ndroid/telephony/SignalStrength.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/IccCardStatus.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
7640caaf912a7eefacc3e2108c5afd70f7b072a4 20-Aug-2010 noda <noda@nttdocomo.co.jp> WAPPushManager, WAP Push over SMS message handler

The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages. This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.

- This patch contains the WAPPushManager itself, the associated test
code, and the modifications to telephony to use the WAPPushManager.

Change-Id: I4f7fb5b68fc666da9bdeeea525e8797ae317e4b5
om/android/internal/telephony/IWapPushManager.aidl
om/android/internal/telephony/WapPushManagerParams.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
fc2bb2fbc79524177c16997ead1a59bb471a77e9 15-Feb-2011 John Wang <johnwang@google.com> am d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit 'd0789ec99593bf556c88ff866a81d23449df1911':
Only decode EXT1 tag when it is available.
d0789ec99593bf556c88ff866a81d23449df1911 15-Feb-2011 John Wang <johnwang@google.com> am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
Only decode EXT1 tag when it is available.
3901402600daa5ef9fbcae7b4b9400ee8ca1a317 15-Feb-2011 John Wang <johnwang@google.com> am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
Only decode EXT1 tag when it is available.
c2cbc730fcb051c1a12897ec29fbe0280a536f53 15-Feb-2011 John Wang <johnwang@google.com> Only decode EXT1 tag when it is available.

Normally ADN record is stored in two tags, EFADN_TAG and EFEXT1_TAG. But if the EFEXT1_TAG is not set in EF_PBR entry,
it shouldn't be decoded otherwise it causes NullPointerException in readAdnFileAndWait().

bug: 3376954
Change-Id: I744cf5cb8662c75be1e7c6219fa92c67bdda82f2
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
72f0224f2f9c44e2096bea07547bc88b1f10539b 10-Feb-2011 Wink Saville <wink@google.com> am 48fe5c3a: am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit '48fe5c3a86435a401fa88b43e15b84e29e660173':
Telephony: Fix cb sms implementation
48fe5c3a86435a401fa88b43e15b84e29e660173 10-Feb-2011 Wink Saville <wink@google.com> am bdce3d2c: am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit 'bdce3d2c3516612bfd3a9e5f259a892d1a595f19':
Telephony: Fix cb sms implementation
01a5eba810bfdf5b111a7546814e174c1d57b6e7 09-Feb-2011 Wink Saville <wink@google.com> am 6e25789f: Merge "Telephony: Fix cb sms implementation"

* commit '6e25789fbe7ac283021156b17f406acb48850292':
Telephony: Fix cb sms implementation
f7de51cc4d623cb661e5bef2ea80f6bdc9609cbd 09-Feb-2011 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix cb sms implementation

Change-Id: Ie2a678e3ab99f0d5b9dd68cc4a79e1c5a58ecbe2
om/android/internal/telephony/SMSDispatcher.java
0d4c1fe368142993d37ced49cfae251b1073c346 07-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am b6bf10e4: Merge 917d9ea1

* commit 'b6bf10e4bd2c17838a00091c3b8efb2f91ce3457':
Fix the Multi-page SMS sending error to several receipents
24401c79665e9af458fbe646165c68434335dda4 05-Feb-2011 Lorenzo Colitti <lorenzo@google.com> Merge "Add a protocol property to the APNs and use it."
70181e2a9f4366eb422dcfe35636e90090ebe942 04-Feb-2011 Wink Saville <wink@google.com> Fix SETUP_DATA_CALL handling.

Handle version 4 returning more than 3 strings and
handle addresses and dnses which are possibly zero length.

Change-Id: Ic58231aa53ccb1fa2b2aaa19580f83f71db1cca3
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RIL.java
1372f0449b63f271e1efb564bbaad2bf5a576184 04-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 5086c457: am baaaca1c: Merge ee4c17ee from gingerbread

* commit '5086c45718a8344fb36adf5b15e98953612cac37':
Fix delivery report error with PENDING status in SMS
8e63c3e33b2dc8ed8020915ceee011b99cbad99f 03-Feb-2011 Lorenzo Colitti <lorenzo@google.com> Add a protocol property to the APNs and use it.

1. Database changes:
- Add a protocol and a roaming_protocol column to the
carriers table in the telephony provider database.
- Set the protocol and roaming_protocol fields when
creating APN objects from the database.

2. ApnSetting class changes:
- Add protocol and roamingProtocol fields to the
ApnSetting class that encapsulates APN settings within
the framework.
- Add the fields to ApnSetting.toString and support a new
syntax containing the fields in ApnSetting.fromString.
- Add a unit test for ApnSetting.

3. Telephony changes:
- Specify the APN protocol when setting up a data call,
using protocol when not roaming and roaming_protocol
when roaming.

This change depends on #94983 in the telephony provider,
which adds the new column to the database schema on
upgrades.

Change-Id: Ic4e3f02e48f17990f657187b9919d265671f0138
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
db71bda6f696aff6047e6c26c32e0c08bf6851bc 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread

Change-Id: I6b895012db6b96666dc3257b1f2e430925981188
b6bf10e4bd2c17838a00091c3b8efb2f91ce3457 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge 917d9ea1

Change-Id: I7c92b0dbff44375b714e99b9cdc7052628db8ecb
917d9ea1ebec4d61f9de585d83debcf2cb2873dd 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 8444023f: Merge from open-source gingerbread

* commit '8444023f351b22816f6827d3314ff81b3533e3d9':
Fix the Multi-page SMS sending error to several receipents
8444023f351b22816f6827d3314ff81b3533e3d9 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: I19c4ba36cf4f2ef518b55768360b0bff1a92a5ab
b9ef00ea2f66fa0287e5ac921f296c21ab57717f 03-Feb-2011 Sang-Jun Park <sj2202.park@samsung.com> Fix the Multi-page SMS sending error to several receipents

Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
4b8ad9effd95508e9966b8a3a355f0a948558ae2 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread

Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
5086c45718a8344fb36adf5b15e98953612cac37 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am baaaca1c: Merge ee4c17ee from gingerbread

* commit 'baaaca1c6164eff17488a178859295a1d5be9171':
Fix delivery report error with PENDING status in SMS
baaaca1c6164eff17488a178859295a1d5be9171 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge ee4c17ee from gingerbread

Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
ee4c17eec30b270f9a91cc92b40fc56435a59027 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
2703b84caabe7b4fb7f6c08bf7463a89b0a3169c 03-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Fix delivery report error with PENDING status in SMS" into gingerbread
5e9bf7a908f1249bae911382e94a0c8d81664097 03-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Add new network type for HSPA+."
2fcaf538ced102a6f8e96e2871d4ad3c9316ddfc 03-Feb-2011 Irfan Sheriff <isheriff@google.com> am aec39e62: Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit 'aec39e625b95088f4020302a0eac1f38da43c765':
two digit number handling in croatia and serbia
9d3fb3717f2acec71a3330e448ecf63ee997b1f8 03-Feb-2011 Wink Saville <wink@google.com> am 94dbc990: am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb

* commit '94dbc990b8840d323d358770a1ba02bb4820c681':
Have SmsMessage use getCurrentPhoneType
aec39e625b95088f4020302a0eac1f38da43c765 03-Feb-2011 Irfan Sheriff <isheriff@google.com> Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp
d6d2de6b3c22f34aed80e36d58ae5c9692bb2933 03-Feb-2011 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp

Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5
94dbc990b8840d323d358770a1ba02bb4820c681 03-Feb-2011 Wink Saville <wink@google.com> am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb

* commit 'd31fed90f8fdf854cade08af94918066af921d74':
Have SmsMessage use getCurrentPhoneType
9e4ba121dc5168398bb29badfa2b35a57b1077a1 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Add new network type for HSPA+.

Change-Id: Ia949a02e5cb66bc9f7d4d5e7e771e592231c729b
ndroid/telephony/TelephonyManager.java
ec348b495367d799d9985060f7f070128f142f5f 02-Feb-2011 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp

Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
1938e314e34fb11ec5398716dfe9704cea66e31e 02-Feb-2011 Wink Saville <wink@google.com> Have SmsMessage use getCurrentPhoneType

Although our first tablet doesn't support SMS messages there are testing
scenarios where they can be used. To preserve proper behavior now that
getPhoneType can return PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I48ef294f563351c66971b4e89e6dcb3326b0ae92
ndroid/telephony/SmsMessage.java
ndroid/telephony/gsm/SmsMessage.java
0a4b3fd93b2de21de0684a8291663920d9099170 02-Feb-2011 Irfan Sheriff <isheriff@google.com> two digit number handling in croatia and serbia

If users dial 92-96, dial them normally and not treat
as USSD

Change-Id: If3b6cb37b7ec0ff99d76cb10cba53368094a0b5d
Signed-off-by: sj2202.park@samsung.com
om/android/internal/telephony/gsm/GsmMmiCode.java
adf851755ff8ca50e1023601fff1cb595d86fbc1 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> am 746ef9b8: am 2c507b92: Merge "Use a cached context when possible." into honeycomb

* commit '746ef9b8f0c080e247c6726b294fa2ab5cf53dac':
Use a cached context when possible.
746ef9b8f0c080e247c6726b294fa2ab5cf53dac 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> am 2c507b92: Merge "Use a cached context when possible." into honeycomb

* commit '2c507b92c242951e4fb2e807431c10d73e4bf778':
Use a cached context when possible.
837491cacb27b982f7c373eaa4a8bca7c913072b 02-Feb-2011 Wink Saville <wink@google.com> Merge "Provide default value for operator numeric for CDMA."
6e2884817d7f51257fbf5195f3a47e3cfa3b5d98 02-Feb-2011 Robert Greenwalt <rgreenwalt@google.com> Use a cached context when possible.

It's always possible after services have been registered, so it's just early
in the process that's a problem. Lie correctly in those early cases and fix this
in MR1.

bug:3415254
Change-Id: I95811d1efd676fde01f66b742393d3aa4623482f
ndroid/telephony/TelephonyManager.java
b65060282de420469c4ae51594f47fc9b0c651c9 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am e7c6eea7: am 61b06be2: am 155b0ee0: Merge from open-source gingerbread

* commit 'e7c6eea7b42c233fe4de61b72e4f72e7614909e1':
fix for supporting 3 digits MNC code
e7c6eea7b42c233fe4de61b72e4f72e7614909e1 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 61b06be2: am 155b0ee0: Merge from open-source gingerbread

* commit '61b06be285ef03381b1d788996650863a1606b36':
fix for supporting 3 digits MNC code
61b06be285ef03381b1d788996650863a1606b36 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> am 155b0ee0: Merge from open-source gingerbread

* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
fix for supporting 3 digits MNC code
8226140ccadbc8e0bdd093f8bab0a5292b9224e3 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread

Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
155b0ee0498cf863091f3f83a752eaaedf1257f8 02-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
7c38e05914fffede9ee5d2ec3a7710e9b0c5f36e 02-Feb-2011 Eric Laurent <elaurent@google.com> am 6f2c1c92: am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones

* commit '6f2c1c92681d8e3664accae2a03058e38ea411f6':
Allow TTY mode for GSM Phones
6f2c1c92681d8e3664accae2a03058e38ea411f6 02-Feb-2011 Eric Laurent <elaurent@google.com> am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones

* commit '0990484c3ef96c6f0553374675b76fed54b5b164':
Allow TTY mode for GSM Phones
0990484c3ef96c6f0553374675b76fed54b5b164 02-Feb-2011 Eric Laurent <elaurent@google.com> am 3d4069a2: Allow TTY mode for GSM Phones

* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
Allow TTY mode for GSM Phones
ba34751426d87fe714b9eb89228fe835e4bc0a80 02-Feb-2011 Sang-Jun Park <sj2202.park@samsung.com> fix for supporting 3 digits MNC code

Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)

Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
om/android/internal/telephony/gsm/SIMRecords.java
12bf1133bd45039e8498d188731c546829faa1a2 02-Feb-2011 Wink Saville <wink@google.com> am ff34565f: am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb

* commit 'ff34565fcb366d4bd0066bd7fe6f588e42a9a9cc':
Add TelephonyManager.getCurrentPhoneType
9d72be33181f1bd1386017ce0b0ce17d8ce1cb66 02-Feb-2011 Wink Saville <wink@google.com> Add TelephonyManager.getCurrentPhoneType

The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.

bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
ndroid/telephony/CellLocation.java
ndroid/telephony/TelephonyManager.java
1a24a9c1d415517d0fc7787371a71e4da18be231 02-Feb-2011 Wink Saville <wink@google.com> am 566cd74f: am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb

* commit '566cd74f5686b480d2e3d49c4505c45df7712587':
Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1 25-Jan-2011 Eric Laurent <elaurent@google.com> Allow TTY mode for GSM Phones

TTY mode should not be restricted to CDMA phones as some GSM carriers
support it.
TTY support is enabled by overlaying the tty_enabled boolean property
in packages/apps/Phones/res/values/config.xml

Also corrected wrong comments on TTY methods.

Change-Id: I48dbc2be51c3dcdaedc1838b85134edc7012be3c
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/test/SimulatedCommands.java
c5996b9969b241dfe647c7de4d7995c6e848d1db 31-Jan-2011 Sang-Jun Park <sj2202.park@samsung.com> Fix delivery report error with PENDING status in SMS

1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.

Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
fe629782f33a07827c69841fce9964bd90ff152a 01-Feb-2011 Wink Saville <wink@google.com> Provide default value for operator numeric for CDMA.

If the RIL_REQUEST_OPERATOR response[2], the numeric for the operator,
is bad use the system property ro.cdma.home.operator.numeric.

bug: 3383515
Change-Id: I9abddc477d57c350a4c9a445242eaa7627cd5f69
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
9b9e6778dd9a0f04eb22e4fdd83d7d0d56b6b1a9 01-Feb-2011 Wink Saville <wink@google.com> Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.

bug: 3198435
Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
ndroid/telephony/TelephonyManager.java
9fbf9c2ddb652de188f955de74ba237dffda2f3a 31-Jan-2011 Wink Saville <wink@google.com> am bac75416: am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb

* commit 'bac75416d1cead62ca54e6e78206da64507146ba':
Add debug for tracking bug 3404006.
cde85d573873adce9ebcf0d2c4c2c5c1b8d465cc 31-Jan-2011 Wink Saville <wink@google.com> Merge "Add debug for tracking bug 3404006." into honeycomb
ea9af9e97b143200ef2d572c580b0e3368feab11 31-Jan-2011 Wink Saville <wink@google.com> Add debug for tracking bug 3404006.

We need some additional debugging to help diagnose the cause
of this bug. There is no logic changes just additional debugging.

Change-Id: Ifc5d1c82904042fa87fd3b5b1066f58b62e7359c
om/android/internal/telephony/DataConnectionTracker.java
b2abd8c424a68eb6a5e3615a99f66c0bd46e6063 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Mass merge from gingerbread - do not merge

Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
7ea919c44b05daf99c045d09eb3edafb96019da7 29-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge 6b739dc7 from gingerbread

Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
b46062bc0886eb176afe23b7dab81db3ab6c1beb 29-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
Add some network types that OEM's are asking for.
f8fdec50c7871b640c13cfe3e2e7a3b449f62f69 29-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
dd75788eda36c3876590dccbe52ce3a448085b6d 29-Jan-2011 Hung-ying Tyan <tyanh@google.com> am cc019c0c: Merge "Get mute state from active call." into gingerbread

* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
6630698e24b8d48316e176aaed06c6db7972be6b 29-Jan-2011 John Wang <johnwang@google.com> am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread

* commit '93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
aa3866e6fa2d0c0e026b78cf43dccce67a2021e5 29-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread

* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
e12aec941dfc93b76b5efb9bc9f30d2ba3469434 28-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Add some network types that OEM's are asking for.

Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
ndroid/telephony/TelephonyManager.java
473df1cd24813b095cda5348c1d25315dd396dc1 28-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb

* commit 'f7784876ed2d731fae9ab8a10119f558a9adf8d7':
Fix data network type notifications.
f7784876ed2d731fae9ab8a10119f558a9adf8d7 28-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> am b8498f1d: Merge "Fix data network type notifications." into honeycomb

* commit 'b8498f1dcf0b4e866c940da482930789cd6554c5':
Fix data network type notifications.
164ca032b609c9590b41dfd83c13317612e43b2f 28-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Fix data network type notifications.

These trackers have two copies of the network type: newSS and newNetworkType. I think thats wrong,
but this was the smaller change on code that will hopefully be refactored soon.

On radio_off we were making a new, empty newSS but not clearing newNetworkType so it
still thought we were on 3G and when we reconnect and get 3G state changes new==old and we don't
send the update. In this fix I reset newNetworkType every time we apply it to networkType.

bug:3389886
Change-Id: I294f34259dc6c6f8f445bf2cb5466c8be747e25c
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
4376538c47b19a8ff023cdb2182030627929b504 26-Jan-2011 John Wang <johnwang@google.com> Enable recovery in RIL wakelock release check.

This is a cherry-pick Change 91968 from GB branch.

Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.

and

2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.

Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.

bug: 3369427, 3370827
Change-Id: Ibbcc95d67a292ffe20339ea9bdb0f2e4a4988da0
om/android/internal/telephony/RIL.java
1155efdc715413cd7a881e5226b5f5f0b2db8f71 26-Jan-2011 Jean-Michel Trivi <jmtrivi@google.com> am 2ba92c71: do not merge bug 3370834 Cherrypick from master

* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
do not merge bug 3370834 Cherrypick from master
2ba92c71b5684dce700cf848bf157153c156df1d 15-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> do not merge bug 3370834 Cherrypick from master

Cherripick from master CL 79833, 79417, 78864, 80332, 87500

Add new audio mode and recording source for audio communications
other than telelphony.

The audio mode MODE_IN_CALL signals the system the device a phone
call is currently underway. There was no way for audio video
chat or VoIP applications to signal a call is underway, but not
using the telephony resources. This change introduces a new mode
to address this. Changes in other parts of the system (java
and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
state variable directly, but to use two new convenience methods,
isInCall() and isStateInCall(int) instead.

Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Update the platform-independent audio policy manager to pass the
nature of the audio recording source to the audio policy client
interface through the AudioPolicyClientInterface::setParameters()
method.

SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
Audio mode MODE_IN_CALL is reserved for telephony.

SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.

Note that this CL is intentionally not correcting the
getAudioSourceMax() return value in MediaRecorder.java as the
new source is hidden here.

Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
om/android/internal/telephony/CallManager.java
3947716e696a693ea6bc1b22e5e720e00aaf3695 26-Jan-2011 Wink Saville <wink@google.com> am c3a2747f: am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb

* commit 'c3a2747fee9f96fdcd075f582b5b4892cbecf7df':
Increase the default timeout from 30 to 60 seconds.
c3a2747fee9f96fdcd075f582b5b4892cbecf7df 26-Jan-2011 Wink Saville <wink@google.com> am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb

* commit 'd8b525c398aeda1f583ed4ed90450e0a0fc9b6ef':
Increase the default timeout from 30 to 60 seconds.
b260fe75c18e5cb4823654e031ea5a66e0eecdbb 26-Jan-2011 Wink Saville <wink@google.com> Increase the default timeout from 30 to 60 seconds.

The DEFAULT_WAKE_LOCK_TIMEOUT should be longer than the timeouts
of the vendor ril, aka. rild. We are seeing timeouts which are
30secs and possibly longer. An alternative would be to add
TelephonyManager.PROPERTY_WAKE_LOCK_TIMEOUT for but I feel a 60
second default is appropriate for all platforms.

Bug: 3392618
Change-Id: I63f6b211b584857999174524d4ea4efa1994dfba
om/android/internal/telephony/RIL.java
6ec87ea08a9c67fc823aa899d12c349f8fcad51e 25-Jan-2011 Wink Saville <wink@google.com> am ca7c4a5d: am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb

* commit 'ca7c4a5d1c6bc3f312862c0311fa21d0d41ababc':
Add debug to CallManager#canDial.
ca7c4a5d1c6bc3f312862c0311fa21d0d41ababc 25-Jan-2011 Wink Saville <wink@google.com> am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb

* commit '774f9be5dc02e8a7f742008872c6214e517cb8a3':
Add debug to CallManager#canDial.
a2e91ae1156c10451e4bc661a28c6499f5852551 25-Jan-2011 Hung-ying Tyan <tyanh@google.com> am b30392d2: am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread

* commit 'b30392d288c6c72a6db00a71a2ca586793161b48':
Get mute state from active call.
b30392d288c6c72a6db00a71a2ca586793161b48 25-Jan-2011 Hung-ying Tyan <tyanh@google.com> am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread

* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
Get mute state from active call.
b761f681e8f0e70d6c5f16af91426c9e3c7004e6 25-Jan-2011 John Wang <johnwang@google.com> am c3a5b19c: am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread

* commit 'c3a5b19c9518cf4cc7206a69015c96119bf35f73':
Enable recovery in RIL wakelock release check.
c3a5b19c9518cf4cc7206a69015c96119bf35f73 25-Jan-2011 John Wang <johnwang@google.com> am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread

* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
Enable recovery in RIL wakelock release check.
079c8d7fd6ccb559f5b848bb5c25230fa467be04 25-Jan-2011 Wink Saville <wink@google.com> Add debug to CallManager#canDial.

Add some debug to trackdown why canDial is sometime
returning false, see bug 3381435.

Change-Id: I0caade5ffdf9d67cdee0557971a8918182718512
om/android/internal/telephony/CallManager.java
df1cc4ef9205239701bbe73f903e89a9dfd2623a 25-Jan-2011 Hung-ying Tyan <tyanh@google.com> am cc019c0c: Merge "Get mute state from active call." into gingerbread

* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
Get mute state from active call.
cc019c0caa0dd984404dea4d6623ae9d7b8474f1 25-Jan-2011 Hung-ying Tyan <tyanh@google.com> Merge "Get mute state from active call." into gingerbread
78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4 24-Jan-2011 John Wang <johnwang@google.com> am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread

* commit '93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
696794fc139a752e2a10fa66d73a9ae6fd085acc 22-Jan-2011 John Wang <johnwang@google.com> Enable recovery in RIL wakelock release check.

Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.

and

2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.

Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.

bug: 3369427, 3370827
Change-Id: Ib2fc54db3b155bd3fb1296ad83720b7836708caf
om/android/internal/telephony/RIL.java
48f53ec7f4db333d342504ebc323f4301ba95103 20-Jan-2011 Wink Saville <wink@google.com> Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE

Add DNS and gateway as parameters to RIL_REQUEST_SETUP_DATA_CALL so that
system properties aren't used for passing these to the ril. System
properties that are read right after a write doesn't always see the
result of the write. Another words writing system properties are not
not sequentially consistent.

Bug: 3364487
Change-Id: Ib7cba74346395323f3feb927281695663d9935ac
om/android/internal/telephony/DataConnection.java
e732ab01f0c8f14565a8d0fd12b3af6534709a3d 19-Jan-2011 John Wang <johnwang@google.com> am ae451252: am 8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb

* commit 'ae451252f425525efd4ade9adbd023a00a89c3e7':
Enable AUTO_TIME_ZONE settings.
8d48c3d21f78cc2bc94682731d64b23ec0899824 18-Jan-2011 John Wang <johnwang@google.com> Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
759aca9d20e76a99df556304caf9171da18c7f51 15-Jan-2011 John Wang <johnwang@google.com> Enable AUTO_TIME_ZONE settings.

There are separate settings for AUTO_TIME and AUTO_TIME_ZONE.

Modify *ServiceStateTracker to monitor AUTO_TIME and AUTO_TIME_ZONE changes
separately and reset NITZ time and timezone accordingly.

bug: 3304255
Change-Id: Ie430f7b4a256618bea87672b3628d1223ea6e36a
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
212c63bc611c8407d64c58f974364ba3b6bab6a2 17-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Merge "Moving gsm.NetworkInfo to OperatorInfo"
3caa1bd1061df4029951e68d0a04d5e30928701f 15-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Moving gsm.NetworkInfo to OperatorInfo

NetworkInfo had a bad name collision, wasn't gsm specific and was
really about operators.

Change-Id: Ic99108a3d0e2b3115f023398f85d9c7e5a3e38be
om/android/internal/telephony/OperatorInfo.aidl
om/android/internal/telephony/OperatorInfo.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/NetworkInfo.aidl
om/android/internal/telephony/gsm/NetworkInfo.java
om/android/internal/telephony/sip/SipPhoneBase.java
d1afa8fec0076a1af81f44f9d10677246109af4b 16-Jan-2011 Wink Saville <wink@google.com> am eb731123: am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb

* commit 'eb7311231203b7943027fd9992a5a59f67799615':
Set mIsMinInfoReady and mCurrentOtasp before notifcations.
ad8c32f3028d13869d4c494ae14193ceba3281af 15-Jan-2011 Wink Saville <wink@google.com> Set mIsMinInfoReady and mCurrentOtasp before notifcations.

We were sending a notification before setting mIsMinInfoReady and
mCurrentOtasp. This causes a race and it's possible that
OtaUtils.maybeDoOtasp is called before before they are set.
In this case the activation would not occur.

Bug: 3339109
Change-Id: I3baf8992d58af63a5cc07a14cc33157fd1c5aaa3
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
2ee400bbfa459c8e5e910578584c2603e2626595 14-Jan-2011 Wink Saville <wink@google.com> Merge "Support RIL_REQUEST_SETUP_DATA_CALL version 5."
abea3b892b5e54c46423bfe33fdb0aa1315f6bf4 14-Jan-2011 Wink Saville <wink@google.com> Support RIL_REQUEST_SETUP_DATA_CALL version 5.

Change-Id: I091166f368f4641b514d51ec4ca281c9b526491c
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/EventLogTags.logtags
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnection.java
19b9ab46a9faee6031aaf6c78748401943fea117 10-Jan-2011 Robert Greenwalt <rgreenwalt@google.com> Turn off DUN connection after tethering.

Use matching feature type when turning tethering off or the request is ignored.

Also, turn on DUN apn right away so that we don't fail aggressive test cases.

Also don't report connections for enabled apn's that we're no longer connected to.

bug:3332880
bug:3338033
Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
4f95b1250fb4d58b525311d0c6f267284ca85e8d 25-Nov-2010 Henrik Hall <henrik.hall@sonyericsson.com> Adding support for parsing of SMS-CB pdus in UMTS format.

This enables RIL to dispatch pdus in both GSM or UMTS format.
The RAT that was used will be transparent to clients.

Change-Id: I57c53ec79496d274e18b3fee196551af97c0857d
ndroid/telephony/SmsCbMessage.java
om/android/internal/telephony/gsm/SmsCbHeader.java
65a7f147deb02f728959eb05913a2d6ce53dea1c 11-Jan-2011 Hung-ying Tyan <tyanh@google.com> Get mute state from active call.

Currently, PhoneUtils.getMute() returns the mute state from the foreground phone.
When a SIP call is muted and then put on hold, the call is moved to background
and the SipPhone becomes background phone. At this point, PhoneUtils.getMute()
incorrectly returns false from the idle foreground phone (i.e., GSMPhone).

CallManager provides getMute() but it's not used anywhere. This CL fixes the
method and I'll have another CL to have PhoneUtils.getMute() take advantage of
it.

Bug: 3323789
Change-Id: I6c37500ae93f4e95db3bcd55e24e1ecb58a57c0a
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/sip/SipPhone.java
81f573de6361b0420b22c857afa7e03df125d1a5 07-Jan-2011 Wink Saville <wink@google.com> Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb
f4871b686f35aaa38bc1a088ec8845b038241e16 07-Jan-2011 Wink Saville <wink@google.com> For Cdma a blank plmn is valid to show in some cases.

When roaming the plmn might be blank but we want to have
showPlmn true otherwise "No Service" is displayed.

bug: 3265611
Change-Id: Iaed8997ab0bb336c79cef1fc848526ca7a73f9a1
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
cde0233512f8dbbc62238e90c850c310894e3972 07-Jan-2011 Wink Saville <wink@google.com> Add telephony.sms.receive and telephony.sms.send properties.

The purpose of these properties is to allow, at boot time, the
enable and disabling of receiving and sending of SMS messages.
These properties are used to initialize two booleans within
[Gsm|Cdma]SMSDispatcher code. The two booleans are initialized
to the value of config_sms_capable and when config_sms_capable
is false the device can neither receive nor send SMS.

Under some conditions, such as testing, it could be desirable
to send and or receive SMS messages on a device where config_sms_capable
is false. With the addition of these two properties it is now possible
to use /data/local.prop to control the booleans independently.

bug: 3315489
Change-Id: I83fe6f2da7d66ff720f28b696d8d76ec388706c0
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
8fd2718bf3dfd67a26619a1ce765f8423c8c4bfe 05-Jan-2011 Hung-ying Tyan <tyanh@google.com> am 05c53067: am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread

* commit '05c53067b613796624937214e506c58de817c8fd':
Fix setting audio group mode in SipPhone.
05c53067b613796624937214e506c58de817c8fd 05-Jan-2011 Hung-ying Tyan <tyanh@google.com> am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread

* commit '273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
Fix setting audio group mode in SipPhone.
273d2ea3f986f1611d2cf303cc5b93f820c14dd3 05-Jan-2011 Hung-ying Tyan <tyanh@google.com> Merge "Fix setting audio group mode in SipPhone." into gingerbread
e32e812b11520b244374371ee49eaed20c84a6e3 29-Dec-2010 Robert Greenwalt <rgreenwalt@google.com> Always file DUN requests for tethering.

A bit of a hack so that first trySetupData call uses the proper APN in
strange edge cases. Made a new startUsingNetworkFeature string
that ConnectivityService knows means always pass the request to telephony
even if telephony connections are not currently available.

bug:3133178
Change-Id: I2559b9cbaed4b4ec02bdf7ea78e6003ee2be64f2
om/android/internal/telephony/Phone.java
003f338b6f12400429c5d8f0fc06a477a7ce1f80 03-Jan-2011 John Wang <johnwang@google.com> am e8522998: am 06fccc32: Merge "Clear request list while timeout." into gingerbread

* commit 'e85229988e6350a684be91c3bbf64232271c5663':
Clear request list while timeout.
e85229988e6350a684be91c3bbf64232271c5663 03-Jan-2011 John Wang <johnwang@google.com> am 06fccc32: Merge "Clear request list while timeout." into gingerbread

* commit '06fccc325123bf4c9ebd04ac9300b504436724fe':
Clear request list while timeout.
f6254ba7f0e48515bca3c08bbb71f916448bf0d1 31-Dec-2010 Lorenzo Colitti <lorenzo@google.com> Fix setupDataCall breakage.

Change I1a1adc61 added a new parameter to setupDataCall,
but updated the callers incorrectly (specifying the
arguments in the wrong order). Fix the order.

Change-Id: I0e762de29ac05d387371a7cfe33a33ad16219221
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnection.java
4eb40450720f6cc1ed07fa181b22677461fa96bd 30-Dec-2010 Lorenzo Colitti <lorenzo@google.com> Get rid of setupDataCallWithProtocol.

setupDataCallWithProtocol was introduced to introduce a
protocol parameter to setupDataCall without having to
modify its callers. This is not very useful, as there are
only two callers. Get rid of it and make setupDataCall take
the protocol parameter itself.

For now, hardcode IPv4 connectivity. When we add the
protocol field to ApnSettings, it will be fetched from
there.

Change-Id: I1a1adc616ffd9ac68be6911f054790da48e472d6
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
1d12ef09a8e6ebc6638f4ff2f561c50c950023cb 13-Dec-2010 Hung-ying Tyan <tyanh@google.com> Fix setting audio group mode in SipPhone.

Bug: 3119690
Change-Id: I495d3c031ee4c272d360fe19553ef9726a3f8771
om/android/internal/telephony/sip/SipPhone.java
00d520b66caeef722281b76d30c0e1294070713d 29-Dec-2010 John Wang <johnwang@google.com> Clear request list while timeout.

The wakelock will be kept held if there is outstanding requests
in request list. When WAKE_LOCK_TIMEOUT occurs, all requests
in mRequestList already waited at least DEFAULT_WAKE_LOCK_TIMEOUT
but no response. Those lost requests return GENERIC_FAILURE and
request list is cleared.

bug:3292426
Change-Id: I369c6ba4d6836d65ef616140e48c7304faf888f0
om/android/internal/telephony/RIL.java
fa93584a4fab6ca8d9348658dc30cedf76891753 23-Dec-2010 Jeff Brown <jeffbrown@google.com> am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread

* commit 'c6f2b3b302c06b8b7b81ec7e3a43a7df1813d0e0':
Fix policy issues when screen is off. (DO NOT MERGE)
eb9f7a01b0f501a535d872a957c1102ebb13d1c7 30-Oct-2010 Jeff Brown <jeffbrown@google.com> Fix policy issues when screen is off. (DO NOT MERGE)

Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Bug: 3144874
Change-Id: Iebb91e10592b4ef2de4b1dd3a2e1e4254aacb697
om/android/internal/telephony/ITelephony.aidl
b3177c135bb7a3db3318893335a9ac0bc39d9cf8 21-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 749c627f: Merge "Support for KSC5601 on SIM."

* commit '749c627fc0f30dd3db051f22f20b69a51dc19e59':
Support for KSC5601 on SIM.
aad6f806c5e3112eecc090272d76dce92a3bbcbb 16-Jun-2010 Erik Zivkovic <erik.zivkovic@sonyericsson.com> Support for KSC5601 on SIM.

Korean phones write to the ADN record of the SIM in a non-standard way.
When UCS2 is not used, the alphaTag will be written in the KSC5601
encoding. This contribution adds support for reading that format when
a Korean SIM card is used.

Also adds support for KSC5601 in SMS.

Change-Id: I81a4a6949359b4d23a937ac2d813bafed2b85ff6
om/android/internal/telephony/AdnRecord.java
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/SimRegionCache.java
om/android/internal/telephony/gsm/SmsMessage.java
a347afb90fc665cfb06542f19a9c8c16bdb04096 11-Dec-2010 John Wang <johnwang@google.com> Merge "Notify voicemail only for voice-capable device."
e98ca4a8585c237a99d0fbc5c44a59b14d06562f 11-Dec-2010 John Wang <johnwang@google.com> Notify voicemail only for voice-capable device.

Only allow voicemail waiting notification for
device supporting voice-capable service.

Bug: 3038102
Change-Id: I7ee1f973755f007cdcd87c4326bc55229a575598
om/android/internal/telephony/PhoneBase.java
9c1d5e997fd8a6b99e3dc1789170731c900abb6e 11-Dec-2010 John Wang <johnwang@google.com> Merge "Block SMS service for non-sms-capable device."
c049f9ad5b4f5bc32f368646e624aef7707b7252 10-Dec-2010 John Wang <johnwang@google.com> Block SMS service for non-sms-capable device.

If device doesn't support sms service, SMSDispatcher
will ignore incoming SMS in dispatching messge and return
ERROR_NO_SERVICE in sending sms messgae.

bug: 3250029
bug: 3038102
Change-Id: Ic72a9192aa128c43cf31da04907620bc680656c6
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
ffbce12056d0b817109fd63ccbe373db1e647d51 10-Dec-2010 Wink Saville <wink@google.com> Make activation rejection a non-permanent error.

Removed ACTIVATION_REJECT_GGSN and ACTIVATION_REJECT_UNSPECIFIED from
DataConnection#isPermanentFail() so they won't be detected as permanent.


bug: 3070773
Change-Id: I18d10bc44609e550d7932cd9600116f074bcb8dd
om/android/internal/telephony/DataConnection.java
41cb9d10de37fd05277288d2f01ad74ac11d2edf 09-Dec-2010 Wink Saville <wink@google.com> am a7404130: am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."

* commit 'a740413022baca3d2bc365ade40f73a1fee46654':
Fix for phone app crash in Icc Card.
a740413022baca3d2bc365ade40f73a1fee46654 09-Dec-2010 Wink Saville <wink@google.com> am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."

* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
Fix for phone app crash in Icc Card.
d0ffef4b43594e540cb867da18d4403b4f583622 09-Dec-2010 Wink Saville <wink@google.com> am 19b23afa: Merge "Fix for phone app crash in Icc Card."

* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
19b23afadf1053a8e06cb3444d9cdae3405ad9a1 09-Dec-2010 Wink Saville <wink@google.com> Merge "Fix for phone app crash in Icc Card."
488a0d5ece8d68a2a49117e698ecaa6de4faf6b9 09-Dec-2010 John Wang <johnwang@google.com> Merge "Add iDEN to getNetworkTypeName."
3345f27fbfb29fdcbdf77e311aa8ad0d4956f1cd 09-Dec-2010 Wink Saville <wink@google.com> am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"

* commit 'cc41b92ed7e66cc5d4e14f22b3ea914175d662ec':
frameworks/base/telephony: Release wakelock on RIL request send error
cc41b92ed7e66cc5d4e14f22b3ea914175d662ec 09-Dec-2010 Wink Saville <wink@google.com> am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"

* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
frameworks/base/telephony: Release wakelock on RIL request send error
0a5ae453e50144b31c7f544714feb5bbc7b77d18 09-Dec-2010 Wink Saville <wink@google.com> am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"

* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
7f7474ddd6170b68b8b58cc03b75df85c96f08f2 09-Dec-2010 Wink Saville <wink@google.com> Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
cc7605ce61c27e3688e33dbf2bcafd1c12788784 22-Oct-2010 Uma Maheswari Ramalingam <umam@codeaurora.org> Fix for phone app crash in Icc Card.

- Check for active phone in ICC handler before processing messages.

- Boundary check for gsm/cdma subscription app index
while retrieving the ICC Card App.

Change-Id: I3d54447e8d48e3482763e78eeb2a737a34cec321
om/android/internal/telephony/IccCard.java
60bb9c9a81bcd766d3e79f765ac22c7c38492409 22-Nov-2010 Anshul Jain <anshulj@codeaurora.org> frameworks/base/telephony: Release wakelock on RIL request send error

Android telephony does not release the partial wakelock right away if
there is an error in sending the RIL request. The wake lock is released
only after EVENT_WAKE_LOCK_TIMEOUT occurs that prevents the phone to go
in power collpase. The change is to release the wake lock as soon as the
error in send is detected.

Also, change RIL#send not not send a request if there is no connection to
vendor RIL, as the request will always fail.

Change-Id: Ia39a4b9ac12f4064e301a65abfd26409d49babe1
om/android/internal/telephony/RIL.java
ba82088b13aae4cdf1217e499eb9fb0eb6977da4 08-Dec-2010 Nick Kralevich <nnk@google.com> Merge "Modify emergency number detection"
055ed42e7062bd46820b8e629cda0b7cf9a4fb65 08-Dec-2010 Wink Saville <wink@google.com> am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"

* commit 'd9c7fde961dbb78f980be08b9be77b929630c897':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
d9c7fde961dbb78f980be08b9be77b929630c897 08-Dec-2010 Wink Saville <wink@google.com> am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"

* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
a00d89e824c523c51955176b61e50472828fd8b1 08-Dec-2010 Wink Saville <wink@google.com> am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"

* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
2b858caecb3c293c47b48eed12a55a49e3039874 08-Dec-2010 Wink Saville <wink@google.com> Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"
1234ce117adc6fef495688ed8032c43e77445f90 07-Dec-2010 Nick Kralevich <nnk@google.com> Modify emergency number detection

It's possible for an application to dial an emergency
number by appending extra digits to the phone number.

For example, one could dial "9111" instead of "911",
and a strict .equals wouldn't detect this as an emergency
number.

Replace .equals() with .startsWith()

Change-Id: I87f34fc2b9bbee2c4fa6be511bcc3b955559e0a9
ndroid/telephony/PhoneNumberUtils.java
e798268f16ec6d0542616ea45ca0bb18ae2645ee 07-Dec-2010 Wink Saville <wink@google.com> Have MobileDataStateTracker & DataConnectionTracker communicate directly.

Added CMD_SET_DATA_ENABLE which is sent when data is enabled/disabled
via the ConnectivityService. It is anticipated that the communication
channel will be used for additional commands and to receive unsoliciated
commands from DataConnectionTracker back to MobileDataStateTracker.

Change-Id: I3863e7385155d503f069b1dcb7e4f766ec78b5f8
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
c030a164c8a890947985d15722fe3df8785f7d04 07-Dec-2010 Chung-yih Wang <cywang@google.com> am c9cc9ab5: am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread

* commit 'c9cc9ab590ef879877e466c0b5f5823e11bb4c47':
Fix SIP bug of different transport/port used for requests.
c9cc9ab590ef879877e466c0b5f5823e11bb4c47 07-Dec-2010 Chung-yih Wang <cywang@google.com> am 5f86d7f5: Merge "Fix SIP bug of different transport/port used for requests." into gingerbread

* commit '5f86d7f50beba9f6327b8a04defe4e989a153d4a':
Fix SIP bug of different transport/port used for requests.
f053292d7a46c30abbe6f12ca04dbc03ec964d80 03-Nov-2010 Chung-yih Wang <cywang@google.com> Fix SIP bug of different transport/port used for requests.

bug: http://b/3156148
Change-Id: I4fa5b274d2e90ebde12d9e99822dc193a65bad32
om/android/internal/telephony/sip/SipPhone.java
4d76f364226cf049bfc850a339ea2cf63e3ae3e7 04-Dec-2010 John Wang <johnwang@google.com> Add iDEN to getNetworkTypeName.

For bug 2667143.

Integrated Digital Enhanced Network (iDEN) is a mobile telecommunications

technology which provides its users the benefits of a trunked radio and

a cellular telephone.

Change-Id: I4a1f5dbdd22a2c4ce5252688053ec4a47805d6b9
ndroid/telephony/TelephonyManager.java
d6c3838672f043984457c1352e878af5b3e6a79b 04-Dec-2010 John Wang <johnwang@google.com> Block incoming calls for non-voice-device.

For bug 3038102.

Non-voice capable means that this device doesn't support circuit-switched

phone calls over the telephony network. It blocks the new ringing

notification at PhoneBase level.

Change-Id: Ibef28dadae222c7ad169ee59e5c11a2c93e60e93
om/android/internal/telephony/PhoneBase.java
6ef74b1b073f04f55ef43095a336bd10d599dedf 02-Dec-2010 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Add reason field to DEACTIVATE_DATA_CALL request.

Commit 323f059d65db8413ee2ca8ce04533bc00e4f84e4 introduced a side effect that
PPP and MIP cannot be disconnected gracefully in case of 1X data calls.
The new disconnect reason field in DEACTIVATE_DATA_CALL will help RIL and Modem
to know whether the disconnect was done for modem shutdown or not. And
the followings can be achieved at the same time.

- Graceful PPP termination
- MIP de-registration
- RF Release Order with "Power Down De-registration" if modem is powered off.

(Also cleaned up the deprecated functions for setup/deactivate default PDP)

Change-Id: If79842ad05827326b6994e1148a6ae68b4467c45
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/test/SimulatedCommands.java
447a2b014b3dfdbd3294f07529d7758f81def73e 01-Dec-2010 John Wang <johnwang@google.com> am ae2a4419: am 4567847d: Add "canDial" check.

* commit 'ae2a44191188cde1dc4a1bbb0134d775f0dc4126':
Add "canDial" check.
ae2a44191188cde1dc4a1bbb0134d775f0dc4126 01-Dec-2010 John Wang <johnwang@google.com> am 4567847d: Add "canDial" check.

* commit '4567847d461afac08a80518637a0e48eff3c5247':
Add "canDial" check.
4567847d461afac08a80518637a0e48eff3c5247 16-Nov-2010 John Wang <johnwang@google.com> Add "canDial" check.

For bug #3164802.

CallManager allow a new phone call only if ALL of the following are true:

- Phone is not powered off
- There's no incoming or waiting call
- There's available call slot in either foreground or background
- The foreground call is ACTIVE or IDLE or DISCONNECTED.

Change-Id: I0124d600fd8c63b8c608301f3889b3faec47f1db
om/android/internal/telephony/CallManager.java
db4245291b15fd966b36c70f7f69ba4d22539803 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread

* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
Do not suppress error feedback during a SIP call.
1cc52df752eac527aa2bcd7be843d9d02d6bdbc4 01-Dec-2010 David Brown <dab@google.com> am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().

* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
Reduce the outrageous verbosity of CallerInfo.toString().
a4d785688c2b5a63322cf0554c0e7f5ae046e544 01-Dec-2010 David Brown <dab@google.com> am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread

* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
Fix bug 3121292: Contact photo not shown correctly for SIP calls
ed34b244f1665b604d2a291db504415b10a514d7 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread

* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
Do not suppress error feedback during a SIP call.
d7116ff1f0d1a3c14992273d0b899c3b71ba6d3f 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> Merge "Do not suppress error feedback during a SIP call." into gingerbread
4c11eee7ec3dafe943af7f4222e29b550163e58c 01-Dec-2010 David Brown <dab@google.com> am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().

* commit '04639ba0a939988d00131e61458807dac650f9c3':
Reduce the outrageous verbosity of CallerInfo.toString().
ebf28fa3f086bd5d3fa8d988fe4b8a8faeddd710 01-Dec-2010 Hung-ying Tyan <tyanh@google.com> am 0e58a952: am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread

* commit '0e58a9529895e270dae90e69486a59e41de714b8':
Throw proper exceptions in SipManager
04639ba0a939988d00131e61458807dac650f9c3 01-Dec-2010 David Brown <dab@google.com> Reduce the outrageous verbosity of CallerInfo.toString().

Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
om/android/internal/telephony/CallerInfo.java
b9c19be7c198dcdac7a37ea4af901af5179933d9 01-Dec-2010 David Brown <dab@google.com> am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread

* commit '91abcb624a6a873a2becbbf0f8186d6533daeb89':
Fix bug 3121292: Contact photo not shown correctly for SIP calls
91abcb624a6a873a2becbbf0f8186d6533daeb89 01-Dec-2010 David Brown <dab@google.com> Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
2ebb3a2d9b31213ced141c1807f60e13983f40dd 30-Nov-2010 Wink Saville <wink@google.com> am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread

* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
Fix GSM permanent failure handling, DO NOT MERGE.
0e58a9529895e270dae90e69486a59e41de714b8 30-Nov-2010 Hung-ying Tyan <tyanh@google.com> am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread

* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
Throw proper exceptions in SipManager
f316679971be356dbb01f991e95742bc5f2a8383 30-Nov-2010 Wink Saville <wink@google.com> Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
4189d99b6e4877352049b7447b7f0734ef99b9e8 24-Oct-2010 Hung-ying Tyan <tyanh@google.com> Do not suppress error feedback during a SIP call.

Bug: 3124788
Change-Id: Ia0a06f72336d1795515428eba0c9f875c32d13d1
om/android/internal/telephony/sip/SipPhone.java
0bba9535413f9ceefe03f1cef9ddaddccd05cae5 30-Nov-2010 Hung-ying Tyan <tyanh@google.com> Merge "Throw proper exceptions in SipManager" into gingerbread
d576483787589c92827623ffb46fc81d3a8c7dbb 25-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Make the internal data-disable mechanism internal

Break links to the outside world and limit its use.
A new public, persisted and separate mechanism will be coming soon.

Change-Id: Ia51a663125f7fe583e6d5d93bc2253f4e318847b
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
26f5a384d81487cc6bb80a78fb40d5e7e7ffc81e 25-Nov-2010 Wink Saville <wink@google.com> Use apn types instead of host when sending notifications.

Previously we were passing the apn host not the type and this
caused us to sometimes not send out network change notifications.

Also rename of getActivceApn to getActiveApnHost to make
the method clearer on what is being returned and add some debug.

A future change will rename ApnSetting.apn to ApnSetting.host
and getActiveApnString.

bug: 2995554
Change-Id: I0c405b0f823f62c9596968c8516b820d9f8a94f2
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
dd97d83ff74f47034039c34eae5245ee017820fb 24-Nov-2010 Wink Saville <wink@google.com> Promote ActiveApn and methods to DataConnectionTracker.

Also, add getActiveApnType.

Change-Id: If44d2c35617a1ad385a7e5b7c1028751ded3ead2
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
ac711639ae055405f9b4347bcdbd09880df4517f 24-Nov-2010 Wink Saville <wink@google.com> Merge "Promote ApnSetting to com.android.internal.telephony."
176935c6055fd652a6ab298a01d6377b928178cd 24-Nov-2010 Wink Saville <wink@google.com> Promote ApnSetting to com.android.internal.telephony.

Change-Id: I8244331c123ccb33704dd7ae8342327a1a3f7124
om/android/internal/telephony/ApnSetting.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
8503144665894f1b5008f540e0cf36c948c763ef 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 8484e57f to master

Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
8484e57f3006dd3aa925792e6414387c233c1a8d 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp

Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
804043193a46a79a8616fd7696fb781edb80b519 20-Nov-2010 Wink Saville <wink@google.com> Remove pingtest in GsmDataConnectionTracker.

The pingtest have been disabled since petit-four and ping's use is
being deprecated. Removing the ping test code, if needed use
InetAddress.isReachable instead.

bug: 1824738
Change-Id: I42b3de85b67b82dc6389e7a2234afa7b1d687209
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
434203a277cd2f237a71508a3d5a7d1602126cd5 12-Oct-2010 Robert Greenwalt <rgreenwalt@google.com> Notify all VMs when proxy changes.

bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
95bc625e294e14a651321b5172f31406cdebbefb 19-Nov-2010 Henrik Hall <henrik.hall@sonyericsson.com> Enabling cell broadcast (SMS-CB) support in the platform.

Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.

Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
ndroid/telephony/SmsCbMessage.java
ndroid/telephony/SmsManager.java
om/android/internal/telephony/ISms.aidl
om/android/internal/telephony/IccSmsInterfaceManagerProxy.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SmsCbHeader.java
a0d712694a8334ccc49b7995e234ee1cbdd75a66 19-Nov-2010 Wink Saville <wink@google.com> Use TextUtils.isEmpty to simplify code.

Change-Id: I189c7c124419373c747c42504e656343728d0a15
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
36d26c92908f0e181a05e700e7e212ce1baafa66 19-Nov-2010 Wink Saville <wink@google.com> Merge "Fix SPN_STRINGS_UPDATED_ACTION."
0fa0d40b25bd6fd199431a18f8d02a1c946f821c 19-Nov-2010 Wink Saville <wink@google.com> Fix SPN_STRINGS_UPDATED_ACTION.

Change EXTRA_SHOW_SPN and EXTRA_SHOW_PLMN to be false if spn and plmn
are null or empty respectively. For CDMA EXTRA_SHOW_SPN is always false.

bug: 3191159
Change-Id: Ic13b946cee10b123ec4960f2d22e13c8cb1dd20d
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
9314feb971f553b531045201c2ee19b13c8e39a7 18-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 977d01f3: am 27c06bab: Merge "Release reference when putting RILRequest back into the pool."

* commit '977d01f392d820da82e9bfdc00166302ca4d21f7':
Release reference when putting RILRequest back into the pool.
977d01f392d820da82e9bfdc00166302ca4d21f7 18-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 27c06bab: Merge "Release reference when putting RILRequest back into the pool."

* commit '27c06bab513a1893444d50bb5dedbad5c0100029':
Release reference when putting RILRequest back into the pool.
ae95eaeb432042c617e5d8667b2afa32edb47a68 18-Nov-2010 Wink Saville <wink@google.com> Merge "Fix GSM permanent failure handling."
076113130608a3def67bc71809527b34ba1e3888 18-Nov-2010 Wink Saville <wink@google.com> Fix GSM permanent failure handling.

Wait until all APN's have been tried before checking for permanent errors
and then, don't do retires only if all of the APN's had permanent errors.

Also, don't disable the requested apn type because if we do we won't
be able to setup data because there won't be an apn type.

This was tested by creating a new non existent APN, I chose:
Name="badapn1"
APN="badapn1"
Server="noapn.com"

Then selecting "badapn1" will cause a permanent error.

bug: 3202729
Change-Id: I0a2160a852c5dcdd07ae06f93b3b77c29406af4b
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a20d02c2e1a13c8cfb1ed4ed2dff84a29080d4e4 18-Nov-2010 Wink Saville <wink@google.com> Fix GSM permanent failure handling, DO NOT MERGE.

Wait until all APN's have been tried before checking for permanent errors
and then, don't do retires only if all of the APN's had permanent errors.

Also, don't disable the requested apn type because if we do we won't
be able to setup data because there won't be an apn type.

This was tested by creating a new non existent APN, I chose:
Name="badapn1"
APN="badapn1"
Server="noapn.com"

Then selecting "badapn1" will cause a permanent error.

bug: 3202729
Change-Id: I182c7197456c849176ce08d7d1459359f8c3b30e
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
6c97eba1b73dd6ddcb976b3ea9147b35a13b5afd 17-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> Merge "SIP calls should set the audio mode to MODE_IN_COMMUNICATION"
5644b080741bb4fae103617ecbea7a62b0262a56 17-Nov-2010 Kenny Root <kroot@google.com> Don't waste resources creating new Boolean objects

There's a static Boolean.TRUE and Boolean.FALSE that can be used without
instantiating a new Boolean object unnecessarily.

Change-Id: I30a6c6514faae0ebeb6b571bf741db6814b8cc78
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
42c5a5ed4f91705e39945d3c88c87a55b50f8302 17-Nov-2010 Jean-Michel Trivi <jmtrivi@google.com> SIP calls should set the audio mode to MODE_IN_COMMUNICATION

Audio mode MODE_IN_CALL is reserved for telephony.

Change-Id: I66cb9ff746ad9c15b2ce3b5a6de6c69f56654d15
om/android/internal/telephony/CallManager.java
e613adcc555731aab2a0684d709da3d0df97a9e5 17-Nov-2010 Wink Saville <wink@google.com> Cleanup some debug output.

Change-Id: Iac39e7ffb1f7409647ce112f9347c42d2909846a
ndroid/telephony/ServiceState.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
45f8b8bd04faa66d61f6f6d9def0b81763c9e329 12-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Merge "Make getDataEnabled take more into account."
7ef3361adc9280d7b43f0f7dcbe1371a0da68a5a 12-Nov-2010 Wink Saville <wink@google.com> GsmServiceStateTracker#getPhone should be protected not public.

Change-Id: Ie8c1ac0a38616e4794aa51b9b642d9b22008b9ff
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
ec44c26f42c828ce98117d280c7bd4e54bde39b1 12-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Make getDataEnabled take more into account.

getDataEnabled and getAnyDataEnabled ignored mMasterDataEnabled.
bug: 2216392

Change-Id: Ic3ae0808d2a02057ddf5056d3e01f754f2e57f5c
om/android/internal/telephony/DataConnectionTracker.java
a6689ddbba5d7d5e9ad7a07ae84a187497f18121 11-Nov-2010 John Wang <johnwang@google.com> am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread

* commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def':
Fix the audio mode glitch during hangup.
1ed7d65b5d781d10de91a199fbd94d6d445d1def 11-Nov-2010 John Wang <johnwang@google.com> am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread

* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
Fix the audio mode glitch during hangup.
d19f44f3e384114a16df2facb3aeec392cd39a60 11-Nov-2010 John Wang <johnwang@google.com> Fix the audio mode glitch during hangup.

Fix bug # 3136179.

Keep audio mode as IN_CALL during hangup DISCONNECTING state

to prevent the NORMAL and IN_CALL glitch in auiod setMode.

Change-Id: I5513a3d5c65bd13ac054c9718c4dbd7d6db9eaf3
om/android/internal/telephony/CallManager.java
8e7e0a9fd5c377294bfe2e09fca9b7551871f3c2 09-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Fix data state change callbacks

Initial state should be unknown or we miss the first connected change.
Don't send a disconnected msg when changing network types.
Filter out redundent disconnects.
Add some logging.

bug:3060742
Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneNotifier.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
3611e5c9399e8459e1bc7119ac45865ddd6ff5be 04-Nov-2010 Wink Saville <wink@google.com> Allow DataConnectionTrackers to manage multiple data connections.

This is the first step to allow simultaneous data connections.

Bug: 2441767
Change-Id: Ia625cfe94b771a6958401adca84b80543fbdb35c
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
26ba12490347f34a0aa3a2ee2370d60d24f5f7d0 04-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Merge "Add some network/phone type constants."
962a990a45a2a9f9c3002064e71f9c2fed86acf1 02-Nov-2010 Robert Greenwalt <rgreenwalt@google.com> Add some network/phone type constants.

Support for LTE (and SIP-based voice) and the stepping-stone eHPRD.

bug:3125398
Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/TelephonyManager.java
8d1b2a17d9935819ec96f1b5fca0e9945f564eaa 03-Nov-2010 Hung-ying Tyan <tyanh@google.com> Throw proper exceptions in SipManager

instead of silently returning null and causing NPE in applications as returning
null is not documented in the javadoc.

Add connection to the connection list in SipCall after dial() succeeds so that
we don't need to clean up if it fails. The original code will cause the failed
connection to continue to live in the SipCall and in next dial() attempt, a new
connection is created and the in-call screen sees two connections in the call
and thus shows conference call UI.

Bug: 3157234, 3157387
Change-Id: Iabc3235f781c4f1e09384a67ad56b09ad2c12e5e
om/android/internal/telephony/sip/SipPhone.java
ed4f28b492da3ff140bbaabbbda798a08c40ea5b 30-Oct-2010 Irfan Sheriff <isheriff@google.com> Set country code in the driver and remove channel set

With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
om/android/internal/telephony/MccTable.java
om/android/internal/telephony/PhoneBase.java
ee7d1973ff3cd7c9c8744696901b37833027cafb 12-Oct-2010 Rekha Kumar <rekhak@codeaurora.org> Telephony: Add support to read 3GPP2 sms from CSIM/RUIM

Add parser to parse 3GPP2 format sms stored in CSIM/RUIM card

Change-Id: I4720ba7602fcc1b078de0d5fea34247541242c1c
om/android/internal/telephony/cdma/SmsMessage.java
4d396052deb54399cbadbeb8abd873df6f3af342 30-Oct-2010 Jeff Brown <jeffbrown@google.com> Fix policy issues when screen is off.

Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).

Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.

Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.

Fixed a couple of issues where media keys were being handled inconsistently
or not at all, particularly in the case of the new PAUSE, PLAY
and RECORD keys.

Bug: 3144874
Change-Id: Ie630f5fb6f128cfdf94845f9428067045f42892c
om/android/internal/telephony/ITelephony.aidl
fd2d01302781af91d77557a99874111a4fee8365 28-Oct-2010 Wink Saville <wink@google.com> Add PhoneStateListener.onOtaspChanged.

Bug: 3102320
Change-Id: I46e8d33a4ed80e5e074e92135653d57598d4c865
ndroid/telephony/PhoneStateListener.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneNotifier.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
3ffccab78666d8960c10a00239de6bb40f4fb1b6 27-Oct-2010 Johannes Carlsson <johannes.carlsson.x@sonyericsson.com> Release reference when putting RILRequest back into the pool.

In order to reduce object creation the RILRequest objects are
stored in an array when it is unused (max 4). This avoids GC
of the object. The object in turn has references to other
objects which sometimes hold large memory chunks. This fix
releases these references since they are not used anyway.

This will make it possible to GC the Message (mResult) which
in some cases holds references to a Bitmap which sometimes
leads to OutOfMemoryException. The reference is cleared
anyway in RILRequest.obtain(...)

Change-Id: I3b895bc39b5e2f3ab7cc8297c3583ea78e0ebc77
om/android/internal/telephony/RIL.java
85e0ff8f3d6e66b0d943851f478863c7afa71e16 22-Oct-2010 David Brown <dab@google.com> Fix bug 3121292: Contact photo not shown correctly for SIP calls

The problem was that when we did a contact lookup based on a SIP address,
the resulting CallerInfo object did not have the person_id field set
correctly. That meant we had no way to look up the photo for that person.

This was because of a missing case in the logic to determine which column
(in the resulting cursor) to use for the person_id lookup. We were
handling lookups fine in the PhoneLookup and Phone tables, but were
missing a case for direct lookups in the Data table (which is how we look
up SIP addresses.)

The fix is to add a case for URIs like
"content://com.android.contacts/data" when looking up the person_id.

Also, since the person_id lookup is pretty hairy (and includes ~20 lines
of comments to explain what it's doing!) refactor it out into a helper
method.

TESTED: Both SIP and PSTN calls; verified that contact name *and* photo
are displayed correctly in all cases.

Bug: 3121292
Change-Id: I2b0083cc5394c1a49bbdc9a4e5651854aedb82f7
om/android/internal/telephony/CallerInfo.java
977d3622516aa052060837085d1b835303be78ed 26-Oct-2010 Eric Laurent <elaurent@google.com> am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
ecae8a43b71a59ef2a4dcd2b3e5ffa248c37d53e 26-Oct-2010 Eric Laurent <elaurent@google.com> am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread
164a8f86c7e48992691368c4895709c3bdb835a4 26-Oct-2010 Eric Laurent <elaurent@google.com> Partial fix for issue 3124895.

When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
om/android/internal/telephony/CallManager.java
a35827a8e92c79e200610e93549d7191fe701b19 22-Oct-2010 John Huang <jsh@google.com> am 33051ad1: am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread

Merge commit '33051ad1785a84ad5d814d6acf337b54d5fab36c'

* commit '33051ad1785a84ad5d814d6acf337b54d5fab36c':
Fix connect duration for un-established SIP calls.
2cef210f53ac9ca5471e87fa02db252442448b7d 21-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 940b4d1c: am 6037a056: Fix n-way conf call in SipPhone.

Merge commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8'

* commit '940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8':
Fix n-way conf call in SipPhone.
33051ad1785a84ad5d814d6acf337b54d5fab36c 21-Oct-2010 John Huang <jsh@google.com> am 7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread

Merge commit '7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp

* commit '7dc08fb070ff7455e794fc81645ccb4349cd152f':
Fix connect duration for un-established SIP calls.
6967f0960449ac531880cc3e1a7312d45d774b62 21-Oct-2010 Jeff Hamilton <jham@android.com> am e55806a5: am 23392a84: Fix the build.

Merge commit 'e55806a55561c992086ddff717aca27206fa0c5d'

* commit 'e55806a55561c992086ddff717aca27206fa0c5d':
Fix the build.
fbd21b5875285725c434fc7d0145e919d0133946 21-Oct-2010 Hung-ying Tyan <tyanh@google.com> am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and...

Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
Do another contact lookup if the first one fails and...
821f087989a75ce9e04dc8dcc99b227fde0a0e28 21-Oct-2010 Hung-ying Tyan <tyanh@google.com> am fd0ba81c: am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread

Merge commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d'

* commit 'fd0ba81c02c0881f7534333afc8c53e241158a3d':
Silently reject a ringing call when another call is dialing/ringing.
164cd438fb21e82d0aacc06da940041f0b7f6a2c 21-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 51028569: am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread

Merge commit '5102856947595cffc1cceb11b9e4c5baf70b2e82'

* commit '5102856947595cffc1cceb11b9e4c5baf70b2e82':
Remove ringtone API from SipAudioCall.
4e00a8d5826c5a81d5c9b4a5f6c4ee40e00e5426 21-Oct-2010 Hung-ying Tyan <tyanh@google.com> am e894ff7a: am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread

Merge commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38'

* commit 'e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38':
Return display name in SipConnection.getCnapName().
385a753dead6ef15f2e30eae47f73e642b3ef7ed 21-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> resolved conflicts for merge of 368fdba4 to master

Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
5d9e3bbb9d076544b20032372a07ac26d7a86709 21-Oct-2010 Hung-ying Tyan <tyanh@google.com> Fix connect duration for un-established SIP calls.

Bug: 3118364
Change-Id: I931b675de04a3aac70b45d6bae27ab42a84f2d1e
om/android/internal/telephony/sip/SipConnectionBase.java
940b4d1c4548d3296ac9fc66cce0cc213b5aa8a8 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 6037a056: Fix n-way conf call in SipPhone.

Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
Fix n-way conf call in SipPhone.
e55806a55561c992086ddff717aca27206fa0c5d 20-Oct-2010 Jeff Hamilton <jham@android.com> am 23392a84: Fix the build.

Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
Fix the build.
d691b36cdea314585b6aa17556ed4c35bb65a69e 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 6fe795ec: Do another contact lookup if the first one fails and...

Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
Do another contact lookup if the first one fails and...
fd0ba81c02c0881f7534333afc8c53e241158a3d 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread

Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
Silently reject a ringing call when another call is dialing/ringing.
5102856947595cffc1cceb11b9e4c5baf70b2e82 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread

Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
Remove ringtone API from SipAudioCall.
6037a056ea0dda27a286ddcb527b323b58a1c7c7 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> Fix n-way conf call in SipPhone.

+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.

Bug: 3114987

Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
om/android/internal/telephony/sip/SipPhone.java
23392a84bcb961d3fd50142ec40ce6ac6db89018 20-Oct-2010 Jeff Hamilton <jham@android.com> Fix the build.

Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
om/android/internal/telephony/CallerInfoAsyncQuery.java
6fe795ecd35c4d49822d349424fc71b660577dfc 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> Do another contact lookup if the first one fails and...

it's a SIP call and the peer's username is all numeric. The all-numeric username
could be a PSTN number.

Bug: 3105116 (case #2)

Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
88e3f0ad28c40eb1c76fa996277e64996acd9b03 19-Oct-2010 Hung-ying Tyan <tyanh@google.com> Silently reject a ringing call when another call is dialing/ringing.

http://b/issue?id=3109483
http://b/issue?id=3103072

Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
om/android/internal/telephony/CallManager.java
9b449e5606786f7c197679f8f9d25985308bfb72 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> Remove ringtone API from SipAudioCall.

(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
om/android/internal/telephony/sip/SipPhone.java
e894ff7a7693fdc406b4f4b28cfd1d9d7d966b38 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread

Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp

* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
Return display name in SipConnection.getCnapName().
b595e094e3901ff8a224eaf7d4869e7d2e5649dd 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> Merge "Return display name in SipConnection.getCnapName()." into gingerbread
538e58fc757b0d10672235bc17b1380854845139 20-Oct-2010 Hung-ying Tyan <tyanh@google.com> Return display name in SipConnection.getCnapName().

Bug: 3105116 (case #1)

Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
om/android/internal/telephony/sip/SipPhone.java
368fdba47a49f249aa4346edaf3f45291ca6a7ff 19-Oct-2010 Joe Onorato <joeo@google.com> am bdf1706a: Merge "Reduce logging." into gingerbread

Merge commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306' into gingerbread-plus-aosp

* commit 'bdf1706ac680c0fe74765b8d6d34823b8ac05306':
Reduce logging.
431bb2269532f2514861b908d5fafda8fa64da79 19-Oct-2010 Joe Onorato <joeo@google.com> Reduce logging.

Remember, the system and main logs are
- Shared resources
- Primarily for recording problems
- To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
om/android/internal/telephony/CallerInfoAsyncQuery.java
97d88927f28226403ff7e5befe1a5486b5fc8725 15-Oct-2010 David Brown <dab@google.com> am e3c50a54: am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread

Merge commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a'

* commit 'e3c50a5470f64fd99438d6fd985f88d9fe20919a':
Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
1b422d8cd8ed83b79e977a3afb99969cea4a6700 14-Oct-2010 Wink Saville <wink@google.com> am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread

Merge commit '090ac9f7dd883aa75c899745182471d409a2b762'

* commit '090ac9f7dd883aa75c899745182471d409a2b762':
Remove some PII.
b57832140ef7542a9e6f4f69f48efbfe80200c43 14-Oct-2010 John Wang <johnwang@google.com> am 7a26ebdf: am 844a6b3c: Turn off additional debug.

Merge commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef'

* commit '7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef':
Turn off additional debug.
e3c50a5470f64fd99438d6fd985f88d9fe20919a 14-Oct-2010 David Brown <dab@google.com> am cebe5b2e: Merge "Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)" into gingerbread

Merge commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76' into gingerbread-plus-aosp

* commit 'cebe5b2e01f8ebbf9089aebc386caecea232df76':
Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)
d34d30ac2e5d7fc0ee0592187492acd3d52a2545 12-Oct-2010 David Brown <dab@google.com> Reduce CallerInfoAsyncQuery logging in user builds (STOPSHIP cleanup)

Bug: 3095005

Change-Id: Ide96756282d17252fac16a27cc184ea314a8b31a
om/android/internal/telephony/CallerInfoAsyncQuery.java
99f92ac7a4e5907553cf737817bef06e429534a3 14-Oct-2010 Hung-ying Tyan <tyanh@google.com> am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.

Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'

* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
Keep original phone number in SipConnection.
090ac9f7dd883aa75c899745182471d409a2b762 12-Oct-2010 Wink Saville <wink@google.com> am a3100314: Merge "Remove some PII." into gingerbread

Merge commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6' into gingerbread-plus-aosp

* commit 'a310031438877a7b70a6ac30eb2f2b33e06907e6':
Remove some PII.
a42880749b368e60caee77dd682d434e48ca96bd 12-Oct-2010 Wink Saville <wink@google.com> Remove some PII.

Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/gsm/SIMRecords.java
7a26ebdf0d5ba62c06ca0b8cb2b3280f008885ef 12-Oct-2010 John Wang <johnwang@google.com> am 844a6b3c: Turn off additional debug.

Merge commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e' into gingerbread-plus-aosp

* commit '844a6b3ccaff1ad1443ad985e4527b733ce97c0e':
Turn off additional debug.
844a6b3ccaff1ad1443ad985e4527b733ce97c0e 12-Oct-2010 John Wang <johnwang@google.com> Turn off additional debug.

Bug:3038245
Change-Id: If3c894511b4bbfd0d3e95b51aeca299edbbcf55d
om/android/internal/telephony/CallManager.java
f5b7c855fbb69e8614dab5ca15639228a2428784 12-Oct-2010 Hung-ying Tyan <tyanh@google.com> am f5201ab7: Keep original phone number in SipConnection.

Merge commit 'f5201ab71ff4d104265ab126e86afc6b81da8011' into gingerbread-plus-aosp

* commit 'f5201ab71ff4d104265ab126e86afc6b81da8011':
Keep original phone number in SipConnection.
f5201ab71ff4d104265ab126e86afc6b81da8011 12-Oct-2010 Hung-ying Tyan <tyanh@google.com> Keep original phone number in SipConnection.

In case it's a PSTN number carried by an Internet call, the phone app can still
get the original phone number from Connection.getAddress() instead of getting a
SIP URI.

http://b/issue?id=3085996

Change-Id: Ie6c66100a4b5b2ce3f73baa1b446761cd51d7727
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
81bef57f6d77d64d914e14f77ee9594f1a390077 12-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 5bf55c80: am 0e430ccc: Merge "Telephony: Fix radio state printing"

Merge commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f'

* commit '5bf55c801dfd67e8cf98278f3590d352f9e6d64f':
Telephony: Fix radio state printing
a23935ab334b2dec47735608383608ca3093b4b2 12-Oct-2010 David Brown <dab@google.com> am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone

Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
Don't manually create CallerInfo objects from SipPhone
2b4b3bd4b45255a21ff296271c02167a800a3958 11-Oct-2010 John Wang <johnwang@google.com> am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread

Merge commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6'

* commit '5a41b3f8aa788f164af495bac6dc2666568f4cb6':
Fix startDtmf.
5bf55c801dfd67e8cf98278f3590d352f9e6d64f 11-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 0e430ccc: Merge "Telephony: Fix radio state printing"

Merge commit '0e430ccc2c8a4bb9d96002676d7742652bd28477' into gingerbread-plus-aosp

* commit '0e430ccc2c8a4bb9d96002676d7742652bd28477':
Telephony: Fix radio state printing
0e430ccc2c8a4bb9d96002676d7742652bd28477 11-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Telephony: Fix radio state printing"
334a4d84df457f0b2b6f89a6930c9ec05a637e5a 11-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Telephony: Remove unused mRuimFileHandler reference from CDMAPhone"
d755d11e93f1281c42968ab68c6494e33d26cbe7 11-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"

Merge commit '965d533733f0c5cd9c02813e32737b0b0ce552d0'

* commit '965d533733f0c5cd9c02813e32737b0b0ce552d0':
NullPointerException at handleMessage(GSMPhone.java)
bd6d5098a7995429713ae0ae43b3f666f7b9aed3 11-Oct-2010 David Brown <dab@google.com> am d07833f5: Don\'t manually create CallerInfo objects from SipPhone

Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
Don't manually create CallerInfo objects from SipPhone
d07833f54b6e8e361b666ae16efa15fdf60159de 08-Oct-2010 David Brown <dab@google.com> Don't manually create CallerInfo objects from SipPhone

Currently the SipPhone class manually creates a CallerInfo object, and
populates it with very basic info from the SIP address, when making an
outgoing call.

But this is no longer needed, now that we do caller-id lookup properly for
SIP addresses (based on real data from the contacts database -- see
bug 3004127 and change https://android-git.corp.google.com/g/70555).
And in fact the presence of this initial CallerInfo object actually
*disabled* contacts lookup for outgoing calls (bug 3072731).

This change removes all that CallerInfo-related stuff from SipPhone.

(Thus SipPhone is now consistent with the other phone objects, like
GSMPhone and CDMAPhone, in that it doesn't muck with CallerInfo data at
all, but instead lets the phone app do it.)

Also, update isUriNumber() to handle "%40" in case the passed-in string is
URI-escaped. (Nobody depends on that now, but it may be needed in the
future, and it's certainly safe to say that "%40" will never be found in a
legal PSTN number.)

TESTED:
- Outgoing SIP call:
- In-call UI shows correct contact info
- After the call, Call Log shows correct contact info

- Incoming SIP call:
- In-call UI shows correct contact info
- After the call, Call Log shows correct contact info

- PSTN calls:
- correct contact info everywhere

Bug: 3072731

Change-Id: I51434e4e5ad66d2e8ff51fc220001fb74485f0f5
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/sip/SipPhone.java
5a41b3f8aa788f164af495bac6dc2666568f4cb6 10-Oct-2010 John Wang <johnwang@google.com> am df512214: Merge "Fix startDtmf." into gingerbread

Merge commit 'df5122147c6e1c988c6a8504e71501cbbece5298' into gingerbread-plus-aosp

* commit 'df5122147c6e1c988c6a8504e71501cbbece5298':
Fix startDtmf.
864032f9512aeb193f31242d5a8aa6850216f249 10-Oct-2010 John Wang <johnwang@google.com> Fix startDtmf.

Call correct startDtmf() function.

Bug: 3033030

Change-Id: Ia90311ac5d2e4b070a28533c865c81dc90326557
om/android/internal/telephony/CallManager.java
264c2cfe4dc5837213e4b031c13cf9f17025d779 10-Oct-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 5df4b5a7 to master

Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2
3201b398d1647da17cd7f00fb12cdc0805eea143 10-Oct-2010 Wink Saville <wink@google.com> am 2e99245e: am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread

Merge commit '2e99245e0e0d64ba6ab9227154c7fad132559c01'

* commit '2e99245e0e0d64ba6ab9227154c7fad132559c01':
Changed handling of onQueryCompelete to not use mimeType.
965d533733f0c5cd9c02813e32737b0b0ce552d0 08-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"

Merge commit '38f534882eb9214b4c1a8035990157f941762f85' into gingerbread-plus-aosp

* commit '38f534882eb9214b4c1a8035990157f941762f85':
NullPointerException at handleMessage(GSMPhone.java)
026284745bb2f84e96fe132071f48a8cd4c1e715 08-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread

Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'

* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
CallManager/SipPhone: fix reject a ringing call
aeab76c5be62ad4289e5b27937affd4460d588b3 08-Oct-2010 Babis Triantafyllou <babis.triantafyllou.x@sonyericsson.com> NullPointerException at handleMessage(GSMPhone.java)

NullPointerException at
com.android.internal.telephony.gsm.GSMPhone.handleMessage(GSMPhone.java)
Failing to retrieved the IMSI number from SIM card could lead to
an exception. A null pointer check will prevent this.

Change-Id: I26760543484504c8d35215bfb1e8f1ae664aeade
om/android/internal/telephony/gsm/GSMPhone.java
5df4b5a78b530fb1d8d851e4a833c5acfb3a7a60 07-Oct-2010 John Wang <johnwang@google.com> am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread

Merge commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630' into gingerbread-plus-aosp

* commit '08fb5851bbaf11ecac0cac0de321942bfbf6a630':
Add flag to skip restoring network seletion.
35c4c211e0c9278c50cdb53477e686869b30fad4 07-Oct-2010 John Wang <johnwang@google.com> Add flag to skip restoring network seletion.

For bug 3045366.

Change-Id: I7ad9ff89b0a77df473b638ad917b363c42de5405
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
2e99245e0e0d64ba6ab9227154c7fad132559c01 07-Oct-2010 Wink Saville <wink@google.com> am bbc80d34: Merge "Changed handling of onQueryCompelete to not use mimeType." into gingerbread

Merge commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc' into gingerbread-plus-aosp

* commit 'bbc80d3436ee52f28bd26f1f0cb01dc4dd183ccc':
Changed handling of onQueryCompelete to not use mimeType.
2e27a0be78bd9510785789caa14baa029051ca20 07-Oct-2010 Wink Saville <wink@google.com> Changed handling of onQueryCompelete to not use mimeType.

Using mimeType causes an IPC request to contacts which can
be slow. This can cause an ANR of the Phone app. This change
parses the URL and to decide which column to use for the person_id
and thus should not cause an ANR.

bug: 3060704
Change-Id: I750c72746c7269e162f0338c0a3e00230a600519
om/android/internal/telephony/CallerInfo.java
f209cd70623f837026fb6c41e40a421291be62d0 07-Oct-2010 Hung-ying Tyan <tyanh@google.com> am a785a59c: am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread

Merge commit 'a785a59c831256f274627f8f8eb77f9d54508916'

* commit 'a785a59c831256f274627f8f8eb77f9d54508916':
SIP: add SERVER_UNREACHABLE error code.
ed5d7d17c9e9837ce7a6a10698cce9f6e4101acd 02-Oct-2010 Irfan Sheriff <isheriff@google.com> Add LinkAddress

LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
om/android/internal/telephony/DataConnection.java
88b4bd5f3e8d6e68541eec4a603b1df83291cf1f 06-Oct-2010 Hung-ying Tyan <tyanh@google.com> am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread

Merge commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp

* commit 'fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
CallManager/SipPhone: fix reject a ringing call
fc7e7766e7d6a49d31426f821c0a56168c0d75cc 06-Oct-2010 Hung-ying Tyan <tyanh@google.com> Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
17956e626b38ce53da61e78af2c973ed41c9e461 01-Oct-2010 Hung-ying Tyan <tyanh@google.com> CallManager/SipPhone: fix reject a ringing call

+ CallManager: fix getFirstActiveRingingCall(), getActiveFgCall(), getFirstActiveBgCall()
+ Set DisconnectCause to be INCOMING_REJECTED when a call is rejected

http://b/issue?id=3049671

Change-Id: Ica1d81ca4b71ab0ceb2ab437b82bbb4ccf86fe92
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/sip/SipPhone.java
2f65a99fdc75dfe2fd3563fb2ce6af922da54ed1 05-Oct-2010 Mike Lockwood <lockwood@google.com> Merge changes Ic5551c94,I0207f7f7 into gingerbread

* changes:
GPS: Clean up GPS API extension initialization in JNI code.
GPS: Add support for AGpsRilInterface.
b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6 05-Oct-2010 Robert Greenwalt <robdroid@android.com> am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread

Merge commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp

* commit '45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
Add supporting MCC=450(Korea)
45a8901dc3ae12ad818ac2afdd63fe712769cb3b 05-Oct-2010 Robert Greenwalt <robdroid@android.com> Merge "Add supporting MCC=450(Korea)" into gingerbread
1e84da822e7aa4d494b31c8759917d2751611f84 27-Jul-2010 Miguel Torroja <migueltb@broadcom.com> GPS: Add support for AGpsRilInterface.

Adding changes to be able to have access to missing data to SUPL
(celld, imsi, WAP_PUSH and SMS)

Change-Id: I0207f7f7ea6595ed3fd7021cb732feddf52e4cf9
Signed-off-by: Mike Lockwood <lockwood@android.com>
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
a785a59c831256f274627f8f8eb77f9d54508916 05-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread

Merge commit '718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp

* commit '718e0033e69fa7d1db12242324ab9098ac430bf5':
SIP: add SERVER_UNREACHABLE error code.
c6548fd9eda7b58f5a2e2a9c01e3c7cafd42fafb 05-Oct-2010 Hung-ying Tyan <tyanh@google.com> SIP: add SERVER_UNREACHABLE error code.

Let SipSession return it when UnknownHostException is caught.
Add DisconnectCause.SERVER_UNREACHABLE in Connection and have SipPhone report
it when receiving SERVER_UNREACHABLE from SipSession.

http://b/issue?id=3061691

Change-Id: I944328ba3ee30c0a9386e89b5c4696d4d9bde000
om/android/internal/telephony/Connection.java
om/android/internal/telephony/sip/SipPhone.java
aeba1bc0c333f145469fc17a10c0bbcebd6dc30b 02-Oct-2010 Hung-ying Tyan <tyanh@google.com> Revert "Revert "resolved conflicts for merge of 8788d140 to master""

This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/CallFailCause.java
om/android/internal/telephony/sip/CallProxy.java
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
bdf11be97bd732e8891ae19342c937da6e659afa 02-Oct-2010 Jason Chen <jasonchen@google.com> Revert "resolved conflicts for merge of 8788d140 to master"

This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/CallFailCause.java
om/android/internal/telephony/sip/CallProxy.java
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
2874c3dec4f9ffd59b2be3de62c1148534396828 01-Oct-2010 Hung-ying Tyan <tyanh@google.com> resolved conflicts for merge of 8788d140 to master

Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
cc8c6496b7c0f0827aac57eef40c54b6412a7da6 02-Oct-2010 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 3543a40b to master

Change-Id: I307c8f1277b84763e537ced0ac3410ec06fce431
8788d140363ed921f49d366d67bd7164e63e54ae 02-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 306137d9: SIP telephony cleanup.

Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp

* commit '306137d97f40a4f807c54a75210343c9262360d1':
SIP telephony cleanup.
3543a40b24c4256413ef6bbc3017792ca3e4a2e6 02-Oct-2010 Jake Hamby <jhamby@google.com> am 7888486d: Merge "Add subaddress to SMS fingerprint calculation."

Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp

* commit '7888486d1c930301535069bd90bb0bf3525b2bb5':
Add subaddress to SMS fingerprint calculation.
7888486d1c930301535069bd90bb0bf3525b2bb5 02-Oct-2010 Jake Hamby <jhamby@google.com> Merge "Add subaddress to SMS fingerprint calculation."
306137d97f40a4f807c54a75210343c9262360d1 01-Oct-2010 Hung-ying Tyan <tyanh@google.com> SIP telephony cleanup.

+ Remove unused classes.
+ Remove unused imports.
+ Remove unused code.
+ add DEBUG flag.

Change-Id: Ie1236d909d971093b68b066d3d8c1857ac89f56f
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/CallFailCause.java
om/android/internal/telephony/sip/CallProxy.java
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
3621be68a2f4912c76b08cd1a9df8601006215b9 02-Oct-2010 Jake Hamby <jhamby@google.com> am edec27a1: am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."

Merge commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9'

* commit 'edec27a1e9ffc022e68f0d6200ba90499da4b9e9':
Do not explicity disconnect Data during power down for 1x.
b6153a067ca6ec8affd782404525d6443e5f99b0 02-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 86a12d46: am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread

Merge commit '86a12d465fca7d25d99a788abda33fde5154a739'

* commit '86a12d465fca7d25d99a788abda33fde5154a739':
Add CallManager/Phone.setEchoSuppressionEnabled().
edec27a1e9ffc022e68f0d6200ba90499da4b9e9 02-Oct-2010 Jake Hamby <jhamby@google.com> am d531c9eb: Merge "Do not explicity disconnect Data during power down for 1x."

Merge commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a' into gingerbread-plus-aosp

* commit 'd531c9ebe18f0b554d29d3c3b8e4a00f84dae97a':
Do not explicity disconnect Data during power down for 1x.
86a12d465fca7d25d99a788abda33fde5154a739 02-Oct-2010 Hung-ying Tyan <tyanh@google.com> am 10e2120b: Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread

Merge commit '10e2120bdd2d99e100db187d49ac6a8495c7f956' into gingerbread-plus-aosp

* commit '10e2120bdd2d99e100db187d49ac6a8495c7f956':
Add CallManager/Phone.setEchoSuppressionEnabled().
10e2120bdd2d99e100db187d49ac6a8495c7f956 01-Oct-2010 Hung-ying Tyan <tyanh@google.com> Merge "Add CallManager/Phone.setEchoSuppressionEnabled()." into gingerbread
dc71b9e4d67327065a992924a021cad4bc100fa2 01-Oct-2010 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 6a3eddb4 to master

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
64cb04a9e6a999c7f45116053b08a7a8d37926b4 01-Oct-2010 Sang-il, Lee <gendoh@google.com> Add supporting MCC=450(Korea)

Change-Id: I009f77b064b8bb7f5bd055ac6e7c55a8f608e9d7
om/android/internal/telephony/MccTable.java
980d40b568bf976eed8de7c035c2e30ddc67fa89 01-Oct-2010 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 738aadd7 to master

Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
6a3eddb469b282f7d904e5dbcb375ad44ada3ee3 01-Oct-2010 Dianne Hackborn <hackbod@google.com> am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread

Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
Rub in a little 'ol log-b-gone.
0a69f597604254bc37721b135ab612eaacdd0cbd 01-Oct-2010 Dianne Hackborn <hackbod@google.com> Merge "Rub in a little 'ol log-b-gone." into gingerbread
cef65eeb0315c3118bf8860d6f723cb49ff6bc52 01-Oct-2010 Dianne Hackborn <hackbod@google.com> Rub in a little 'ol log-b-gone.

Mmmmmm... great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
om/android/internal/telephony/DataConnectionTracker.java
738aadd70fb96491e34645e78241eeb04ee83460 01-Oct-2010 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp

Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
f51eadaf1f83abfe16a609a4ded6d789494689b2 21-Sep-2010 Jake Hamby <jhamby@google.com> Typo fixes in comments and minor code cleanups.

* Fix some typos in Javadoc and log messages.
* Remove redundant initializer in BluetoothAdapter.readOutOfBandData()
* Use canonical "UTF-8" charset name instead of "UTF8" in
BluetoothDevice.convertPinToBytes()

Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/UserData.java
db9e87b98874bba9f26c8d0745639dfbe11195df 30-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake().

Merge commit '49c13e512c675b27099783ccf2d20c9ef46c99db'

* commit '49c13e512c675b27099783ccf2d20c9ef46c99db':
Catch exceptions in SipPhone.canTake().
bd407edc473778685c26d1c76a13671bf948eb83 30-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 2c457326: am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.

Merge commit '2c4573263a97cc80f441824a75d6502ae04292a8'

* commit '2c4573263a97cc80f441824a75d6502ae04292a8':
SipPhone: revise hangup() in SipCall and SipConnection.
648e1aeb8ac3df60e5fbcdfe42976cb2dc241047 30-Sep-2010 David Brown <dab@google.com> am 5cf44f69: am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread

Merge commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9'

* commit '5cf44f6907cde1126dd982af2d4dfd5c35da9eb9':
Implement contacts lookup (caller-id) for incoming SIP calls.
49c13e512c675b27099783ccf2d20c9ef46c99db 30-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 0e412304: Catch exceptions in SipPhone.canTake().

Merge commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp

* commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44':
Catch exceptions in SipPhone.canTake().
2c4573263a97cc80f441824a75d6502ae04292a8 30-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 421c34c1: SipPhone: revise hangup() in SipCall and SipConnection.

Merge commit '421c34c162098efe870574844a7ee49812bbb929' into gingerbread-plus-aosp

* commit '421c34c162098efe870574844a7ee49812bbb929':
SipPhone: revise hangup() in SipCall and SipConnection.
23f21600d0927365e5e7bdc4e566ba52101301b4 29-Sep-2010 Hung-ying Tyan <tyanh@google.com> Add CallManager/Phone.setEchoSuppressionEnabled().

Change-Id: I7bc6241e6fa815787799a53d6f3a076567edc361
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/sip/SipPhone.java
0e412304813ccd3a3fb6a643836e4f0922d1dc44 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> Catch exceptions in SipPhone.canTake().

Exceptions may throw during canTake() as the peer may cancel the call and
result in a race with this method call.

Change-Id: I61903d601d8f9b2dcb4c4fbe1586e2c1a1069109
http://b/issue?id=3033868
om/android/internal/telephony/sip/SipPhone.java
421c34c162098efe870574844a7ee49812bbb929 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipPhone: revise hangup() in SipCall and SipConnection.

Make them DISCONNECTED immediately. Don't enter DISCONNECTING state and wait
until SipSession ends the session. SipSession will get timed out eventually
but PhoneApp/user don't need to know this detail and wait.

This should fix the bug:
http://b/issue?id=3027719

Change-Id: Ida5a1bd09d08b9d591721384b4978127619aab51
om/android/internal/telephony/sip/SipPhone.java
5cf44f6907cde1126dd982af2d4dfd5c35da9eb9 29-Sep-2010 David Brown <dab@google.com> am 87fbcc2b: Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread

Merge commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b' into gingerbread-plus-aosp

* commit '87fbcc2b73b9b92d50c4520053bfc7bdff4cd91b':
Implement contacts lookup (caller-id) for incoming SIP calls.
158d390f533f927175c5a5a3e5a1a8bc07ca1fac 28-Sep-2010 David Brown <dab@google.com> Implement contacts lookup (caller-id) for incoming SIP calls.

CallerInfoAsyncQuery can now handle SIP addresses in addition to regular
phone numbers: if the number passed in to startQuery() is actually a "URI
number", we now treat it as a SIP address and look it up directly in the
Data table.

If it's a regular phone number, the behavior is unchanged: we use the
PhoneLookup table as before.

This piece of the fix covers only the contact lookup for incoming calls;
we still need some more cleanup of the CallerInfo class in order to get
the call log working.

Bug: 3004127

Change-Id: I0fcb80f9de5b8ecf99d31ee92e0889ddb07216fd
om/android/internal/telephony/CallerInfoAsyncQuery.java
fa751719a0c0a013c8afa61b17656cc7f625c8dc 29-Sep-2010 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Remove unused mRuimFileHandler reference from CDMAPhone

Change-Id: I73b7d87e8e18047f9e0bcd6c1969a32c808cd3c7
om/android/internal/telephony/cdma/CDMAPhone.java
9a8e567d2a801d36842e611c1ec7d73c71fffd8f 29-Sep-2010 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix radio state printing

Decode new radio state before printing its value

Change-Id: Ib6d47fd412e85a7799fe56a49d29af7531de8674
om/android/internal/telephony/RIL.java
6c6eacda8066728537f2d8828e4c123f91ddfc27 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> am f7e13400: am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR

Merge commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236'

* commit 'f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236':
SIP: add DisconnectCause.SERVER_ERROR
3c094de4a9d4793bba8f826a43ef84f509a743c4 28-Sep-2010 Chung-yih Wang <cywang@google.com> am 4a64afd2: am 24547592: Fix the startAudio order for 3-way calls.

Merge commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989'

* commit '4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989':
Fix the startAudio order for 3-way calls.
c508e8468f54164e7c9729e3800e2559b803cef1 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> Fix build.

Change-Id: I0c158e65eb47de64eb954a0e11c9843988cb8043
om/android/internal/telephony/sip/SipPhone.java
e18f15e6fe9a7217de805e8a7ad84c01761910ec 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 1738252a: am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread

Merge commit '1738252a596c71851cabf5835acb3584ad6b3191'

* commit '1738252a596c71851cabf5835acb3584ad6b3191':
Don't enter DISCONNECTING state when the call/connection is not alive
f7e13400b24bdc5461e640cfb2c9cb2bbb2b6236 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR

Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp

* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
SIP: add DisconnectCause.SERVER_ERROR
624d5b4e8c20516516d0bff74479b9f5abdfe61c 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: add DisconnectCause.SERVER_ERROR

and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.

http://b/issue?id=3041332

Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
om/android/internal/telephony/Connection.java
om/android/internal/telephony/sip/SipPhone.java
4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989 28-Sep-2010 Chung-yih Wang <cywang@google.com> am 24547592: Fix the startAudio order for 3-way calls.

Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp

* commit '245475925eff61ee76bde58de69253a889e39d0a':
Fix the startAudio order for 3-way calls.
245475925eff61ee76bde58de69253a889e39d0a 28-Sep-2010 Chung-yih Wang <cywang@google.com> Fix the startAudio order for 3-way calls.

Change-Id: Ib387b4b1f641f9bf52dd6007d23aee08f0925811
om/android/internal/telephony/sip/SipPhone.java
159cceaae22076b743626ddde84c501b3f491f6e 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 368d796e: Fix build.

Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp

* commit '368d796e2e28ecd738362c7a4566cb3eb219ab26':
Fix build.
368d796e2e28ecd738362c7a4566cb3eb219ab26 27-Sep-2010 Hung-ying Tyan <tyanh@google.com> Fix build.

Change-Id: I30f2615bc080db2c672e0391fd8bc735de17fcbf
om/android/internal/telephony/sip/SipPhone.java
1738252a596c71851cabf5835acb3584ad6b3191 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread

Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
Don't enter DISCONNECTING state when the call/connection is not alive
2b4f5cfd9be5ceffc4745a45736e067a475a4dff 28-Sep-2010 Hung-ying Tyan <tyanh@google.com> Don't enter DISCONNECTING state when the call/connection is not alive

http://b/issue?id=3027719

Change-Id: I1b52418a3695e96b48538fbf14497e34d2cfdda9
om/android/internal/telephony/sip/SipPhone.java
6cf8f64be3c079ef76d708a56b55a2b7ca6dbd2f 27-Sep-2010 Hung-ying Tyan <tyanh@google.com> am c5027642: am 025a39af: SIP: misc fixes

Merge commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d'

* commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d':
SIP: misc fixes
031d8786824a385fa47750e5e8aa75f40d70cae9 27-Sep-2010 Hung-ying Tyan <tyanh@google.com> am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error

Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
SipService: handle cross-domain authentication error
c5027642ff3909911d27e4abaa5e3abf1615b38d 27-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 025a39af: SIP: misc fixes

Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
SIP: misc fixes
fe2d279c5ef571340f20d433badd9f68072299af 27-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 00a22064: SipService: handle cross-domain authentication error

Merge commit '00a22064efef4f574e439079aae2deae1a087a31' into gingerbread-plus-aosp

* commit '00a22064efef4f574e439079aae2deae1a087a31':
SipService: handle cross-domain authentication error
025a39af346f39743c1e384b9000ce1baee36562 23-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: misc fixes

+ check REQUEST_TERMINATED response on INVITE not CANCEL,
+ check if a TransactionTerminatedEvent matches the ongoing transaction,
+ add log to track SipConnection disconnect events.

Change-Id: I28325be62ac44e4a7507d3c4b5b78b066c0ea2ad
om/android/internal/telephony/sip/SipPhone.java
00a22064efef4f574e439079aae2deae1a087a31 25-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipService: handle cross-domain authentication error

and add new CROSS_DOMAIN_AUTHENTICATION error code and OUT_OF_NETWORK
DisconnectCause.

http://b/issue?id=3020185

Change-Id: Icc0a341599d5a72b7cb2d43675fbddc516544978
om/android/internal/telephony/Connection.java
om/android/internal/telephony/sip/SipPhone.java
5e18ad0c53faf88357c83bae66ab9d04c0388bb9 27-Sep-2010 Chung-yih Wang <cywang@google.com> am 4a04a312: am bd229420: Fix the unhold issue especially if one is behind NAT.

Merge commit '4a04a3129bd30a996dd302b982aeca8f228f57e8'

* commit '4a04a3129bd30a996dd302b982aeca8f228f57e8':
Fix the unhold issue especially if one is behind NAT.
4a04a3129bd30a996dd302b982aeca8f228f57e8 27-Sep-2010 Chung-yih Wang <cywang@google.com> am bd229420: Fix the unhold issue especially if one is behind NAT.

Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp

* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
Fix the unhold issue especially if one is behind NAT.
bd2294204e3edaede3fe81eb9b11c05c4fafe627 23-Sep-2010 Chung-yih Wang <cywang@google.com> Fix the unhold issue especially if one is behind NAT.

+call startAudio() when call is established.

Change-Id: Ib6a1e34017fb83007ce275da1991058e8b803833
om/android/internal/telephony/sip/SipPhone.java
7d16427653e047e4901988e7ee04d637e65253b7 27-Sep-2010 Naveen Kalla <nkalla@codeaurora.org> Add subaddress to SMS fingerprint calculation.

As per SMS specification in 3GPP2 C.S0015-B, section 4.3.1.6, if the
Subaddress is included in a CDMA SMS message, it needs to be used for
duplicate detection. Subaddress, which is an optional field was omitted
while computing the SMS fingerprint. Hence it was never being used in
duplicate detection if it was included in the SMS. Add subaddress to the
SMS fingerprint.

Change-Id: Iad9e89887a17caba59033ab8f8d94b63b33cb4bb
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/CdmaSmsSubaddress.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
33b5830ecee0d2d9cd0dcc04f542898390beaf8a 26-Sep-2010 John Wang <johnwang@google.com> am becc9148: am 8f5a1211: Merge "Add debug functions." into gingerbread

Merge commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62'

* commit 'becc9148e3698eeaf6ea854dabf2808490cd8f62':
Add debug functions.
becc9148e3698eeaf6ea854dabf2808490cd8f62 26-Sep-2010 John Wang <johnwang@google.com> am 8f5a1211: Merge "Add debug functions." into gingerbread

Merge commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e' into gingerbread-plus-aosp

* commit '8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e':
Add debug functions.
8f5a1211dc14acb2ef1879b9dad12e3dbaf92e9e 26-Sep-2010 John Wang <johnwang@google.com> Merge "Add debug functions." into gingerbread
55bc084bf4d06d2d854fb7900fb91804c963dac1 24-Sep-2010 John Wang <johnwang@google.com> Add debug functions.

Enable more debug in CallManager.

Change-Id: Iaf66e31dc67f7ca9123fe5d8b351a21b1ec8b987
om/android/internal/telephony/CallManager.java
3011b6617232d1ef7c1687d1db9e780fce978d30 25-Sep-2010 Hung-ying Tyan <tyanh@google.com> am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling

Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'

* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
SIP: longer timeout for making call, shorter for cancelling
d6d83279183db749de07bfdac79fe4180fc848d0 25-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 194bbcce: SIP: longer timeout for making call, shorter for cancelling

Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp

* commit '194bbcce9ba15634500f542b9ea017b2cf154b45':
SIP: longer timeout for making call, shorter for cancelling
194bbcce9ba15634500f542b9ea017b2cf154b45 23-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: longer timeout for making call, shorter for cancelling

http://b/3021865

Change-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138
om/android/internal/telephony/sip/SipPhone.java
22a62d1342a973ed7d38bb7d1751a472365e2897 24-Sep-2010 Hung-ying Tyan <tyanh@google.com> resolved conflicts for merge of ee813bae to master

Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
ee813baee49c94f87916d6a179bd5d16837e228a 24-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 84a357bb: Refactoring SIP classes to get ready for API review.

Merge commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c' into gingerbread-plus-aosp

* commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c':
Refactoring SIP classes to get ready for API review.
84a357bb6a8005e1c5e924e96a8ecf310e77c47c 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> Refactoring SIP classes to get ready for API review.

+ replace SipAudioCall and its Listener interfaces with real implementations,
+ remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,
+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,
+ move SipSessionState to SipSession.State,
+ make SipManager keep context and remove the context argument from many methods of its,
+ rename SipManager.getInstance() to newInstance(),
+ rename constant names for action strings and extra keys to follow conventions,
+ set thread names for debugging purpose.

Change-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044
om/android/internal/telephony/sip/SipPhone.java
ad450be78bb99a965b6aeb7cec04f865da59f052 17-Sep-2010 Amith Yamasani <yamasani@google.com> Add an AUTO_TIME_ZONE setting so that we can switch timezones while keeping correct time.

Have the NITZ provider honor the new setting before updating the time zone.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
cef2590bda374ef90caba770c2d97b82202f16ef 21-Sep-2010 Chung-yih Wang <cywang@google.com> am 83af4fbb: am 4c571a62: Fix the build.

Merge commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb'

* commit '83af4fbb0e5c28506a77fc508056c5022b9a71eb':
Fix the build.
6b15ecf2787dd0fa8e119785495112a84c30afe0 21-Sep-2010 Chung-yih Wang <cywang@google.com> am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread

Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
Revert the ANSWERING state.
83af4fbb0e5c28506a77fc508056c5022b9a71eb 21-Sep-2010 Chung-yih Wang <cywang@google.com> am 4c571a62: Fix the build.

Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp

* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
Fix the build.
4c571a62b1a4fb71585179bce84246b55097b47e 21-Sep-2010 Chung-yih Wang <cywang@google.com> Fix the build.

Change-Id: I6e3f683be22ab834ca1b83a1dbb0b3acd62645d2
om/android/internal/telephony/CallManager.java
232bc085fc901b6234d47c4ee4e3ee4fc88431e7 21-Sep-2010 Chung-yih Wang <cywang@google.com> am 708e4251: Merge "Revert the ANSWERING state." into gingerbread

Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp

* commit '708e42512a8b14202cd872d96d1f071ccb4cf915':
Revert the ANSWERING state.
9779b714f4035642b87cbb7ef6cd8ac32848c930 19-Sep-2010 Chung-yih Wang <cywang@google.com> Revert the ANSWERING state.

+fix the unknown call flash for answering an incoming call and
updating the screen if the background call got dropped.
+change the getFirstActiveBgCall to return the call if the state
is not IDLE. This will help to fix unknown flash if the background
call got dropped.

Change-Id: I9803ccebd919acbd5296e7dfde7dc5f29cc9f180
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
31fde0de8b52b0701b73d56f21745c131f72e207 21-Sep-2010 John Wang <johnwang@google.com> am 48ab3991: am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread

Merge commit '48ab3991647040d540d295a40247367f6707f4c2'

* commit '48ab3991647040d540d295a40247367f6707f4c2':
Use PhoneBase in the phone list.
48ab3991647040d540d295a40247367f6707f4c2 21-Sep-2010 John Wang <johnwang@google.com> am ee2ef322: Merge "Use PhoneBase in the phone list." into gingerbread

Merge commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6' into gingerbread-plus-aosp

* commit 'ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6':
Use PhoneBase in the phone list.
ee2ef3220fd27a6332acb2f65951a7fe91e9dfa6 21-Sep-2010 John Wang <johnwang@google.com> Merge "Use PhoneBase in the phone list." into gingerbread
323f059d65db8413ee2ca8ce04533bc00e4f84e4 09-Sep-2010 Naveen Kalla <nkalla@codeaurora.org> Do not explicity disconnect Data during power down for 1x.

In 1x, if the data call is torn down before radio power off, modem will
have to send a data call release and change to initialization state followed
by idle state and send out power down registration. If the power off request is sent
to the modem during Initialization state after call release, there is a chance that
modem does not perform power down registration.

Instead if we directly initiate a power down, modem just sets a power down registration
bit in the release order. This change also optimizes the power down procedure in 1x by
letting the modem handle data call release during power down.

Change-Id: I0f083cc3b005ec1e64105350abb43d10583b0881
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
6cb73f2a726a91ba415d4f0cba8ee836e73c5f19 20-Sep-2010 Dmitri Plotnikov <dplotnikov@google.com> Merge "Format the phone number with the number country's convention."
6a3d188f18b5ae278c802c8bbd1e0a44da555cdf 31-Aug-2010 Bai Tao <michaelbai@google.com> Format the phone number with the number country's convention.

If the phone number doesn't have country code, the current country's convention will be used.

Change-Id: I3f6ea0104d1a67071bd3beadb667c7159e915eef
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
5491c7a076bfee6db99ef96a966aadc4bb84b662 20-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 852e5354: am 8544560c: SipPhone: fix missing-call DisconnectCause feedback

Merge commit '852e5354f60a0131692c46f509c2e9901b0b6810'

* commit '852e5354f60a0131692c46f509c2e9901b0b6810':
SipPhone: fix missing-call DisconnectCause feedback
852e5354f60a0131692c46f509c2e9901b0b6810 20-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 8544560c: SipPhone: fix missing-call DisconnectCause feedback

Merge commit '8544560ccc43de7ff49d91866f461f5572f0b147' into gingerbread-plus-aosp

* commit '8544560ccc43de7ff49d91866f461f5572f0b147':
SipPhone: fix missing-call DisconnectCause feedback
8544560ccc43de7ff49d91866f461f5572f0b147 20-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipPhone: fix missing-call DisconnectCause feedback

also fix delivering bad news before closing a SipAudioCallImpl object so that
apps can get the current audio-call object state before it's closed:

http://b/issue?id=3009262

Change-Id: I94c19dae8b4f252de869e614ec462b19b4ff2077
om/android/internal/telephony/sip/SipPhone.java
2417132611936918cec91a85269a4e2e2752e9de 20-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 37d1b249: am 97963794: SIP: convert enum to static final int.

Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'

* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
SIP: convert enum to static final int.
37d1b2496ed4e636062d8bb451e723b975c80920 20-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 97963794: SIP: convert enum to static final int.

Merge commit '97963794af1e18674dd111e3ad344d90b16c922c' into gingerbread-plus-aosp

* commit '97963794af1e18674dd111e3ad344d90b16c922c':
SIP: convert enum to static final int.
97963794af1e18674dd111e3ad344d90b16c922c 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: convert enum to static final int.

Converts SipErrorCode and SipSessionState.

Change-Id: Iee3a465649ea89d395b2336bbd673c25113e5f93
om/android/internal/telephony/sip/SipPhone.java
511f66d3b68a4451f0a2e558915d1aeb727bb0ba 18-Sep-2010 John Wang <johnwang@google.com> am afb777cb: am 0741a5ed: Merge "Add debug function." into gingerbread

Merge commit 'afb777cbd459f45eb833e12fbab03aed93f90409'

* commit 'afb777cbd459f45eb833e12fbab03aed93f90409':
Add debug function.
0a30e454eb2d2969dcff612de5c3ae5872577f00 18-Sep-2010 John Wang <johnwang@google.com> Use PhoneBase in the phone list.

For bug 3001613.

Only use PhoneBase (not PhoneProxy) in CallManager.

Both PhoneBase and PhoneProxy implement Phone interface,

such as dial(). The real implementation, for

example in GSM, is in GSMPhone extending from PhoneBase.

So that foregroundCall.getPhone() returns GSMPhone obj. On the other hand,

PhoneFactory.getDefaultPhone() returns PhoneProxy obj, which has a class

member of GSMPhone.

Therefore for phone returned by PhoneFacotry, which is used by PhoneApp,

phone.getForegroundCall().getPhone() != phone

Change-Id: I8a304098dd86762aaee56fb3c8b76c883e8c9a4f
om/android/internal/telephony/CallManager.java
afb777cbd459f45eb833e12fbab03aed93f90409 18-Sep-2010 John Wang <johnwang@google.com> am 0741a5ed: Merge "Add debug function." into gingerbread

Merge commit '0741a5ed38757ef2f6b52945ad494d965b3b83de' into gingerbread-plus-aosp

* commit '0741a5ed38757ef2f6b52945ad494d965b3b83de':
Add debug function.
bd53554f8a8679cd9d64a45cbeb1dc301fff0f63 16-Sep-2010 John Wang <johnwang@google.com> Add debug function.

Change-Id: If2381b04b08876f78ac93833f848f099de5c6104
om/android/internal/telephony/CallManager.java
0a56f342f9e75bc108f1e37944b61f754cf6168b 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 960d409c: am 1d158357: SipPhone: do not append SIP domain to PSTN number

Merge commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e'

* commit '960d409c79aad3a9f78d930cdebedcc0fb34c30e':
SipPhone: do not append SIP domain to PSTN number
960d409c79aad3a9f78d930cdebedcc0fb34c30e 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 1d158357: SipPhone: do not append SIP domain to PSTN number

Merge commit '1d1583573d2099756bbbeef48d97c280edc393e0' into gingerbread-plus-aosp

* commit '1d1583573d2099756bbbeef48d97c280edc393e0':
SipPhone: do not append SIP domain to PSTN number
6c62609e8fd71e5c25b843a955caf4d41a3a5db7 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> resolved conflicts for merge of 394d1e4b to master

Change-Id: I2c3a0ff646e3024d422d809ce964bd188fc70bb7
394d1e4bedf027a44c47e37ebf3d768c3c073ae9 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> am afa583e6: SipAudioCall: expose startAudio()

Merge commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7' into gingerbread-plus-aosp

* commit 'afa583e6557557577188c3e40146ac8d6f2aa7c7':
SipAudioCall: expose startAudio()
1d1583573d2099756bbbeef48d97c280edc393e0 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipPhone: do not append SIP domain to PSTN number

in the CallerInfo so that only PSTN number is shown in the call log.

http://b/issue?id=2982632

Change-Id: I414f01d16ce64ecb8da7c6943ea7f080bcfd2794
om/android/internal/telephony/sip/SipPhone.java
afa583e6557557577188c3e40146ac8d6f2aa7c7 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipAudioCall: expose startAudio()

so that apps can start audio when time is right.

Change-Id: I7ae96689d3a8006b34097533bc2434bc3814b82a
om/android/internal/telephony/sip/SipPhone.java
6308514cbff740772534338ed641d3243cca52fe 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 156edcc9: am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread

Merge commit '156edcc9f64e010d6b6de97e9a77adfccee353eb'

* commit '156edcc9f64e010d6b6de97e9a77adfccee353eb':
Add timer to SIP session creation process.
156edcc9f64e010d6b6de97e9a77adfccee353eb 17-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 9404e633: Merge "Add timer to SIP session creation process." into gingerbread

Merge commit '9404e633a55cd325b57732cdd776053b3886b611' into gingerbread-plus-aosp

* commit '9404e633a55cd325b57732cdd776053b3886b611':
Add timer to SIP session creation process.
9352cf1a4d46492fc48a20f7d825a9bcb6e8b365 16-Sep-2010 Hung-ying Tyan <tyanh@google.com> Add timer to SIP session creation process.

+ add timer parameter to ISipSession.make/changeCall(),
+ add timer paramter to SipAudioCall.make/answer/hold/continueCall()'s,
+ add timer parameter to SipManager.makeAudioCall(),
+ modify implementation in SipSessionGroup, SipAudioCallImpl accordingly,
+ make SipPhone to use it with 8-second timeout.

http://b/issue?id=2994748

Change-Id: I661a887e5810087ddc5e2318335e2fa427f80ec6
om/android/internal/telephony/sip/SipPhone.java
f61101f6266be243c481d163b95e65d67b8d1669 17-Sep-2010 Wink Saville <wink@google.com> Add LinkCapabilities

Change-Id: Ia1599ade936b79f12526252c0a2e6b453abb136e
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
d6e15ab6aa387958222407b97cd21ae1d8b7965b 16-Sep-2010 Chung-yih Wang <cywang@google.com> am 170255b0: am d8f3d167: Add a new phone state ANSWERING.

Merge commit '170255b0f0482baf843b881a02d9361adcc33742'

* commit '170255b0f0482baf843b881a02d9361adcc33742':
Add a new phone state ANSWERING.
170255b0f0482baf843b881a02d9361adcc33742 16-Sep-2010 Chung-yih Wang <cywang@google.com> am d8f3d167: Add a new phone state ANSWERING.

Merge commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511' into gingerbread-plus-aosp

* commit 'd8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511':
Add a new phone state ANSWERING.
d8f3d167353f6c6f6c5cb7a4c8e941c03b8e9511 16-Sep-2010 Chung-yih Wang <cywang@google.com> Add a new phone state ANSWERING.

The state ANSWERING is set when we answer an incoming sip call, i.e.
sending a 'OK' response to the peer. The state will be set to ACTIVE
once the 'ACK' from peer is received.

Change-Id: I84ee3cc68222eb34e032896ce23f7431d4ad774a
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
03df1b5da60c5e2d3218937cd3978616f822e763 16-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 1e563f91: am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread

Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'

* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
Fixing the NPE in SipPhone
3e5246b2eb405b6ae304e7755ae5935a16e6ecc7 16-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread

Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'

* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
SIP: add PEER_NOT_REACHABLE error feedback.
1e563f91183d95f5ad2461b7bca864e8f223ef71 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816" into gingerbread

Merge commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3' into gingerbread-plus-aosp

* commit '968735e580b7728c6a17aff9b7356f9d74dc6eb3':
Fixing the NPE in SipPhone
91382a6f88207d855fc949c3422b1ca0d0bd65cd 15-Sep-2010 John Wang <johnwang@google.com> am 8028bd5b: am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread

Merge commit '8028bd5b696fd94d33c905c4279d6505e985d70b'

* commit '8028bd5b696fd94d33c905c4279d6505e985d70b':
Complete event registration in CallManager.
19c5df745229374748f38c76a222ec8ce1d08e81 15-Sep-2010 jsh <jsh@google.com> am b30f2188: am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

Merge commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94'

* commit 'b30f21882080bd4c0d7c3b25878151dd19ac3f94':
Unhide GsmCellLocation.getPsc().
8a33e964c48d22469487c8ec1d951826b7e3e562 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread

Merge commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482' into gingerbread-plus-aosp

* commit '5306e0a85dabd4c18a7b3f81acc0f582f9429482':
SIP: add PEER_NOT_REACHABLE error feedback.
c71114919517e90710a37aa13b15f762bd7df7d4 15-Sep-2010 John Wang <johnwang@google.com> am e92fdd26: am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread

Merge commit 'e92fdd261eed516a8821675ceca971d1c90d772b'

* commit 'e92fdd261eed516a8821675ceca971d1c90d772b':
Return immutable copies of private callList.
b1c4a01985df67175e57f8fbea90706d2f579648 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> am ae83faa3: am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()

Merge commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5'

* commit 'ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5':
SipAudioCall: use SipErrorCode instead of string in onError()
074663c7625e84caad1b6305c8b88968c28a4618 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> am ca83c25d: am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread

Merge commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a'

* commit 'ca83c25decd0d4dc9c765a2b42424c7974bd496a':
SipService: deliver connectivity change to all sessions.
94e498332a4e114dd106f564ebdafb49acea9854 15-Sep-2010 Chung-yih Wang <cywang@google.com> Fixing the NPE in SipPhone
bug id: http://b/2987816

Change-Id: Iee252eee0a5243b70ff0b6f287279f92235b5b2d
om/android/internal/telephony/sip/SipPhone.java
5306e0a85dabd4c18a7b3f81acc0f582f9429482 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
ae076d3981fda732d54b6c6e37e5659b2e7ba130 15-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: add PEER_NOT_REACHABLE error feedback.

http://b/issue?id=3002033

Change-Id: Ib64b08919d214acbab89945ac19dc113a68e62ad
om/android/internal/telephony/Connection.java
om/android/internal/telephony/sip/SipPhone.java
8028bd5b696fd94d33c905c4279d6505e985d70b 15-Sep-2010 John Wang <johnwang@google.com> am 6457a28b: Merge "Complete event registration in CallManager." into gingerbread

Merge commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5' into gingerbread-plus-aosp

* commit '6457a28be8a0589fd027a86ebdee04a0cc6fefd5':
Complete event registration in CallManager.
59f9bae81d3f3407035b19686728aa7f43666af0 15-Sep-2010 John Wang <johnwang@google.com> Complete event registration in CallManager.

1. Originally CallManager registers for all phone events provided by registerFor interface,

which will cause error msg such as "registerForXXX() in PhoneBase should not be called, CDMAPhone inactive."

for CDMA only events. Register for those events only if phone is CDMA phone.

2. Add registerForPostDialCharacter().

Note, we can't use notifyRegistrants() in handler since we need send

the character that is being processed in msg.arg1.

Change-Id: I48037c8a8e225bb82e203836a041f81f2445f4d8
om/android/internal/telephony/CallManager.java
b30f21882080bd4c0d7c3b25878151dd19ac3f94 15-Sep-2010 jsh <jsh@google.com> am 17fe229f: Merge "Unhide GsmCellLocation.getPsc()." into gingerbread

Merge commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4' into gingerbread-plus-aosp

* commit '17fe229fe8b5c43fe1fbd0511d6e4f1565a957d4':
Unhide GsmCellLocation.getPsc().
2ec0e6fe1e5382d93cb28c97d24c7b0a0387c8ee 09-Sep-2010 jsh <jsh@google.com> Unhide GsmCellLocation.getPsc().

bug: 2465036
Change-Id: If071c4e0f1f3484c010ec908b02800361cbf8a86
ndroid/telephony/gsm/GsmCellLocation.java
e92fdd261eed516a8821675ceca971d1c90d772b 14-Sep-2010 John Wang <johnwang@google.com> am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread

Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp

* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
Return immutable copies of private callList.
e7b92d7b53343119173558302ecfb3986ae0fbd6 14-Sep-2010 John Wang <johnwang@google.com> Merge "Return immutable copies of private callList." into gingerbread
ae83faa3eeb26b1983fb1b8b663eebfe1f1f61d5 14-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 13f6270e: SipAudioCall: use SipErrorCode instead of string in onError()

Merge commit '13f6270eb14b409709c936b828e2a2fd40e427c4' into gingerbread-plus-aosp

* commit '13f6270eb14b409709c936b828e2a2fd40e427c4':
SipAudioCall: use SipErrorCode instead of string in onError()
ca83c25decd0d4dc9c765a2b42424c7974bd496a 14-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 4565933f: Merge "SipService: deliver connectivity change to all sessions." into gingerbread

Merge commit '4565933f03a99750a333e97e95408c404984510f' into gingerbread-plus-aosp

* commit '4565933f03a99750a333e97e95408c404984510f':
SipService: deliver connectivity change to all sessions.
13f6270eb14b409709c936b828e2a2fd40e427c4 14-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipAudioCall: use SipErrorCode instead of string in onError()

and fix callback in setListener().

Change-Id: Ic2622df992a2ad45cb1e3f71736f320897ae8fb3
om/android/internal/telephony/sip/SipPhone.java
bc0e400d78ccba89af9a1472dcbf1853a73f7d0d 14-Sep-2010 John Wang <johnwang@google.com> Return immutable copies of private callList.

Change-Id: I3da97acf89e044515e98fa04233dd378c32c250d
om/android/internal/telephony/CallManager.java
d231aa880ab006d51ffe03454c1fc082f1c97bb8 13-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipService: deliver connectivity change to all sessions.

+ add DATA_CONNECTION_LOST to SipErrorCode
+ convert it to Connection.DisconnectCause.LOST_SIGNAL in SipPhone

http://b/issue?id=2992548

Change-Id: Ie8983c1b81077b21f46304cf60b8e61df1ffd241
om/android/internal/telephony/sip/SipPhone.java
0b5a8bd57993f9a1c199c93fa3c9038fdece628d 13-Sep-2010 Hung-ying Tyan <tyanh@google.com> am a5dce0c1: am 3d7606aa: SIP: enhance timeout and registration status feedback.

Merge commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a'

* commit 'a5dce0c15ac05724b4595d62d521a481c7e1f86a':
SIP: enhance timeout and registration status feedback.
a5dce0c15ac05724b4595d62d521a481c7e1f86a 13-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 3d7606aa: SIP: enhance timeout and registration status feedback.

Merge commit '3d7606aa607b24817e37c264f2141ed7b2d50be0' into gingerbread-plus-aosp

* commit '3d7606aa607b24817e37c264f2141ed7b2d50be0':
SIP: enhance timeout and registration status feedback.
3d7606aa607b24817e37c264f2141ed7b2d50be0 12-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: enhance timeout and registration status feedback.

http://b/issue?id=2984419
http://b/issue?id=2991065

Change-Id: I2d3b1dd3a70079ff347f7256f4684aea07847f4e
om/android/internal/telephony/Connection.java
om/android/internal/telephony/sip/SipPhone.java
e765994831da699bcead5597e3c5f0c7403d06cd 13-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 38dc67f4: am 25b52a2f: SIP: remove dependency on javax.sip.SipException.

Merge commit '38dc67f49ec77d34c858777144323960c37d045e'

* commit '38dc67f49ec77d34c858777144323960c37d045e':
SIP: remove dependency on javax.sip.SipException.
38dc67f49ec77d34c858777144323960c37d045e 13-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 25b52a2f: SIP: remove dependency on javax.sip.SipException.

Merge commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e' into gingerbread-plus-aosp

* commit '25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e':
SIP: remove dependency on javax.sip.SipException.
25b52a2f97df112c2836972d0b6d9a4c7a9c4a4e 13-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: remove dependency on javax.sip.SipException.

Change-Id: I77d289bef1b5e7f1ec0c0408d0bbf96c21085cd7
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipPhone.java
547705d3efd4c8500e0d4c136cacaeaa3f2df46e 11-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am b9871461: am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread

Merge commit 'b987146123879217a6cdcdfeffdddd917edb22cc'

* commit 'b987146123879217a6cdcdfeffdddd917edb22cc':
Register ServiceStateChanged to CallManager.
b987146123879217a6cdcdfeffdddd917edb22cc 11-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> am e442fb6c: Merge "Register ServiceStateChanged to CallManager." into gingerbread

Merge commit 'e442fb6c9215fc6329522915805a9582ec2c3323' into gingerbread-plus-aosp

* commit 'e442fb6c9215fc6329522915805a9582ec2c3323':
Register ServiceStateChanged to CallManager.
e442fb6c9215fc6329522915805a9582ec2c3323 11-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Merge "Register ServiceStateChanged to CallManager." into gingerbread
d028bd0a5f485ee44d798a7aaf42639e52d2aa36 11-Sep-2010 John Wang <johnwang@google.com> Register ServiceStateChanged to CallManager.

Change-Id: I216bac222e1bfd93ad36c0aeafa85c232dd60abe
om/android/internal/telephony/CallManager.java
8d8fce88217f8c4ddd3763e230887cb2359c1a1f 10-Sep-2010 Wink Saville <wink@google.com> am 9a3ce10c: Merge "Fix bug 2972138 Lost cell data connection and didn\'t get it back, DO NOT MERGE." into gingerbread

Merge commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2' into gingerbread-plus-aosp

* commit '9a3ce10c6cafa4a2528ce9f3fdb6163acf5eb7b2':
Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.
c13d4b68f832a4f3ceadd4dae80ac60135740816 10-Sep-2010 Wink Saville <wink@google.com> Fix bug 2972138 Lost cell data connection and didn't get it back.

The problem was ConnectvityService was not notified if a permanent error
occurs on the default apn.

bug: 2972138
Change-Id: Ic135f5344ae82bf743dd2097c8d2ede90c25cccb
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
887f2e401edb84867b8ee4026306269abb0f909b 10-Sep-2010 Wink Saville <wink@google.com> Fix bug 2972138 Lost cell data connection and didn't get it back, DO NOT MERGE.

The problem was ConnectvityService was not notified if a permanent error
occurs on the default apn.

bug: 2972138
Change-Id: I7be17061695ae2ba3571d70f24dcc4fe96d9ede9
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
a97ccc02e18cd21c9cf1caaf63c4a680bf3c6f0a 10-Sep-2010 Hung-ying Tyan <tyanh@google.com> am 5f93c39c: am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread

Merge commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74'

* commit '5f93c39cdb2f75dda805691987ccd4e570f6cb74':
SIP: add SipErrorCode for error feedback.
5f93c39cdb2f75dda805691987ccd4e570f6cb74 10-Sep-2010 Hung-ying Tyan <tyanh@google.com> am ca3c24db: Merge "SIP: add SipErrorCode for error feedback." into gingerbread

Merge commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680' into gingerbread-plus-aosp

* commit 'ca3c24db3ae4b7a513f1ca76b1e7a3f56a020680':
SIP: add SipErrorCode for error feedback.
903e1031605d715e904811b0dd06cc6a518f0048 09-Sep-2010 Hung-ying Tyan <tyanh@google.com> SIP: add SipErrorCode for error feedback.

Change-Id: I8b071d4933479b780a403d0bfa30511f4c23ca8f
om/android/internal/telephony/Connection.java
om/android/internal/telephony/sip/SipPhone.java
b55df4471ed55a0e91dee79304f3b1209ffa4b35 05-Aug-2010 Sang-il, Lee <gendoh@google.com> Support MBCS characters in contacts and SMS messages that are stored in SIM cards.

Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/gsm/SmsMessage.java
c03ea416ca1d6d82f2c4bfdc31f73e08951d7362 09-Sep-2010 John Wang <johnwang@google.com> am d8f62ec4: am a48dc39b: Add hangupForegroundResumeBackground().

Merge commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742'

* commit 'd8f62ec44706153490bf63cddeac7d9c76e9e742':
Add hangupForegroundResumeBackground().
d8f62ec44706153490bf63cddeac7d9c76e9e742 09-Sep-2010 John Wang <johnwang@google.com> am a48dc39b: Add hangupForegroundResumeBackground().

Merge commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp

* commit 'a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
Add hangupForegroundResumeBackground().
a48dc39bd55c5ddcd991e08f791fd18d94a0db12 03-Sep-2010 John Wang <johnwang@google.com> Add hangupForegroundResumeBackground().

To fix bug 2968310.

Handle the operation of hangupForegroundResumeBackground while foreground call and background call come from different phones.

Change-Id: Id83ca1b75031a8391c95c7f8b2be40e9067dd4cd
om/android/internal/telephony/CallManager.java
fa018890643dfc2ccc3a74a223b21dc24b72fa05 09-Sep-2010 Robert Greenwalt <rgreenwalt@google.com> Merge "Some cleanup of Proxy class."
94bf9431e5464c7757890abfe0716997151f153f 08-Sep-2010 Jake Hamby <jhamby@google.com> am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

Merge commit 'e75783440a55fb0a5ef75066be94a11898f652f0'

* commit 'e75783440a55fb0a5ef75066be94a11898f652f0':
Allow incoming SMS until internal storage is almost full.
e75783440a55fb0a5ef75066be94a11898f652f0 08-Sep-2010 Jake Hamby <jhamby@google.com> am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
Allow incoming SMS until internal storage is almost full.
bb3716332321e22537a5015be13e2229fb9b90bc 24-Aug-2010 Jake Hamby <jhamby@google.com> Allow incoming SMS until internal storage is almost full.

Fix for bug 2382830: new incoming SMS should not be rejected when
running low on internal phone storage.

Testing revealed that the /data partition should have at least 256 KiB
available in order to prevent random app crashes (including system apps)
due to SQLite transaction failures. With 256 KiB free, the device should
safely boot without storage full errors. This takes into account the
36-40 KiB that the YAFFS2 filesystem reports as available even after
the partition has been completely filled. I've set the default full
threshold to 1 MiB to provide a generous safety margin.

For this bug, I changed the DeviceStorageMonitorService demon to send
two new hidden notifications for device storage "full" and "not full",
when the free space falls below the full threshold (default 1 MiB,
but configurable as a system setting), in addition to the existing
storage low/okay notifications sent when the storage crosses the threshold
of 90% full (also configurable).

The SMS code was changed to use these new notifications so that it can
accept messages until the data partition has been filled to the maximum
safe capacity rather than stopping when it hits 90% full. There should
be no negative impact on battery life because the additional check in
the storage polling service should be offset by an optimization to cache
the free threshold values which were previously being computed every time
through the loop.

While testing this change, I discovered that SMSDispatcher was being
instantiated twice, the first time in GSMPhone/CDMAPhone, and the second
time in SimSmsInterfaceManager / RuimSmsInterfaceManager. Changed the code
to pass the original SMSDispatcher to the Sim/RuimSmsInterfaceManager
constructor.

Change-Id: Ie0c6d05294778ab6ee42e0fa01313af96d824c77
om/android/internal/telephony/IccSmsInterfaceManager.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
7e0598d066e58ad9cadbd2c654a42563e56adbab 08-Sep-2010 Chung-yih Wang <cywang@google.com> am 4f24aed2: am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread

Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'

* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
Fix the dialing from contact for internet address.
4f24aed2a13d9ba89e2402894353176e19571e6e 08-Sep-2010 Chung-yih Wang <cywang@google.com> am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread

Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
Fix the dialing from contact for internet address.
c3a5cf07d1236529d619cfd3cc2f6a70612ecbc9 08-Sep-2010 Lorenzo Colitti <lorenzo@google.com> Merge "Framework changes for IPv6 / IPv4v6 data calls."
6f0f870f16003adc60e0c5f37c86b2d5e7895940 08-Sep-2010 Chung-yih Wang <cywang@google.com> Fix the dialing from contact for internet address.

the bug is http://b/issue?id=2982290

+Log outbound proxy address if exists for debugging.
ndroid/telephony/PhoneNumberUtils.java
b60c9ba33582e798e40b102ba3180d5cd1102ca3 02-Sep-2010 Lorenzo Colitti <lorenzo@google.com> Framework changes for IPv6 / IPv4v6 data calls.

Change-Id: I172fbcf3fcc4af3822aa16afac7015e675ccd007
om/android/internal/telephony/RIL.java
8fbc471199b157d40d709dbde6ea538a16444cfc 08-Sep-2010 Hung-ying Tyan <tyanh@google.com> am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread

Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'

* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0 08-Sep-2010 Hung-ying Tyan <tyanh@google.com> am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread

Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp

* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
d580eee29b50e1f11485b655fe5e6cc5a564615b 08-Sep-2010 Hung-ying Tyan <tyanh@google.com> Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
8744f879852a74885e1c56a65cd65a28b6a5fa7a 07-Sep-2010 Hung-ying Tyan <tyanh@google.com> SipPhone: switch to its own phone type PHONE_TYPE_SIP.

Change-Id: Ie33cfe92e59665864dbebbb38895e8e85f6db2e6
om/android/internal/telephony/sip/SipPhoneBase.java
577afc1c159b5f450ce16706747a3088299fd702 06-Sep-2010 Chung-yih Wang <cywang@google.com> am b65fd472: am b6264a87: Fix the build.

Merge commit 'b65fd4726ce625958876ee0b68c622839f33a64c'

* commit 'b65fd4726ce625958876ee0b68c622839f33a64c':
Fix the build.
b65fd4726ce625958876ee0b68c622839f33a64c 06-Sep-2010 Chung-yih Wang <cywang@google.com> am b6264a87: Fix the build.

Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp

* commit 'b6264a8795ed9469c80727123e3cafda1b07eda3':
Fix the build.
b6264a8795ed9469c80727123e3cafda1b07eda3 05-Sep-2010 Chung-yih Wang <cywang@google.com> Fix the build.

Change-Id: Icfeec3372dcde30723c49565649be03a4dd33c06
om/android/internal/telephony/sip/SipPhone.java
e2aded2d54400c950cc8450b34a641255bf8f3c1 06-Sep-2010 Chung-yih Wang <cywang@google.com> am 2143ade8: am b12baad9: Add equals() funcation for SipPhone.

Merge commit '2143ade8030b8765e8744f5ff1ad90343f7fbfcd'

* commit '2143ade8030b8765e8744f5ff1ad90343f7fbfcd':
Add equals() funcation for SipPhone.
2143ade8030b8765e8744f5ff1ad90343f7fbfcd 06-Sep-2010 Chung-yih Wang <cywang@google.com> am b12baad9: Add equals() funcation for SipPhone.

Merge commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp

* commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407':
Add equals() funcation for SipPhone.
b12baad9357c6e6aec1f7d84fd041c54fe963407 06-Sep-2010 Chung-yih Wang <cywang@google.com> Add equals() funcation for SipPhone.

Since we will use sipuri to match the same phone object.

Change-Id: I582779e51e447bb8d822c105cf0d682651c138d2
om/android/internal/telephony/sip/SipPhone.java
70af574b3d61605e311a7b3b5cb1531d5201dc5b 03-Sep-2010 Robert Greenwalt <rgreenwalt@google.com> Some cleanup of Proxy class.

Switch to using InetSocketAddress.

Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
9096a427ced8b020730cfce136a276ff00724485 03-Sep-2010 John Wang <johnwang@google.com> am 419126a6: am dc243482: Merge "Add API to get all foreground calls." into gingerbread

Merge commit '419126a6969be5384742b2fbf5f8507d0513c8db'

* commit '419126a6969be5384742b2fbf5f8507d0513c8db':
Add API to get all foreground calls.
419126a6969be5384742b2fbf5f8507d0513c8db 03-Sep-2010 John Wang <johnwang@google.com> am dc243482: Merge "Add API to get all foreground calls." into gingerbread

Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp

* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
Add API to get all foreground calls.
dc243482d6e104c4a3cddaa694c2ee3c628c2c20 03-Sep-2010 John Wang <johnwang@google.com> Merge "Add API to get all foreground calls." into gingerbread
4f3c5589c8cfa797153d50aaff68eaf874048a9c 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'

* commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
More SharedPreferences commit() -> apply() changes.
9eb32c96c872512c8aedc8627a4b96e9ea2a1a28 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
More SharedPreferences commit() -> apply() changes.
fa8e271636b9e9b86f247cdb4c91d9ebe9675c27 03-Sep-2010 Brad Fitzpatrick <bradfitz@android.com> More SharedPreferences commit() -> apply() changes.

Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GSMPhone.java
20bb22964ee9cba79d4b17fa57b8844c5e432f81 03-Sep-2010 John Wang <johnwang@google.com> Add API to get all foreground calls.

Change-Id: I38293b2d7841f5d8708a7b9b516f686ab15de2b1
om/android/internal/telephony/CallManager.java
bcc2f7589a1402c24c1aa3aa3036ee73d094c2ee 31-Aug-2010 Dmitri Plotnikov <dplotnikov@google.com> Merge "Added new method to format the phone number when neccessary."
37e65ebb7eb932e1a144b1cab262e11ca5fd109b 30-Aug-2010 Robert Greenwalt <robdroid@android.com> Rename NetworkProperties to LinkProperties

Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/sip/SipPhoneBase.java
1ace4163fa8015c58b28aaa7b0d8d49bdee654d1 30-Aug-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of ff749b9a to master

Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af
ff749b9a0d1137755ce466ca561b18473911d115 30-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data."

Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
Telephony: Control operator selection using EF_CSP data.
0e67c8926be9896e46eeecac42894d8997656809 24-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> Telephony: Control operator selection using EF_CSP data.

As per CPHS4_2.WW6, CPHS B.4.7.1, the most significant bit of
Value Added Services Group(0xC0) info, controls operator selection menu.
-If this bit is set, display operator selection menu to user.
-If this bit is not set do not display operator selection menu to user,
set Network Selection Mode to Automatic.

Change-Id: Icca4898abced0b0beb94c3434448a26eae72008b
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
2a4e96067d074ef78aeafea13469a85690346b60 25-Aug-2010 Bai Tao <michaelbai@google.com> Added new method to format the phone number when neccessary.

Change-Id: I90fb38c1d36dc1ccf7eaa3b4cc34cd29f5151493
ndroid/telephony/PhoneNumberUtils.java
db4c91ff7b4667527c09b01c4467b89e8e19925e 27-Aug-2010 Wink Saville <wink@google.com> Merge "Add NetworkProperties to DataConnection."
1f6408a96c757b3001c553f8f34ef0bda00a224d 27-Aug-2010 Wink Saville <wink@google.com> Add NetworkProperties to DataConnection.

Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
1e8dd5b4a76b699c4b53c2ff3b7573eb3163182e 26-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable object.

Merge commit 'eb182d789df75be7a778a6264e658972af73800c'

* commit 'eb182d789df75be7a778a6264e658972af73800c':
Telephony: Remove references to mExitECMRunnable object.
eb182d789df75be7a778a6264e658972af73800c 26-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> am f3ee6f87: Telephony: Remove references to mExitECMRunnable object.

Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
Telephony: Remove references to mExitECMRunnable object.
4d1b114b5f83eeb645aefa41d76f7400a5dfa59b 26-Aug-2010 Hung-ying Tyan <tyanh@google.com> am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread

Merge commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1'

* commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1':
CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
d06e641dbfbba672f17026c4a204c396f32a1ae1 26-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread

Merge commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf' into gingerbread-plus-aosp

* commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf':
CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
0e05bd27be817c8d78260c69d2156a6560d3d414 25-Aug-2010 Hung-ying Tyan <tyanh@google.com> CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()

Change-Id: Ib0c83c373580f7be9cb1ee262cd0098c70db9c64
om/android/internal/telephony/CallManager.java
63134b3aee2143c6df1ae9e2f8e4d516e26a0e2a 24-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 1537637c: am 3294d44b: Add confcall management to SIP calls

Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7'

* commit '1537637cc443a48e9afb8091b6f2ce329318f2d7':
Add confcall management to SIP calls
5f981d97e72a5e254dae409de5a259fd2b2746e7 24-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 360ab1df: am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."

Merge commit '360ab1dfb4ca9e33a604a5e2339c87291880faff'

* commit '360ab1dfb4ca9e33a604a5e2339c87291880faff':
Adds the ability to Android to initiate a 2 Digit Call.
b422ca809c92e3136bdf1f3820c4d59c61bc8e57 24-Aug-2010 Wink Saville <wink@google.com> am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
Change CDMAPhone.getDeviceId to return MEID or ESN.
1537637cc443a48e9afb8091b6f2ce329318f2d7 24-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 3294d44b: Add confcall management to SIP calls

Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp

* commit '3294d44b96f63f647fba3a03604eb028e28a42bc':
Add confcall management to SIP calls
3294d44b96f63f647fba3a03604eb028e28a42bc 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> Add confcall management to SIP calls

and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.

Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
f3ee6f87a344b185d8bde12c77440c9020378510 05-Aug-2010 Banavathu, Srinivas Naik <snb@codeaurora.org> Telephony: Remove references to mExitECMRunnable object.

Free mExitECMRunnable object while destroying CDMA phone.

Change-Id: I411b3e5e41a9cc76c3571a98f13f91d84523f623
om/android/internal/telephony/cdma/CDMAPhone.java
360ab1dfb4ca9e33a604a5e2339c87291880faff 23-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."

Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp

* commit '6864b3e2f4e67be847b2ae054f2f9c388f115722':
Adds the ability to Android to initiate a 2 Digit Call.
d218526bf6e2309580a4640e9591480a5c159c5f 23-Aug-2010 Jake Hamby <jhamby@google.com> am d457053a: am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread

Merge commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88'

* commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88':
Cosmetic cleanups to SMSDispatcher classes.
d90348796829f3d3a443e73ea3b3f2f9e79071c2 21-Aug-2010 Wink Saville <wink@google.com> am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp

* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
Change CDMAPhone.getDeviceId to return MEID or ESN.
b2cc86da29452769ff6210f1dfef4b51aac1d75e 21-Aug-2010 Wink Saville <wink@google.com> am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.

Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread

* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
Change CDMAPhone.getDeviceId to return MEID or ESN.
3158cf689f4994ec53c3b727f9b6ad7751a5551b 21-Aug-2010 Wink Saville <wink@google.com> Change CDMAPhone.getDeviceId to return MEID or ESN.

This allows devices with only ESN's to work.

bug: 2938223
Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/cdma/CDMAPhone.java
2b05a95bccafddac15debdfb5c39107aa3418783 20-Aug-2010 Robert Greenwalt <robdroid@android.com> am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread

Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
DO NOT MERGE Fixing Connectivity
4b1bdc0209650436ebe0dad1020080cc891e97b6 20-Aug-2010 Robert Greenwalt <robdroid@android.com> Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
8afddad7e7ce7275e26dc1ebfb359fbdd1d5920b 20-Aug-2010 Robert Greenwalt <robdroid@android.com> DO NOT MERGE Fixing Connectivity

Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed. Fixed differently on master.

bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/SipPhoneNotifier.java
d457053aab0763764da5b9c3e6e84e5b2935ea88 20-Aug-2010 Jake Hamby <jhamby@google.com> am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread

Merge commit '07936528cfbacb19d3f70b978708a52c47a31c0e' into gingerbread-plus-aosp

* commit '07936528cfbacb19d3f70b978708a52c47a31c0e':
Cosmetic cleanups to SMSDispatcher classes.
059fe88115ccb70d9870698e490ed5b4c88da50c 20-Aug-2010 Jake Hamby <jhamby@google.com> Cosmetic cleanups to SMSDispatcher classes.

Cleaned up some typos and other small fixes in SMSDispatcher in
preparation for checking in my SMS bug fixes. This change doesn't
fix any bugs, but it shouldn't introduce any either.

- Removed unused import statements
- Removed unused private constants and fields
- Fixed typos in Java comments and private constants
- Added generic type parameter to mSTrackers ArrayList
- Removed unnecessary casts
- Fixed indentation of mResultReceiver in SMSDispatcher
- Removed call to get unused smsc in CDMA sendSMS()
- Changed "|=" to "=" in boolean assignment where the variable
was initialized to false (thus the two operators are equivalent)

Change-Id: Ic19a63a7ef5cdccc7be86043c2a1b863ec8af652
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
5aaeaffdce904dae6e3eaf566dccf52611dffafa 18-Aug-2010 David Brown <dab@google.com> Merge "Move the "voice_capable" resource into the framework."
f2b4a15e18d2d91169f9ca882ca8a26ecc8dd8dd 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> am fa9a38c5: am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread

Merge commit 'fa9a38c566d09a4c891d584ed3d3af9690967b31'

* commit 'fa9a38c566d09a4c891d584ed3d3af9690967b31':
CallManager: add setAudioMode()
1c66bfb37edd9531c97ba2851338d521be73122c 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> am dc7d7378: am 8eac20ea: SIP: implement conference call

Merge commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4'

* commit 'dc7d73783e0416cbfde6053a037ce32c8f35fbc4':
SIP: implement conference call
38311b33c89fd570e238e21dcecf6dd5ccd5726c 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 16848a15: am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread

Merge commit '16848a15bbb7648bb1298c91f7969073c106115c'

* commit '16848a15bbb7648bb1298c91f7969073c106115c':
CallManager: do not deliver ring event if fg call is live.
ae3efa53a9bd52c6eddde2a8e4bb1ae4d86a9c21 18-Aug-2010 David Brown <dab@google.com> Move the "voice_capable" resource into the framework.

There's currently a config.xml param in the phone app saying whether the
current device is "voice capable", which is used to determine (among other
things) whether the OTASP call should run in interactive mode.

But both Contacts and Settings are about to need this flag too, so it
really belongs in the framework instead. As of this change it's now
"com.android.internal.R.bool.voice_capable".

Also add a corresponding TelephonyManager call so that unbundled and 3rd
party apps can access it too.

Change-Id: Ie9a8803295bf97eb32154291aac8fce1e21c7b25
ndroid/telephony/TelephonyManager.java
fa9a38c566d09a4c891d584ed3d3af9690967b31 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 6ab94608: Merge "CallManager: add setAudioMode()" into gingerbread

Merge commit '6ab94608750776bcaaee56696cfcfb16ce29db8a' into gingerbread-plus-aosp

* commit '6ab94608750776bcaaee56696cfcfb16ce29db8a':
CallManager: add setAudioMode()
dc7d73783e0416cbfde6053a037ce32c8f35fbc4 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 8eac20ea: SIP: implement conference call

Merge commit '8eac20eacd088793547c56e14d602b28d62fb278' into gingerbread-plus-aosp

* commit '8eac20eacd088793547c56e14d602b28d62fb278':
SIP: implement conference call
16848a15bbb7648bb1298c91f7969073c106115c 18-Aug-2010 Hung-ying Tyan <tyanh@google.com> am f6354aca: Merge "CallManager: do not deliver ring event if fg call is live." into gingerbread

Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp

* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
CallManager: do not deliver ring event if fg call is live.
a4cb657e3a14777fc0838e27fdfa2ad5c737cf43 17-Aug-2010 Hung-ying Tyan <tyanh@google.com> CallManager: add setAudioMode()

When in a call, different audio modes need to be applied based on phone type.
(For example, SIP call needs to be in MODE_NORMAL while GSM call in MODE_IN_CALL.)
Originally, it's handled in PhoneUtils.setAudioMode(). It makes more sense now
to handle the actual logic in CallManager.

Change-Id: I58d8f31d6b4afe22f88da442daac2010781de801
om/android/internal/telephony/CallManager.java
8eac20eacd088793547c56e14d602b28d62fb278 17-Aug-2010 Hung-ying Tyan <tyanh@google.com> SIP: implement conference call

Change-Id: Ifd420ed95e77e744c6aff28ac63e7363f97d9dc6
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/sip/SipPhone.java
912e0f7d9e377905ded6af3d01c52952e4fead2b 17-Aug-2010 Hung-ying Tyan <tyanh@google.com> CallManager: do not deliver ring event if fg call is live.

Change-Id: If5b1bca1f09557a2ee4de9ba429d80a0393279a0
om/android/internal/telephony/CallManager.java
0b2bbacd9b648f013c2f898b1d57e37f502325c9 10-Jun-2010 Georgios Katsaros <georgios.katsaros@sonyericsson.com> Adds the ability to Android to initiate a 2 Digit Call.

Over here the phone number to the switch-board is "99". Trying
to call "99" on an Android device dont work as expected (it
works on other devices though).

Exception (1) to Call initiation is:
If the user of the device is already in a call and enters a
Short String without any #-key at the end and the length of
the Short String is equal or less than 2 the phone shall
initiate a USSD/SS commands.

Exception (2) to Call initiation is:
If the user of the device enters one digit followed by the
#-key. This rule defines this String as the "#-String" which
is a USSD/SS command. The phone shall initiate a USSD/SS
commands.

Change-Id: I950ac10b347b8e9d113d208b08c3e2c7cdb50221
om/android/internal/telephony/gsm/GsmMmiCode.java
a774f5817b5a24f5ccbb15c97fc4d5038310245b 16-Aug-2010 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 31202b1a to master

Change-Id: Ia8ae32c5ebcd13843ed9cc82c80bf551b38e586f
c93ba8ed0d0d6d442c72e9e895f2e19e01d29288 16-Aug-2010 Jake Hamby <jhamby@google.com> am 164eb050: am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread

Merge commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34'

* commit '164eb050bdbaacb83e48a00c56b78d3c587a6e34':
Fix typo and bug in CTS test class.
31202b1a40e7daccf69e284492494f9ff739f324 14-Aug-2010 Jake Hamby <jhamby@google.com> am 3f442ece: Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread

Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp

* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
Fix character count bug and Javadoc typos in SMS (with test cases)
164eb050bdbaacb83e48a00c56b78d3c587a6e34 13-Aug-2010 Jake Hamby <jhamby@google.com> am 4f170821: Merge "Fix typo and bug in CTS test class." into gingerbread

Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp

* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
Fix typo and bug in CTS test class.
17f616823a562ceb3a008f91e05d43bc56d37cae 13-Aug-2010 Jake Hamby <jhamby@google.com> Fix character count bug and Javadoc typos in SMS (with test cases)

Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").

You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.

Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/gsm/SmsMessage.java
a8f39537ca881d23b9240d19a3d6a32f58739119 12-Aug-2010 Jake Hamby <jhamby@google.com> Fix typo and bug in CTS test class.

- Fix Javadoc typo in PhoneSubInfo.java
- Fix ArrayIndexOutOfBoundsException in SimulatedCommands.java

Change-Id: I40dcd52cf9d6990f1f845fca5c1d61cdff93f4d7
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/test/SimulatedCommands.java
3e4b7c332fcdeb3adf359b5fcf8cba08c474c9c0 13-Aug-2010 Dmitri Plotnikov <dplotnikov@google.com> Keep the '+' when normalizing the phone number

Change-Id: I24731735ed18dbc92a643a0d99d35a1b58be40c8
ndroid/telephony/PhoneNumberUtils.java
c178b95c1fbd4644a088ca9739d173d5bf69939c 13-Aug-2010 John Wang <johnwang@google.com> am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gingerbread

Merge commit '2835391c1709a2b655940200dab0fc74ef08512d'

* commit '2835391c1709a2b655940200dab0fc74ef08512d':
Update switch call and accept call.
2835391c1709a2b655940200dab0fc74ef08512d 13-Aug-2010 John Wang <johnwang@google.com> am 686a9505: Merge "Update switch call and accept call." into gingerbread

Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp

* commit '686a95055896c221c62fe7f4c3dda137809df91e':
Update switch call and accept call.
c159c84699d4b739a14cdfb22c5807f419e1754f 11-Aug-2010 John Wang <johnwang@google.com> Update switch call and accept call.

Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/RILConstants.java
81a81f02d6d1ec7527d62189b6708c1d17f4c5dd 12-Aug-2010 John Huang <jsh@android.com> am edfe20c4: am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"

Merge commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6'

* commit 'edfe20c4bd04716420a47516959d7c0e3e0064f6':
Enhance WspTypeDecoder to decode Content Type Parameters
edfe20c4bd04716420a47516959d7c0e3e0064f6 12-Aug-2010 John Huang <jsh@android.com> am c636b846: Merge "Enhance WspTypeDecoder to decode Content Type Parameters"

Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp

* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
Enhance WspTypeDecoder to decode Content Type Parameters
c636b846160482fbebd9a3792d52b9ff864228f2 12-Aug-2010 John Huang <jsh@android.com> Merge "Enhance WspTypeDecoder to decode Content Type Parameters"
4ff4a1fa8798af7dc290c0697f006add21f3cb33 12-Aug-2010 Hung-ying Tyan <tyanh@google.com> SIP: remove unused file.

Change-Id: If173fed70080de7d903bc176d91bd94338c4fdcb
om/android/internal/telephony/sip/SipPhoneFactory.java
om/android/internal/telephony/sip/SipPhoneProxy.java
cd397b73a860148494f78748ec0b034935a5eed5 11-Aug-2010 Naveen Kalla <nkalla@codeaurora.org> am 371dbcba: am c4c4c98c: In CW Interrogation service class is not sent.

Merge commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40'

* commit '371dbcba11070ed2fdd58a4c328b5d7b9ad65a40':
In CW Interrogation service class is not sent.
371dbcba11070ed2fdd58a4c328b5d7b9ad65a40 11-Aug-2010 Naveen Kalla <nkalla@codeaurora.org> am c4c4c98c: In CW Interrogation service class is not sent.

Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp

* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
In CW Interrogation service class is not sent.
5a90f6f59482df5b0f993ef1e6a9095fd278caa7 11-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 92798a48: am 076d0654: Merge "SIM toolkit enhancements and bug fixes"

Merge commit '92798a481cbd928711339606bc1d9e81fa80f7b2'

* commit '92798a481cbd928711339606bc1d9e81fa80f7b2':
SIM toolkit enhancements and bug fixes
92798a481cbd928711339606bc1d9e81fa80f7b2 11-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 076d0654: Merge "SIM toolkit enhancements and bug fixes"

Merge commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9' into gingerbread-plus-aosp

* commit '076d06547f90c480a4ed19da6f4b3d1270f57ec9':
SIM toolkit enhancements and bug fixes
c4c4c98c5ca6b4c017a5b429a6bd80a440c63559 29-Jun-2010 Naveen Kalla <nkalla@codeaurora.org> In CW Interrogation service class is not sent.

As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service class
parameter in call waiting interrogation to network. Some networks return error
if service class is sent. So setting service class to SERVICE_CLASS_NONE.

Change-Id: I396963d568573b88795ad2cf1844eb2e047b459e
om/android/internal/telephony/gsm/GSMPhone.java
03381faf3492cd1360b3d239c6f23a801c9d4b7f 11-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 1777a274: SIP: remove unused file.

Merge commit '1777a2748bfa25dfd9d081d71504572b9a7256b1' into gingerbread-plus-aosp

* commit '1777a2748bfa25dfd9d081d71504572b9a7256b1':
SIP: remove unused file.
1777a2748bfa25dfd9d081d71504572b9a7256b1 11-Aug-2010 Hung-ying Tyan <tyanh@google.com> SIP: remove unused file.

Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
om/android/internal/telephony/sip/SipPhoneFactory.java
om/android/internal/telephony/sip/SipPhoneProxy.java
ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109 11-Aug-2010 Chung-yih Wang <cywang@google.com> am 0a6db9be: am 2725a655: Fix a bug in unregisterPhone().

Merge commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a'

* commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a':
Fix a bug in unregisterPhone().
0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a 11-Aug-2010 Chung-yih Wang <cywang@google.com> am 2725a655: Fix a bug in unregisterPhone().

Merge commit '2725a6551261044318e42ccc9ebeabed7edf5ee7' into gingerbread-plus-aosp

* commit '2725a6551261044318e42ccc9ebeabed7edf5ee7':
Fix a bug in unregisterPhone().
2725a6551261044318e42ccc9ebeabed7edf5ee7 11-Aug-2010 Chung-yih Wang <cywang@google.com> Fix a bug in unregisterPhone().

Change-Id: Ifaef66d45043dc5376688a77f9d18124a9c29576
om/android/internal/telephony/CallManager.java
a5d4503bc4697fa6e9a3a387dacfbe09050e400c 11-Aug-2010 Chung-yih Wang <cywang@google.com> am 2c9de2b9: am f57324cf: Add getSipUri() for identification.

Merge commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1'

* commit '2c9de2b9e5568c8918b36866d3cf20833a8c20e1':
Add getSipUri() for identification.
2c9de2b9e5568c8918b36866d3cf20833a8c20e1 11-Aug-2010 Chung-yih Wang <cywang@google.com> am f57324cf: Add getSipUri() for identification.

Merge commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e' into gingerbread-plus-aosp

* commit 'f57324cf4f82947296f4d1acb9df1f3c9c03134e':
Add getSipUri() for identification.
f57324cf4f82947296f4d1acb9df1f3c9c03134e 11-Aug-2010 Chung-yih Wang <cywang@google.com> Add getSipUri() for identification.

Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
om/android/internal/telephony/sip/SipPhone.java
1601400b58790f06b53be87a47c7519d8f6f5a1d 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> am f13542f2: am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread

Merge commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00'

* commit 'f13542f2eba27d9b09ba6aa313f758e5518caa00':
SIP: clean up unused class and fields.
f13542f2eba27d9b09ba6aa313f758e5518caa00 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 259b4c86: Merge "SIP: clean up unused class and fields." into gingerbread

Merge commit '259b4c860212dd528b25d1cce6e74be01afed85c' into gingerbread-plus-aosp

* commit '259b4c860212dd528b25d1cce6e74be01afed85c':
SIP: clean up unused class and fields.
8e63ddb4c78dc4453d64ea6e94c109db703185e4 09-Aug-2010 Hung-ying Tyan <tyanh@google.com> SIP: clean up unused class and fields.

Change-Id: I79ed7fb324fea9a52946340055b5ea1d389a926a
om/android/internal/telephony/sip/SipPhone.java
a36cb1ebb5f151aa934c69d4d5de1143c6218107 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 8b8b4536: am 8fb2e6e4: PhoneFactory: add makeSipPhone()

Merge commit '8b8b4536314d1354c244af2c9e665c4db4e27522'

* commit '8b8b4536314d1354c244af2c9e665c4db4e27522':
PhoneFactory: add makeSipPhone()
f21d4ed7b897d9a3decfec1c5b5179f202132b15 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 51128faa: am d122805b: CallManager: add getAllPhones().

Merge commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31'

* commit '51128faa8cf1f3d25ee7db745b9e18e69e04cd31':
CallManager: add getAllPhones().
8b8b4536314d1354c244af2c9e665c4db4e27522 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> am 8fb2e6e4: PhoneFactory: add makeSipPhone()

Merge commit '8fb2e6e4720385961083a150a3e848ccaef544ae' into gingerbread-plus-aosp

* commit '8fb2e6e4720385961083a150a3e848ccaef544ae':
PhoneFactory: add makeSipPhone()
51128faa8cf1f3d25ee7db745b9e18e69e04cd31 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> am d122805b: CallManager: add getAllPhones().

Merge commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56' into gingerbread-plus-aosp

* commit 'd122805bbfcb770f941cac259bcefafdb2d3ad56':
CallManager: add getAllPhones().
8fb2e6e4720385961083a150a3e848ccaef544ae 09-Aug-2010 Hung-ying Tyan <tyanh@google.com> PhoneFactory: add makeSipPhone()

Change-Id: I8e7abb0623724d24c6f82829ff06663a31ba32fb
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/sip/SipPhoneFactory.java
d122805bbfcb770f941cac259bcefafdb2d3ad56 09-Aug-2010 Hung-ying Tyan <tyanh@google.com> CallManager: add getAllPhones().

Change-Id: I50589aaec55925d93c392f15a22c70d2a6634b87
om/android/internal/telephony/CallManager.java
928245d16fe0e68e1effa59c399eefef0aed4955 06-Aug-2010 John Huang <jsh@google.com> Merge "Add supporting MCC=450(Korea)"
88e590fb370d80d863417aae9330c8c2218f3175 06-Aug-2010 Chung-yih Wang <cywang@google.com> Fix the SipPhone codes related to the ITelephone interface change.

Change-Id: Id8ab7a6e4feaac67cd09e8412af61b40c6e774b4
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
om/android/internal/telephony/sip/SipPhoneProxy.java
e6747b67871f3bc0779a3e486b77b271cf42de73 06-Aug-2010 Chung-yih Wang <cywang@google.com> am e7b92260: am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread

Merge commit 'e7b92260e228039295874bea024b629cb5a4d89a'

* commit 'e7b92260e228039295874bea024b629cb5a4d89a':
Revert "Revert "Move SIP telephony related codes to framework.""
e7b92260e228039295874bea024b629cb5a4d89a 06-Aug-2010 Chung-yih Wang <cywang@google.com> am b9605886: Merge "Revert "Revert "Move SIP telephony related codes to framework.""" into gingerbread

Merge commit 'b9605886d1a94de624b6feb5a81bb37f41653437' into gingerbread-plus-aosp

* commit 'b9605886d1a94de624b6feb5a81bb37f41653437':
Revert "Revert "Move SIP telephony related codes to framework.""
e2dd8ca719532b1b4fd34707c7e54e02d8848ae9 05-Aug-2010 Chung-yih Wang <cywang@google.com> am bc088dde: am cde66df4: Revert "Move SIP telephony related codes to framework."

Merge commit 'bc088ddecb05de39f7e96e44de394add975baecd'

* commit 'bc088ddecb05de39f7e96e44de394add975baecd':
Revert "Move SIP telephony related codes to framework."
e066684a1b4580a6d019fb4e207df768dcb25dde 05-Aug-2010 Chung-yih Wang <cywang@google.com> am d088cef7: am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread

Merge commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32'

* commit 'd088cef7da5f17b6d1ea16196c24032f39c9eb32':
Move SIP telephony related codes to framework.
ccd0b6953f5f77d1da5f540a3ba5ea71116e14f0 05-Aug-2010 Chung-yih Wang <cywang@google.com> Revert "Revert "Move SIP telephony related codes to framework.""

This reverts commit cde66df44240cfe5a7bec12ac52464c3bf26c14f.

Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/CallFailCause.java
om/android/internal/telephony/sip/CallProxy.java
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
om/android/internal/telephony/sip/SipPhoneFactory.java
om/android/internal/telephony/sip/SipPhoneProxy.java
bc088ddecb05de39f7e96e44de394add975baecd 05-Aug-2010 Chung-yih Wang <cywang@google.com> am cde66df4: Revert "Move SIP telephony related codes to framework."

Merge commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f' into gingerbread-plus-aosp

* commit 'cde66df44240cfe5a7bec12ac52464c3bf26c14f':
Revert "Move SIP telephony related codes to framework."
cde66df44240cfe5a7bec12ac52464c3bf26c14f 05-Aug-2010 Chung-yih Wang <cywang@google.com> Revert "Move SIP telephony related codes to framework."

This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/CallFailCause.java
om/android/internal/telephony/sip/CallProxy.java
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
om/android/internal/telephony/sip/SipPhoneFactory.java
om/android/internal/telephony/sip/SipPhoneProxy.java
d088cef7da5f17b6d1ea16196c24032f39c9eb32 05-Aug-2010 Chung-yih Wang <cywang@google.com> am 468e35ef: Merge "Move SIP telephony related codes to framework." into gingerbread

Merge commit '468e35efc595114354eff7ee2685ea79ed098c7f' into gingerbread-plus-aosp

* commit '468e35efc595114354eff7ee2685ea79ed098c7f':
Move SIP telephony related codes to framework.
b631dcf3eb449ddec756bea330f4e70b996ffb9e 05-Aug-2010 Chung-yih Wang <cywang@google.com> Move SIP telephony related codes to framework.

+ hardcode the sip service for build dependency.

Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
om/android/internal/telephony/SipPhoneNotifier.java
om/android/internal/telephony/sip/CallFailCause.java
om/android/internal/telephony/sip/CallProxy.java
om/android/internal/telephony/sip/SipCallBase.java
om/android/internal/telephony/sip/SipCommandInterface.java
om/android/internal/telephony/sip/SipConnectionBase.java
om/android/internal/telephony/sip/SipPhone.java
om/android/internal/telephony/sip/SipPhoneBase.java
om/android/internal/telephony/sip/SipPhoneFactory.java
om/android/internal/telephony/sip/SipPhoneProxy.java
efd938f77a315b977031f10e526609e6c7cd7e14 05-Aug-2010 John Wang <johnwang@google.com> am 62f066a1: Merge "Add register methods in CallManager "do not merge"" into gingerbread

Merge commit '62f066a14afb2774569a54c150a9d0a2601dd77a' into gingerbread-plus-aosp

* commit '62f066a14afb2774569a54c150a9d0a2601dd77a':
Add register methods in CallManager "do not merge"
62f066a14afb2774569a54c150a9d0a2601dd77a 05-Aug-2010 John Wang <johnwang@google.com> Merge "Add register methods in CallManager "do not merge"" into gingerbread
0b4e3ad356c6e4f2f4152d02de7a4dc395825bba 04-Aug-2010 jsh <jsh@google.com> am 82cadee3: Merge "Add support for PSC of serving cell." into gingerbread

Merge commit '82cadee3ca830315c617dfdbf3a8eef207c58436' into gingerbread-plus-aosp

* commit '82cadee3ca830315c617dfdbf3a8eef207c58436':
Add support for PSC of serving cell.
05a5a88a171721705685d1ae3dcfe82780907210 24-Jun-2010 jsh <jsh@google.com> Add support for PSC of serving cell.

Bug: 2465036
ndroid/telephony/gsm/GsmCellLocation.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
0b80ac98256114b0a3adb0de921581b786d807ea 03-Aug-2010 John Wang <johnwang@google.com> Add register methods in CallManager "do not merge"

Cherry-picked from master.

Add register methods used by PhoneApp into CallManager class.

For most register methods, CallManager acts as an pass-through

register to handle register and unregister phone case.

Change-Id: I9567c2dbffb9e482b906f94c2d991a404ad4626e
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/cdma/CdmaCall.java
om/android/internal/telephony/gsm/GsmCall.java
e0b35c6d44ea548b52a4e536b2dbd03c94b0afd3 03-Aug-2010 John Wang <johnwang@google.com> am 8bffa72b: Merge changes Ic30e2801,I387bab4d into gingerbread

Merge commit '8bffa72b9c711fec231108977ad9f2ba72678a82' into gingerbread-plus-aosp

* commit '8bffa72b9c711fec231108977ad9f2ba72678a82':
Handle call list in CallManager "do not merge".
Create CallManager class "do not merge"
4de9d202604657c0a55cc4ff1e9c633257c78160 03-Aug-2010 John Wang <johnwang@google.com> Handle call list in CallManager "do not merge".

Cherry-picked from master.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
* 1. APIs to access list of calls
* 2. APIs to check if any active call, which has connection other than
* disconnected ones, pleaser refer to Call.isIdle()
* 3. APIs to return first active call
* 4. APIs to return the connections of first active call
* 5. APIs to return other property of first active call

Change-Id: Ic30e28018d14e496e9427f96fec8a7c2ff7c1549
om/android/internal/telephony/CallManager.java
ccd88b65940eca419fab4b68d087573e7034d3f4 21-Jun-2010 John Wang <johnwang@google.com> Create CallManager class "do not merge"

Cherry-pick from master.
Initial check-in to support multiple call channels.

Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
om/android/internal/telephony/CallManager.java
ae2036a8f9365cec0f343f2668424e8e964a971c 02-Aug-2010 Wink Saville <wink@google.com> am 7472c219: am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.

Merge commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2'

* commit '7472c219a13e3f9f74d9a4adf1478e9c4f9248a2':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
7472c219a13e3f9f74d9a4adf1478e9c4f9248a2 02-Aug-2010 Wink Saville <wink@google.com> am 1540a7ea: am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.

Merge commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed' into gingerbread-plus-aosp

* commit '1540a7ea1afcb772b5fcf90f635153f6489eb8ed':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
1540a7ea1afcb772b5fcf90f635153f6489eb8ed 02-Aug-2010 Wink Saville <wink@google.com> am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.

Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
Add PhoneSubInfo.getCompleteVoiceMailNumber.
c69f5be0ed3529564e5db6874de52775c2c99007 02-Aug-2010 Wink Saville <wink@google.com> Add PhoneSubInfo.getCompleteVoiceMailNumber.

PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/PhoneSubInfoProxy.java
c9790716f0c759d8bb197f4237a2901e5f561b5b 27-Jan-2010 Dan Griffin <dan.griffin@wdsglobal.com> Enhance WspTypeDecoder to decode Content Type Parameters

This patch enables WspTypeDecoder to correctly parse content type
parameters as described in the Wap230 WSP specifications
(wap-230-wsp-20010705-a section 8.4.2.24) which are then passed on
as part of the WAP_PUSH intent notification.

It also recognises all Well Known WSP Content types, and simplifies
their retrieval (i.e. a well known content type will always be
available through the WspTypeDecoder.getValueString() method).

Change-Id: I0eb3f9ac287aa7cb53312777c4be54b1939fa857
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
e4866d016512d6670f98508846ccfb92a439a79c 27-Jun-2010 Naveen Kalla <nkalla@codeaurora.org> SIM toolkit enhancements and bug fixes

- Correct the Terminal response for GET_INKEY variable timeout.
GCF PTCRB Testcase GCF_PTCRB_USAT_GetInkey_27.22.4.2.8.1 checks for
DURATION TLV in the terminal response. Add DURATION TLV in the terminal
response for GET INKEY.

- According to TS 102.223/TS 31.111 section 6.8, Structure of TERMINAL RESPONSE,
"For all SIMPLE-TLV objects with Min=N, the ME should set the
CR(comprehension required) flag to comprehension not required.(CR=0)"
Since DEVICE_IDENTITIES and DURATION TLVs have Min=N, the CR flag is not set.

- Add support for Provide Local Information(PLI) Language setting. Send
terminal reponse with the locale language setting value read from
"persist.sys.language" system property.

- Send TR with BEYOND_TERMINAL_CAPABILITY for unsupported proactive commands

- Fix length coding for Text String in terminal response for GET INPUT.

Change-Id: I762b064f02f44772809f8bb029e8cefb838e7766
om/android/internal/telephony/cat/AppInterface.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/CommandParamsFactory.java
om/android/internal/telephony/cat/Input.java
om/android/internal/telephony/cat/ResponseData.java
01f51d3645b00889013fe91091d49cb9d3e137da 30-Jul-2010 Alex Yakavenka <ayakav@codeaurora.org> am 42b23da9: am a27353c1: Cat: Generalize stk into cat

Merge commit '42b23da99ba0679b40bcd402dcc04266a71e7d30'

* commit '42b23da99ba0679b40bcd402dcc04266a71e7d30':
Cat: Generalize stk into cat
42b23da99ba0679b40bcd402dcc04266a71e7d30 30-Jul-2010 Alex Yakavenka <ayakav@codeaurora.org> am a27353c1: Cat: Generalize stk into cat

Merge commit 'a27353c1965911f69be8d02a01b15389189eab9d' into gingerbread-plus-aosp

* commit 'a27353c1965911f69be8d02a01b15389189eab9d':
Cat: Generalize stk into cat
5ea2a2e055275b4910e792b7f9444ffb593805fb 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am b3311567: am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"

Merge commit 'b3311567017d2653fd5530a91c1de5436706c5e9'

* commit 'b3311567017d2653fd5530a91c1de5436706c5e9':
Cat: Move Stk imlpementation into Cat folder
87623088c8da558e287f13b7cf87c59f7000147f 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 257c696f: am d8d03c89: Merge "Ccat: Initial CCAT implementation"

Merge commit '257c696ff7155ebb71659e0a49761b76049d9ed8'

* commit '257c696ff7155ebb71659e0a49761b76049d9ed8':
Ccat: Initial CCAT implementation
b3311567017d2653fd5530a91c1de5436706c5e9 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 3d9e1696: Merge "Cat: Move Stk imlpementation into Cat folder"

Merge commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c' into gingerbread-plus-aosp

* commit '3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c':
Cat: Move Stk imlpementation into Cat folder
257c696ff7155ebb71659e0a49761b76049d9ed8 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am d8d03c89: Merge "Ccat: Initial CCAT implementation"

Merge commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf' into gingerbread-plus-aosp

* commit 'd8d03c890b03f063bdb669e25742b4f4c69d2bcf':
Ccat: Initial CCAT implementation
a27353c1965911f69be8d02a01b15389189eab9d 12-Jul-2010 Alex Yakavenka <ayakav@codeaurora.org> Cat: Generalize stk into cat

Rename all stk classes, comments and variables into cat classes.
Cat (Card Application Toolkit) is the common class that has
functionality of both Stk and Ccat.

Change-Id: Id0b99d0d9f4b0ce49adcb436060f13d5341ab8ab
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cat/AppInterface.java
om/android/internal/telephony/cat/BerTlv.java
om/android/internal/telephony/cat/CatCmdMessage.java
om/android/internal/telephony/cat/CatException.java
om/android/internal/telephony/cat/CatLog.java
om/android/internal/telephony/cat/CatResponseMessage.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/CommandDetails.java
om/android/internal/telephony/cat/CommandParams.java
om/android/internal/telephony/cat/CommandParamsFactory.java
om/android/internal/telephony/cat/ComprehensionTlv.java
om/android/internal/telephony/cat/Duration.java
om/android/internal/telephony/cat/FontSize.java
om/android/internal/telephony/cat/IconLoader.java
om/android/internal/telephony/cat/ImageDescriptor.java
om/android/internal/telephony/cat/Input.java
om/android/internal/telephony/cat/Item.java
om/android/internal/telephony/cat/LaunchBrowserMode.java
om/android/internal/telephony/cat/Menu.java
om/android/internal/telephony/cat/PresentationType.java
om/android/internal/telephony/cat/ResponseData.java
om/android/internal/telephony/cat/ResultCode.java
om/android/internal/telephony/cat/ResultException.java
om/android/internal/telephony/cat/RilMessageDecoder.java
om/android/internal/telephony/cat/TextAlignment.java
om/android/internal/telephony/cat/TextAttribute.java
om/android/internal/telephony/cat/TextColor.java
om/android/internal/telephony/cat/TextMessage.java
om/android/internal/telephony/cat/Tone.java
om/android/internal/telephony/cat/ToneSettings.java
om/android/internal/telephony/cat/ValueParser.java
om/android/internal/telephony/cat/package.html
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
3d9e1696ed5e68d5a834e3c3217e3226cfac5b6c 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Cat: Move Stk imlpementation into Cat folder"
d8d03c890b03f063bdb669e25742b4f4c69d2bcf 30-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Ccat: Initial CCAT implementation"
44a1e3a5747c1974d49db19dd091f13a4ab74cc7 29-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 969907f3: am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."

Merge commit '969907f3f59cf9420c3bd9d672b509196cf82cbe'

* commit '969907f3f59cf9420c3bd9d672b509196cf82cbe':
Make hasIccCard return true if RUIM card is present.
969907f3f59cf9420c3bd9d672b509196cf82cbe 29-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am f0fa8416: Merge "Make hasIccCard return true if RUIM card is present."

Merge commit 'f0fa8416e13b2885b858b6974b101c70833e4729' into gingerbread-plus-aosp

* commit 'f0fa8416e13b2885b858b6974b101c70833e4729':
Make hasIccCard return true if RUIM card is present.
f0fa8416e13b2885b858b6974b101c70833e4729 29-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Make hasIccCard return true if RUIM card is present."
aae052324fb1d3add554158974c5a6ee609739b3 29-Jul-2010 Dmitri Plotnikov <dplotnikov@google.com> Merge "Throws IllegalArgumentException if the country code is null."
1e80299bd4761df8328be15476ca88f2d1f9b1d8 29-Jul-2010 Bai Tao <michaelbai@google.com> Throws IllegalArgumentException if the country code is null.

Also removed unnecessary Locale check

Change-Id: I547713372900f1ea71e2215c0023a0981b6aca94
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
fae6ec9e9673e96085fdbde69866a41b5491fa0d 28-Jul-2010 Bai Tao <michaelbai@google.com> Added country based formatNumber methods

a. Format the number to E164.
b. Format the number based on country convention.
c. Normailize the number.

Change-Id: I39d59b99aa1a5136371dd20c74d9d9c8ec855369
ndroid/telephony/PhoneNumberUtils.java
cd35cb98a51a837790e5b993a885ae0ab16e0d65 26-Jul-2010 John Wang <johnwang@google.com> Add register methods in CallManager.

Add register methods used by PhoneApp into CallManager class.

For most register methods, CallManager acts as an pass-through

register to handle register and unregister phone case.

Change-Id: I74ce4e6d8e66f49c12b43bae1b0def0c7597a449
om/android/internal/telephony/CallManager.java
om/android/internal/telephony/cdma/CdmaCall.java
om/android/internal/telephony/gsm/GsmCall.java
0d027fc36597a777e9ec353414f480d32e34734b 24-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 1b05a79f: am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."

Merge commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae'

* commit '1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae':
Enables writing to USIM phonebook (fixes issue 8976).
1b05a79f7d3c77ac2135d8f1ab40f0b13854ffae 24-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 7cdd26ce: Merge "Enables writing to USIM phonebook (fixes issue 8976)."

Merge commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2' into gingerbread-plus-aosp

* commit '7cdd26ce30e61a108e4def932b96aca9f031e5d2':
Enables writing to USIM phonebook (fixes issue 8976).
7cdd26ce30e61a108e4def932b96aca9f031e5d2 24-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Enables writing to USIM phonebook (fixes issue 8976)."
66a17145043414866c2213fc720695098260a7c1 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 1cb7b2e9: am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"

Merge commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07'

* commit '1cb7b2e961fdbdfc39013846e97a918be2a14e07':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
1cb7b2e961fdbdfc39013846e97a918be2a14e07 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am e7486695: Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"

Merge commit 'e7486695ced2dd135f6e2223b582adde4155b917' into gingerbread-plus-aosp

* commit 'e7486695ced2dd135f6e2223b582adde4155b917':
Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE
e7486695ced2dd135f6e2223b582adde4155b917 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE"
9869fecb6c4b51ea25ff23ba14bad41bc232340a 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 4ef923d8: am b42aa98d: Merge "Correct VM number updation during MBDN refresh."

Merge commit '4ef923d849ec74c7208eaf650b169b5459276fc2'

* commit '4ef923d849ec74c7208eaf650b169b5459276fc2':
Correct VM number updation during MBDN refresh.
4ef923d849ec74c7208eaf650b169b5459276fc2 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am b42aa98d: Merge "Correct VM number updation during MBDN refresh."

Merge commit 'b42aa98d44f1ad22746005264274220770de2756' into gingerbread-plus-aosp

* commit 'b42aa98d44f1ad22746005264274220770de2756':
Correct VM number updation during MBDN refresh.
b42aa98d44f1ad22746005264274220770de2756 22-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Correct VM number updation during MBDN refresh."
35b858d24e0e08bb7bb0726770b5dadaa8611326 22-Jul-2010 Robert Greenwalt <robdroid@android.com> Remove an unneeded and improper import.

EOM

Change-Id: I2169114bc517875514f78db7bc5de6b57eeb2d9a
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
295d45bef4cf35bdf128a6d4dcc3df869a70b522 24-Jun-2010 jsh <jsh@google.com> Add support for PSC of serving cell.

Bug: 2465036
Change-Id: Id4bc0a60463510d5fd89113af7815360e09d2125
ndroid/telephony/gsm/GsmCellLocation.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
74ba31ba266231b76e2ab4ab46e0a9af6a6bcbb3 18-Jul-2010 happydroid <info@happydroid.com> Enables writing to USIM phonebook (fixes issue 8976).

Change-Id: I60c4e4fab58d13a83193492d828b0b519875c710
om/android/internal/telephony/AdnRecordCache.java
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
4a1d035b935abea0a046e6e243520ff367445327 19-Jul-2010 John Wang <johnwang@google.com> Merge "Handle call list in CallManager."
7d99cad7e09a01847f78d38a35b74e0e4ec38049 16-Jul-2010 John Wang <johnwang@google.com> Handle call list in CallManager.

Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
* 1. APIs to access list of calls
* 2. APIs to check if any active call, which has connection other than
* disconnected ones, pleaser refer to Call.isIdle()
* 3. APIs to return first active call
* 4. APIs to return the connections of first active call
* 5. APIs to return other property of first active call

Change-Id: I195682dbce630eda80144e169bf84c17177f3368
om/android/internal/telephony/CallManager.java
b17676ec43f325ca3164a9936655940b1a12e738 19-Jul-2010 Sang-il, Lee <gendoh@google.com> Add supporting MCC=450(Korea)

Change-Id: I888bc46b5a2ba618893317154869671df7ec2132
om/android/internal/telephony/MccTable.java
f268ed9cd9f1ac093d1eff87d3814408c5582210 17-Jul-2010 Robert Greenwalt <robdroid@android.com> Merge "Fix emulator dns."
6fefb33a672af97936eec322b416537da182434c 17-Jul-2010 Robert Greenwalt <robdroid@android.com> Fix emulator dns.

Really fix it this time. The previous fix had a flaw which tested ok but was removed
after a code review. This flaw masked problems in DataConnection, which this fix
fixes.

bug:2849192
Change-Id: I50d2dd827d4427f8030c0f590c85672869b509ff
om/android/internal/telephony/DataConnection.java
1b1f0bc1f8725901a34d05cf741ed3d91b1b8cbd 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 4248d588: merge from open-source master

Merge commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5'

* commit '4248d5887bf9d7d65b649a9ca0c7ba623135eed5':
Makes PhoneNumberUtils support international numbers after a CLIR command.
4248d5887bf9d7d65b649a9ca0c7ba623135eed5 16-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
32ca6aae619ba027f76c3b4a9d4bab6b13fbe148 15-Jul-2010 Romain Guy <romainguy@android.com> Merge "Makes PhoneNumberUtils support international numbers after a CLIR command."
a2d423a40fe1c5fd83828cfe0b836c16aa06266c 14-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am d7da5164: merge from open-source master

Merge commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c'

* commit 'd7da5164ba7744992fbc893c1c812614b0d57d8c':
Telephony: Process MT SMS with MTI set to 3
d7da5164ba7744992fbc893c1c812614b0d57d8c 14-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244
26dd7b3bb381ba06ce3a7eb17205e54fdd7becfc 14-Jul-2010 Robert Greenwalt <robdroid@android.com> Merge "Pass network properties to ConnectivityService."
adff0ad3cdae6c9bf043ab40fb0f40a54d5151ac 08-Apr-2010 Babis Triantafyllou <babis.triantafyllou.x@sonyericsson.com> Makes PhoneNumberUtils support international numbers after a CLIR command.

Makes PhoneNumberUtils.java support numbers in international
format (starting with ‘+’ character) after a CLIR command.

Previously a plus character would always be removed unless it
occupied the first position of the number string. In this case,
when the number is preceded by #31# (CLIR), the plus character
will be removed as well.

This is an error, prohibiting a type approval of the phone.

This change will detect the plus character after the CLIR command
and will insert it at the right position.

Change-Id: Ib220aee7b3eda30cde960db8c7470523dc5fd313
ndroid/telephony/PhoneNumberUtils.java
47f69fe2999e46004f2f2463b70d38de9ff7079a 16-Jun-2010 Robert Greenwalt <robdroid@android.com> Pass network properties to ConnectivityService.

Used as a bag to hold ipaddr, gateway, dns, proxy info.
addr's are InetAddresses for v4/v6 use. Cleaning up some old v4-only code

bug:2655015
Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
cb609625fd5c5cecf6e1e96601cdb3d335dcdc22 14-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Telephony: Process MT SMS with MTI set to 3"
fef09f1e17157b0ae3b7bc04b8e2ee968010c9d9 13-Jul-2010 Robert Greenwalt <robdroid@android.com> Merge "Revert to an uncompressed MccTable."
e2043da015fb5b3d59d5bae8de43974714bbaefd 26-Jun-2010 Robert Greenwalt <robdroid@android.com> Revert to an uncompressed MccTable.

The compressed MccTable didn't have enough space for all the timezones or languages in the world.
We can remove the timezones entirely by looking up the timezone from the ICU data. Since there
is not much to be gained from the binary format and it had real limitations we chose
to revert it.

Fixed a bug where the wifi channel was never being set.

bug:2284210
Change-Id: If9ca89f7053f937f555430b061c60cd7eec86d8e
om/android/internal/telephony/MccTable.java
7832efe7da2979d4a3c4361d124e3cf394c20b10 13-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am f079a659: merge from open-source master

Merge commit 'f079a659774473324b5739652c014229189a10ff'

* commit 'f079a659774473324b5739652c014229189a10ff':
Fix hang when error in SIM card communication
f079a659774473324b5739652c014229189a10ff 13-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I3af7e5270229f9fc6c57c9449052025af2a9bdca
35dbaf2c62073054790724fb0e06785a2c82b759 12-Jul-2010 Alex Yakavenka <ayakav@codeaurora.org> Cat: Move Stk imlpementation into Cat folder

Change-Id: I18e9e2cd11570b7ca3692fa08543fd5f1db2d1bd
om/android/internal/telephony/cat/AppInterface.java
om/android/internal/telephony/cat/BerTlv.java
om/android/internal/telephony/cat/CatCmdMessage.java
om/android/internal/telephony/cat/CatException.java
om/android/internal/telephony/cat/CatLog.java
om/android/internal/telephony/cat/CatResponseMessage.java
om/android/internal/telephony/cat/CatService.java
om/android/internal/telephony/cat/CommandDetails.java
om/android/internal/telephony/cat/CommandParams.java
om/android/internal/telephony/cat/CommandParamsFactory.java
om/android/internal/telephony/cat/ComprehensionTlv.java
om/android/internal/telephony/cat/Duration.java
om/android/internal/telephony/cat/FontSize.java
om/android/internal/telephony/cat/IconLoader.java
om/android/internal/telephony/cat/ImageDescriptor.java
om/android/internal/telephony/cat/Input.java
om/android/internal/telephony/cat/Item.java
om/android/internal/telephony/cat/LaunchBrowserMode.java
om/android/internal/telephony/cat/Menu.java
om/android/internal/telephony/cat/PresentationType.java
om/android/internal/telephony/cat/ResponseData.java
om/android/internal/telephony/cat/ResultCode.java
om/android/internal/telephony/cat/ResultException.java
om/android/internal/telephony/cat/RilMessageDecoder.java
om/android/internal/telephony/cat/TextAlignment.java
om/android/internal/telephony/cat/TextAttribute.java
om/android/internal/telephony/cat/TextColor.java
om/android/internal/telephony/cat/TextMessage.java
om/android/internal/telephony/cat/Tone.java
om/android/internal/telephony/cat/ToneSettings.java
om/android/internal/telephony/cat/ValueParser.java
om/android/internal/telephony/cat/package.html
om/android/internal/telephony/gsm/stk/AppInterface.java
om/android/internal/telephony/gsm/stk/BerTlv.java
om/android/internal/telephony/gsm/stk/CommandDetails.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/Duration.java
om/android/internal/telephony/gsm/stk/FontSize.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/ImageDescriptor.java
om/android/internal/telephony/gsm/stk/Input.java
om/android/internal/telephony/gsm/stk/Item.java
om/android/internal/telephony/gsm/stk/LaunchBrowserMode.java
om/android/internal/telephony/gsm/stk/Menu.java
om/android/internal/telephony/gsm/stk/PresentationType.java
om/android/internal/telephony/gsm/stk/ResponseData.java
om/android/internal/telephony/gsm/stk/ResultCode.java
om/android/internal/telephony/gsm/stk/ResultException.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/StkCmdMessage.java
om/android/internal/telephony/gsm/stk/StkException.java
om/android/internal/telephony/gsm/stk/StkLog.java
om/android/internal/telephony/gsm/stk/StkResponseMessage.java
om/android/internal/telephony/gsm/stk/StkService.java
om/android/internal/telephony/gsm/stk/TextAlignment.java
om/android/internal/telephony/gsm/stk/TextAttribute.java
om/android/internal/telephony/gsm/stk/TextColor.java
om/android/internal/telephony/gsm/stk/TextMessage.java
om/android/internal/telephony/gsm/stk/Tone.java
om/android/internal/telephony/gsm/stk/ToneSettings.java
om/android/internal/telephony/gsm/stk/ValueParser.java
om/android/internal/telephony/gsm/stk/package.html
4f1244e0de634c6b7a0e67e1a7cb9bf7f914e574 12-Jul-2010 Alex Yakavenka <ayakav@codeaurora.org> Ccat: Initial CCAT implementation

Launch Stk service for Cdma phone.

Change-Id: I1d0e00a3a31af59239b1355babb37f05cb7e5e07
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/StkService.java
014568bf45fdf32ce1ea7ef205ac8c8b09fc2b56 12-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix hang when error in SIM card communication"
36a86649db7a47d7a06f35dbd191435568a44367 27-Feb-2010 Kenny <gongwuchun@gmail.com> Fix send/receive MMS while the phone's state isn't in IDLE and the Network type can support voice and data calls concurrently
Change-Id: I67e5b1f6e4f855cc09dd76c251a86a06990b6499
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
3d59f8b41874e5e1183e236b7b079a0a0c510f6c 29-Jun-2010 Naveen Kalla <nkalla@codeaurora.org> Correct VM number updation during MBDN refresh.

The voice mail number and voice mail tag are not getting updated properly
during MBDN refresh. When the data in MBDN EF is invalid, the voice mail
number and voice mail tag are unchanged. They retain their previous value
where as they should be null in this case.

Change-Id: Ic3b9cb4cdf3ee5d2a33fc7e47cac968e752a0940
om/android/internal/telephony/gsm/SIMRecords.java
38a1054c1c79c422554346dbddf12cd3e4d5267c 28-Jun-2010 Stefan Larsson <stefan.larsson@sonyericsson.com> Fix hang when error in SIM card communication

When there is a problem communicating with the RIL (e g when the SIM
card is not connected) the IccPhoneBookManager hangs. This is corrected.

Change-Id: I28cf6cd3b79a29f4784fdef2b5072af5533e53da
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
2e896830f83d3398b9dac51ac0e9ad803a5bacdb 27-Jun-2010 Naveen Kalla <nkalla@codeaurora.org> Add missing logging for SET_TTY_MODE and QUERY_TTY_MODE

Change-Id: Ic794ef8258138b903f83c5ed77a0ee09e75ca094
om/android/internal/telephony/RIL.java
213c853f40074633d61bb7705843a9f4a00513b3 27-Jun-2010 Naveen Kalla <nkalla@codeaurora.org> Make hasIccCard return true if RUIM card is present.

Currently hasIccCard method works only for GSM phones with SIM/USIM
cards. Extend that to RUIM as well.

Change-Id: Iefbfc35025074e7414f4abdffea844e9e0325053
om/android/internal/telephony/IccCard.java
9d5316e3f56d138504565ff311145ac01621dff4 25-Jun-2010 Romain Guy <romainguy@google.com> Add colored rectangles implementation in OpenGLRenderer.

Drawing two rectangles one after the other discards the second one because of
Z buffering issues. This will be fixed in another changelist.

Change-Id: Ida1b3cde8a78e60cacc07e477abc44def527ff67
om/android/internal/telephony/CallManager.java
75d41c96a74eb344d17c72136fe20ff66833c591 22-Jun-2010 John Wang <johnwang@google.com> Merge "Create CallManager class."
0dfdc060056cb88e2d128bf6d80cf00447217eaf 21-Jun-2010 John Wang <johnwang@google.com> Create CallManager class.

Initial check-in to support multiple call channels.

Change-Id: I7c5147c57077d024bacd4f68938d249219eb0011
om/android/internal/telephony/CallManager.java
3b9f0a33a110d01e587ffd5ec7708af68723ad4b 21-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Recover a handful of commits that were reverted earlier
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/gsm/SIMRecords.java
3149ad13e58d4607f77c0c2177a00ce8c0ebda5b 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
c8e2cbd31a87976e6517d11905b8ddc26a064c3d 14-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
9451e71cf590d9942d773f93243753808c154123 14-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL."
58424b59fa553926676ebb38b6c722587eb789e8 14-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Corrected SPN and PLMN name handling"
5ddd127d5a38d80c0d8087d1770f41f61f84f048 12-Jun-2010 Dianne Hackborn <hackbod@google.com> Implement ListFragment and Fragment context menus.

Also fix the docs build.

Change-Id: I96f24cc03e6debd897171e503957284b140a9f27
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
4dc643eb6749afe5211198c920e739475590f92c 13-Jun-2010 Wink Saville <wink@google.com> Fix some javadoc link/see's to fix the build for the sdk-win_sdk target.

Change-Id: I243c19d3d7f1ed2decbd6bfc7ecbe6ce2b582fc2
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
ef4fd8e12e1928b1e9cdc03378bb1185d9e05cbe 07-Jun-2010 Bai Tao <michaelbai@google.com> Reimplement the PhoneNumberFormattingTextWatcher

a. Built the external/libphonenumberutil into the ext.jar. The file size increased 50K, the phone number meta file is 90K before the compression.
b. Used the external/libphonenumberutil to format the phone number for about 200 countries.
c. Beside the phone number formatting, the external/libphonenumberutil will also be used for phonenumber match and international dialing.

Change-Id: Ie5165dc60d66e1eddab7134725a8d1d1c826434a
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
02648a4b8422733ed401f07edf8e426318bb2f8d 18-May-2010 Robert Greenwalt <robdroid@android.com> Clean up APN notifications.

Add APNType info to notifications so you can tell what's happening. Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
ndroid/telephony/PhoneStateListener.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneNotifier.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
d994dcbd816d5431dfaa59de7457e28bdfc8f523 08-Jun-2010 The Android Open Source Project <initial-contribution@android.com> am cefdedc3: merge from froyo-plus-aosp
7ad843d66d3ebb9250f00e836f0e8e9502d7287b 08-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
47633f86279bc1854660d95a0b02bfa5ff14ad04 08-Feb-2010 Lars Dunemark <lars.dunemark@sonyericsson.com> Removes dashes when locale and number is not NANP or Japan

Removes all dashes if locale isn't NANP or Japan and the number
don't have there country code.

Use case: If adding a number starting with 1nnnnnn and then
trying to add a country code before (ex +46) we will first
trigger NANP formatting with +1-nnn-nnn so when we get
+41-nnn-nnn we will still have the old NANP formatting.
This number should be shown as +461nnnnnn.

Change-Id: I5cab830350d785a58367eba79e268d9e8ee16aac
ndroid/telephony/PhoneNumberUtils.java
05fefe62eedda9a694aee056ef34e0a01288fd58 06-Jun-2010 Robert Greenwalt <robdroid@android.com> am 1bdb78c1: am 9c4ed139: am f9610b38: Merge "Make the DUN apn data secure." into froyo
9c4ed1394bb16b1d76758127a9b5d73bd363adaf 06-Jun-2010 Robert Greenwalt <robdroid@android.com> am f9610b38: Merge "Make the DUN apn data secure." into froyo

Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
e7cce11edcb0e2315e6d65790b7effd9236d7dc5 05-Jun-2010 Robert Greenwalt <robdroid@android.com> am f9610b38: Merge "Make the DUN apn data secure." into froyo

Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
77b32ddbbeeb13a07b16f23af705567c75a8e3df 04-Jun-2010 Robert Greenwalt <robdroid@android.com> Make the DUN apn data secure.

Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
18804b3fe4133e4e5c29118eac9dc1d426220db3 26-May-2010 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Process MT SMS with MTI set to 3

Change-Id: Ie57a9465d41a3bd2c625ccf6e675af400be6d294
om/android/internal/telephony/gsm/SmsMessage.java
4d8ae85b5de8a90a597e4b649c6ee7208e446e3b 25-May-2010 Wink Saville <wink@google.com> Add needsOtaServiceProvisioning to Phone.

By having needsOtaServiceProvisioning supported on all phones we
eliminate the need to use an if statement to discriminate phone type.
Types of phones that don't support OTASP will return false in the
default implementation in PhoneBase.

Change-Id: I8fb15a18553e314c1f8f2a00ec7f8cffd79eeb7f
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
cae1bfd26629a83cf8646c4606ff6cf19fd1937d 19-May-2010 The Android Open Source Project <initial-contribution@android.com> am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master
3aecdb9d7e92b1a91860600feefb5c0062b652cf 18-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
e25863c9093d3f60a1f6feab1d17d38946a8d020 18-May-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
ndroid/telephony/ServiceState.java
0c8ecec8f1fa9d50bcc0ff496c12335babbd7854 18-May-2010 The Android Open Source Project <initial-contribution@android.com> am b4ab2204: am 143c3d32: am 5ccb8b8c: merge from open-source master
5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3 18-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
d87ed5a5c5851c41639a5cb4e48fc0670de84a2d 18-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix some typos and other cosmetic cleanups in telephony framework."
9f36f51844a6d8936f27af925ce8c22729a63f27 12-May-2010 Jake Hamby <jhamby@google.com> Fix updating and deleting FDN entries with an empty alpha identifier.

- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.

- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.

Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
om/android/internal/telephony/AdnRecord.java
om/android/internal/telephony/AdnRecordLoader.java
om/android/internal/telephony/IccProvider.java
27b2267c0d54e7da46d5712ae861281d7a8f6ad6 18-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Abort FDN delete when number is empty (instead of name)"
5e4b1b29de5069e7a0861f19ad342fbd3a763e38 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master
55b7d1243f15395a102971e8fdc57444638729ac 14-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
a2adf8f394bd568b6108fe989b0ac0ca2072670d 14-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "SetLocaleByCarrier, only if its not an unknown carrier."
390de220248d05ccb9dc10a197700ad3c1595937 11-May-2010 Jake Hamby <jhamby@google.com> Fix some typos and other cosmetic cleanups in telephony framework.

- Fix typos in Javadoc and comments.
- Fix Javadoc @link references to other classes/methods.
- Rename MISSING_UKNOWN_APN to MISSING_UNKNOWN_APN in DataConnection.
- Remove unused (and misspelled) RETRYIES_* consts in RetryManager.

Change-Id: I3b44ac8320d6c1e4c350be600c7ef266aaf735e4
ndroid/telephony/ServiceState.java
ndroid/telephony/gsm/SmsManager.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/PhoneSubInfoProxy.java
om/android/internal/telephony/RetryManager.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/TtyIntent.java
om/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/PdpConnection.java
a4bb6410403d7cc4e5cac82243ad2cc3fc1d3c60 13-May-2010 The Android Open Source Project <initial-contribution@android.com> am 1331ded8: am e28776bb: am b1110149: merge from open-source master
b1110149cccc3b99e59ead34ca46e5ac026f6db9 13-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
ecfb185eedecde3895b1340dfdb12b65bb72c32c 13-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Preserve '+' in phone numbers imported from SIM."
f4a1fd12969ad0497b2bc624684b560aba22a3a4 13-May-2010 The Android Open Source Project <initial-contribution@android.com> am 35b11843: am 1f35de2a: am 79090cb3: merge from open-source master
381b55863efcd65ed43d66924beae550c18d8930 13-May-2010 The Android Open Source Project <initial-contribution@android.com> am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master
8bf05f474201f1d545be179da08f4fdee0f50374 13-May-2010 The Android Open Source Project <initial-contribution@android.com> resolved conflicts for merge of fe953c43 to master

Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68
79090cb3da132d07cd3888ef9242df9872fb4aa1 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
4adacd23d4c91569b16fe50419f1a91f68d805bd 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
ccfd99b1e2a64c72ec433ebf5cf98d644ab24614 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
24d9c149c831f9793002af67f9e5436e415dfbea 12-May-2010 The Android Open Source Project <initial-contribution@android.com> am fc97669a: am 72a6af1a: am 7d952644: merge from open-source master
7d9526445c8631f347c7bf7d944e5bb1dc35b0b5 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
dff3d166f10538e87360a74cab8444665980fcd6 12-May-2010 The Android Open Source Project <initial-contribution@android.com> am 1b7e3ef4: am 55bef14f: am fb234bbe: merge from open-source master
052203e50c42bb75ceb90e8f4fa050aed7e70409 12-May-2010 Naveen Kalla <nkalla@codeaurora.org> Change license for the UUS Information file.

Change-Id: Idd77e9078354a46605142c2eb704823aaa7d560d
om/android/internal/telephony/UUSInfo.java
fb234bbe5e7cbae42b4fc8f4ab353ba561599db2 12-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
ce2a97aeb82d3f34a63472720ee9d53e53c248c2 24-Feb-2010 Samuel Holmberg <samuel.holmberg@sonyericsson.com> Preserve '+' in phone numbers imported from SIM.

Contacts with phonenumbers beginning with '+' lose the '+' in the
phonebook when imported from SIM.

This was only noticable on ADN-records with unknown NPI-values which
isn't very usual.

Change-Id: I181249759ae3d4181dd3cf627c7a588394b80419
ndroid/telephony/PhoneNumberUtils.java
232a69851d8f208a73d8b4ddb39708828ae9f205 24-Feb-2010 Henrik Hall <henrik.hall@sonyericsson.com> Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL.

Fixing incorrect data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS
in Android RIL.

The Android RIL specifies that the unsolicited response signal
RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS should contain a raw byte
array (ril.h). However, in the implementation of the Java RIL and
the C++ RIL daemon, the data is unpacked as a string. This causes
data delivered from the network stack to be garbled.

Changing so that both the C++ RIL deamon in platform/hardware/ril
and the Java RIL in frameworks/base follows the specification.

Change-Id: I9b9b26d16cd39422c43d9fa7aadfcff3e60c78ae
om/android/internal/telephony/RIL.java
0a5174a6e947d5cbeb8846a1273a90b6de065cbf 21-Apr-2010 Naveen Kalla <nkalla@codeaurora.org> Add support for EVDO Rev B

Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
24440cf8a9431291bdcaa77b418e6c4715932507 17-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Support for User to User Signaling (UUS)

Enabling passing UUS information during MO and MT calls.

Change-Id: I31621c0a9d3c0607d99d18c49bb6c593cadd0327
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DriverCall.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/UUSInfo.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/gsm/GsmConnection.java
om/android/internal/telephony/test/SimulatedCommands.java
cf1250c149120eebb464d9e613272e0976ff9498 11-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Support to display message when operation is blocked due to FDN being enabled"
18573e9281d6e5621fa1663dac29b558291913d7 29-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Support to display message when operation is blocked due to FDN being enabled

The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.

Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
ndroid/telephony/SmsManager.java
om/android/internal/telephony/CommandException.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/gsm/GsmMmiCode.java
ef2cf71420550fb45f89e67c56f338031f0adb63 11-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Notify user regarding invalid number during MO call."
ac6461c69e213d66aac61e0c19602a2ac331e84d 10-Feb-2010 Mikael Danielsson <mikael2.danielsson@sonyericsson.com> Abort FDN delete when number is empty (instead of name)

Changed FDN delete to abort when number is empty rather than
when name is empty

3GPP TS 31.102 (USIM application) v9.1.0 states in chapter
4.2.24 EFFDN (Fixed Dialling Number) that the Dialling Number
field is mandatory whereas the Alpha Identifier is optional.
The current implementation of the user interface for editing
the fixed dialling list blocks creation and deletion list
entries without a name (corresponding to the Alpha Identifier)
but instead permits entries without a number. This is incompatible
with the USIM specification and
implementation.

This contribution corrects the implementation in line with
the USIM specification.

Change-Id: I7e2ca06e20401b517d705fc45c8b873b5c21cc4c
om/android/internal/telephony/IccProvider.java
2af05feaa323b70254666522e3442f5f2012e4ec 07-May-2010 The Android Open Source Project <initial-contribution@android.com> am e107c141: am 9d164dc5: am f4dffd8a: merge from open-source master
f4dffd8a45386b5a5f0e6de4f30facc9eaac4001 07-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
108817f3d85f80ddeb8db0ced75502520449a550 06-May-2010 The Android Open Source Project <initial-contribution@android.com> am 8b270a7a: am 579e08e6: am f7896449: merge from open-source master
7751667c685a7fcb294092601c050531418febef 06-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
12849c8021644b391b934af4fb9a494aab84e1ff 06-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Type Zero Sms should not be displayed/stored/notified."
f78964490d8098387d51444c87bf520ad3f674e2 06-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
0938ef4215869c36575684b9949e82e547dbb65c 05-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "telephony: Fix CID when CID is unknown"
9e397775e18f369f7855affd23a3ce6a24053218 03-May-2010 Jake Hamby <jhamby@google.com> Fix Javadoc param tags and typo in private constant definition.

- Two Javadoc comments in telephony/cdma/SmsMessage.java had the wrong parameter name in @param.
- Typo in private constant defined in telephony/cdma/sms/BearerData.java.

Change-Id: I3c210383f74a5fef022e0958ab56ef9b7be8e97c
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
bcd573229e5ec6d59bb7931a84a2baa86e0d200a 24-Apr-2010 Jake Hamby <jhamby@google.com> Fix some more typos, remove unused imports, and remove unnecessary cast.

More minor code cleanups in the telephony framework.

Change-Id: I27abe11e02fc6fea12885eea4fe275240a546332
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
43a869f3adaa001a48bc437ed1934d8cb5d406c7 21-Apr-2010 Jake Hamby <jhamby@google.com> Fix some typos and move two .java files to the correct package directory.

- Fix typos in comments in TelephonyProperties.java
- Move two .java files in telephonytests to the correct package directory.

Change-Id: Ie69da31c128899d149d4f5d5aababe8d017d8f18
om/android/internal/telephony/TelephonyProperties.java
cbcd9be4104b3872902898b84fae92d1623fd8f1 20-Apr-2010 Jake Hamby <jhamby@google.com> Fix a few more Javadoc typos.

Change-Id: Id43fe2551ef53c1a0a779c6101ea0bc7c23e1f93
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
6308e48d40e72a53ddaf7881e1c95223ddf33b5d 23-Apr-2010 Naveen Kalla <nkalla@codeaurora.org> Notify user regarding invalid number during MO call.

When user dials an invalid number, network returns an error indicating
"unobtainable number" (See the Table 10.5.123/3GPP TS 24.008 for
the possible failure causes). Changes done to display message to
indicate user that an invalid number has been dialed.

Change-Id: I477d64bc3b59cc205396f911ff9630c640f619f3
om/android/internal/telephony/Connection.java
om/android/internal/telephony/gsm/CallFailCause.java
om/android/internal/telephony/gsm/GsmConnection.java
1b7f0d4e38799478746ac00650627cfff110d1c9 23-Apr-2010 Wei Huang <weih@google.com> am d54c48b2: am 9666bbdf: am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
9666bbdf1bb96dbf42b88443ad042e63971bfb4a 23-Apr-2010 Wei Huang <weih@google.com> am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo

Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp

* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
fdf3b26ba78ed308f45a2c6f79a5f977663ac3c8 23-Apr-2010 Wei Huang <weih@google.com> bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.

Change-Id: Ica1df6582533edf8d9a5825dbe510eeab4828309
om/android/internal/telephony/SmsMessageBase.java
701897451bea9d3566dae6f4aa2802bc6826c6b8 22-Apr-2010 John Wang <johnwang@google.com> am 81b7ea00: am f77fff4b: am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
f77fff4b4e904486bf25affde713294d40764e15 21-Apr-2010 John Wang <johnwang@google.com> am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo

Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
Add ILLEGAL_SIM_OR_ME error code.
7fb4b8455ccccde4698bed1a1906434a14a611a6 21-Apr-2010 John Wang <johnwang@google.com> Add ILLEGAL_SIM_OR_ME error code.

It is for bug 2571583 to provide better failure information of network operator selection.

Network selection returns ILLEGAL_SIM_OR_ME when the failure is
permanent and no retries needed, such as illegal SIM, ME, HRL config, etc.

Change-Id: Iaf70bef64d3cbf35e4d9915418cbb5b78607f73e
om/android/internal/telephony/CommandException.java
om/android/internal/telephony/RILConstants.java
3c0f1aed7c398e0767166b2c730f953d553a1386 21-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am d29eafdb: am f021d12f: merge from open-source master
f021d12f6f7116e9275cd3553a349ce5cb8aab14 21-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
d26924d8d7c29cbcbfaf43c408d3b54e50b7a7ce 12-Feb-2010 Fredrik Jagenheim <fredrik.jagenheim@sonyericsson.com> Corrected SPN and PLMN name handling

SPDI-file on SIM and BCD encoded PLMN-entries wasn't parsed correctly
causing us to display wrong networknames.

Change-Id: I09d80deec45b4b3ad525a9359b4866de7549e39e
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/gsm/SIMRecords.java
2aba0ec873e269b3ce5d044fe5f1f12b6b28228d 20-Apr-2010 Alex Yakavenka <alex.yakavenka@gmail.com> Fix printing order of phone objects creation
om/android/internal/telephony/PhoneFactory.java
eccd93c7eb8d31f71023f9d32cf0fb40bb097fa6 17-Jul-2009 Jey <jey.michael@gmail.com> SetLocaleByCarrier, only if its not an unknown carrier.

Change-Id: Ia218b3622a23cc0fc1bb2c1606c832ecc561d5bf
om/android/internal/telephony/PhoneBase.java
145ff609de3206b585819ef974fab20cdc2d9f5e 16-Apr-2010 Jake Hamby <jhamby@google.com> Spelling corrections and other minor cosmetic cleanups.

- Fixed a bunch of typos in comments (plus a few variable names)
- Removed unused import lines from telephony classes
- Added @Override attribute to overriding methods
- Made SmsMessage.PduParser inner class private & deleted unused constructor
- Added type specifiers to declarations of ArrayList and HashMap
- SimulatedCommands.getRegistrationState() had an ArrayIndexOutOfBoundsException
trying to write to index 14 of a 14-element array. I removed the
out-of-bounds assignment.

Change-Id: I054b5156aa64ab6639028d5b45a7e688b2deee08
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/IccSmsInterfaceManager.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/SmsHeader.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SmsMessage.java
om/android/internal/telephony/test/SimulatedCommands.java
e9c0a6d73711ace2ed53f90862ef06f3d0ed6afe 17-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Telephony: Add PUK MMI code support for CDMA RUIM phones

Add support to unlock RUIM using PUK. PUK is entered using MMI codes.
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaMmiCode.java
c6dd77d04a94b7fa0659a099e5b85b70f5f2ea9f 08-Apr-2010 Naveen Kalla <nkalla@codeaurora.org> telephony: Fix CID when CID is unknown

Unknown CID is indicated as 0xFFFFFFFF by ril. When telephony receives that
value, set CID to UNKNOWN.
ndroid/telephony/NeighboringCellInfo.java
662262ac040fac8b34cd7ebfb42563322c423a34 09-Apr-2010 Wink Saville <wink@google.com> Fix a FATAL ClassCastException in DataConnection.java

bug: 2583290
Change-Id: I93e0307664427b29942b1ed1e5acbf21e78a605f
om/android/internal/telephony/DataConnection.java
5945579e4ed8fbe6dae6adaa4c222b321c2ec80b 08-Apr-2010 Dan Egnor <egnor@google.com> Merge "Change TrafficStats to a new JNI implementation." into froyo
2b4abcd0c7c4361af8ab6d5d7b073fb75ac6d219 08-Apr-2010 Dan Egnor <egnor@google.com> Change TrafficStats to a new JNI implementation.

Also change phone's ConnectionStateTrackers to use it directly,
rather than through the INetStat binder interface.

Bug: 2578938
Change-Id: I8858e2609cbec3be845a0ce5178cb03f67e01b41
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
56c2d2ff27536a1d8edf0037cd41ff3ea3272fd9 07-Apr-2010 John Wang <johnwang@google.com> Add emergencyOnly indicator in ServiceState.

For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
ndroid/telephony/ServiceState.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
c16889dc0034daaf50b2307c4de6c16c4964f30c 24-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Type Zero Sms should not be displayed/stored/notified.

Type Zero messages indicated by TP_PID field set to value 0x40,
should not be displayed/stored/notified. They should only be
acknowledged.
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SmsMessage.java
02034d3568fb3b984e8d185d70e18ba19e592ba3 22-Mar-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
633dfb6da6d70cb369797b42df4bf046fdb3a07f 19-Mar-2010 Jake Hamby <jhamby@google.com> Fix some typos and logging of calls to CDMA methods.

Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
ndroid/telephony/SmsMessage.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/PhoneBase.java
2e805b19cdb309ea6eeb6d2e8b0915681f831f5a 22-Mar-2010 Brad Fitzpatrick <bradfitz@android.com> Grammar fixes.

Change-Id: I77672d2260c26aee146bb6a853137c14e3db1f28
om/android/internal/telephony/IccCard.java
1da49e45a8b5c656a364f0fad42b92fd4dd18b59 20-Mar-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
78b6e899145b08bbb8ccf3f12ecf0a5bb792033b 18-Mar-2010 Robert Greenwalt <robdroid@android.com> Add support for DUN over a cdma connection.

It uses the data profile paramater when setting up the connection to indicate
it's a tethered connection. We get different behavior from vzw afterwards, so
it is getting picked up.

bug:2422545
Change-Id: Ic022845088726d723813b82e166d15d7b2945da1
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/ApnSetting.java
8214deb542392f48b6c3fdc377fdf976c0b17a32 12-Mar-2010 jsh <jsh@google.com> Add definitions for WiMAX and iDen network types.

b/2509185

Change-Id: Icf07ce857874e200712218713edbdbb47e646297
ndroid/telephony/TelephonyManager.java
e04c0275d72f070314510a3c91e27f67635f86bd 13-Mar-2010 Wink Saville <wink@google.com> Merge "Fix data error handling."
abeff9479fae6b0b92e56bd7bd9d043cdfd9317a 13-Mar-2010 Wink Saville <wink@google.com> Fix data error handling.

In change I5776324a I made DataConnection.reset asynchronous.
That was a mistake as callers to cleanUpConnection assumed
it was synchronous. Added DataConnection.resetSynchronously
as a fix, someday the trackers will become asynchronous and
this won't be necessary.

Change-Id: I4669901e5c47a712212bb388c35fbb9f9ff603a7
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
7261128801d12e8f29b032fcacf26757a1bc606f 12-Mar-2010 Wink Saville <wink@google.com> Merge "Make sure that pause dialing works even when screen is off."
82c08459789e139aa94e8484e3e105b4f54f22a4 09-Mar-2010 Wink Saville <wink@google.com> Make sure that pause dialing works even when screen is off.

bug: 2200086
Change-Id: Ib8c73ce4bca293811ba681c558c37322125c511f
om/android/internal/telephony/cdma/CdmaConnection.java
cea764088d48723d3b58c0bc3a2ffba15770bb7d 12-Mar-2010 Wink Saville <wink@google.com> Add Copyright assignement.

bug: 2510419
Change-Id: I78355d89e7a9362f918a03c6fc5457209ea4490a
om/android/internal/telephony/cdma/EriInfo.java
om/android/internal/telephony/cdma/EriManager.java
15a4d2ffd04dc6c70f2cd17dae12ac6bc14c69ab 12-Mar-2010 Kenny Root <kroot@google.com> Add correct copyright headers to multiple files

Format for the list of changes shows the origin commit reference followed
by the file name.

33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java
33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java
133776-p9 core/java/android/app/IntentService.java
127013-p9 core/java/android/appwidget/AppWidgetHost.java
27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java
60765-p9 core/java/android/content/SyncResult.java
43920-p9 core/java/android/content/pm/ActivityInfo.java
43920-p9 core/java/android/content/pm/ApplicationInfo.java
43920-p9 core/java/android/content/pm/InstrumentationInfo.java
43920-p9 core/java/android/content/pm/PackageInfo.java
44103-p9 core/java/android/content/pm/PackageItemInfo.java
68960-p9 core/java/android/content/pm/PackageStats.java
43920-p9 core/java/android/content/pm/ResolveInfo.java
43920-p9 core/java/android/content/pm/ServiceInfo.java
60641-p9 core/java/android/content/res/Configuration.java
60734-p9 core/java/android/content/res/TypedArray.java
137672-p9 core/java/android/inputmethodservice/ExtractButton.java
123112-p9 core/java/android/inputmethodservice/ExtractEditText.java
119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java
115078-p9 core/java/android/os/BatteryStats.java
124790-p9 core/java/android/text/style/UpdateAppearance.java
45083-p9 core/java/android/view/RawInputEvent.java
101491-p9 core/java/android/view/inputmethod/EditorInfo.java
114701-p9 core/java/android/view/inputmethod/ExtractedText.java
123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java
119291-p9 core/java/com/android/internal/os/HandlerCaller.java
129279-p9 core/java/com/android/internal/os/PkgUsageStats.java
114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java
114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java
84364-p9 opengl/java/android/opengl/EGLLogWrapper.java
11355-p9 opengl/tools/glgen/src/CFunc.java
11355-p9 opengl/tools/glgen/src/CType.java
11355-p9 opengl/tools/glgen/src/CodeEmitter.java
11355-p9 opengl/tools/glgen/src/GenerateGL.java
11355-p9 opengl/tools/glgen/src/JFunc.java
11355-p9 opengl/tools/glgen/src/JType.java
11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java
11355-p9 opengl/tools/glgen/src/ParameterChecker.java
57236-p9 services/java/com/android/server/status/AnimatedImageView.java
66754-p9 services/java/com/android/server/status/CloseDragHandle.java
57188-p9 services/java/com/android/server/status/DateView.java
46928-p9 services/java/com/android/server/status/ExpandedView.java
70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java
45968-p9 services/java/com/android/server/status/IconData.java
57470-p9 services/java/com/android/server/status/IconMerger.java
82719-p9 services/java/com/android/server/status/LatestItemView.java
45968-p9 services/java/com/android/server/status/NotificationData.java
66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java
57458-p9 services/java/com/android/server/status/NotificationViewList.java
45968-p9 services/java/com/android/server/status/StatusBarException.java
45968-p9 services/java/com/android/server/status/StatusBarIcon.java
46130-p9 services/java/com/android/server/status/StatusBarNotification.java
45968-p9 services/java/com/android/server/status/StatusBarView.java
46199-p9 services/java/com/android/server/status/Ticker.java
62286-p9 services/java/com/android/server/status/TickerView.java
57188-p9 services/java/com/android/server/status/TrackingView.java
86041-p9 telephony/java/android/telephony/PhoneStateListener.java
87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java
136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java
34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java
55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java
127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java
129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java
129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java
128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java
25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java
46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java
77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java
9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java
53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java
93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java
328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java
307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java
eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java
49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java
a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java
3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java
5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java
c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java
9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java
21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java
4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java
e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java
192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java
1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java
560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java
1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java
69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java
c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java
7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java
df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java
cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java

Copyright header moved to top in following file:

core/tests/coretests/src/android/widget/ListViewTest.java

Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
ndroid/telephony/PhoneStateListener.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/gsm/SpnOverride.java
eb3035cbcad06a9154f69e9bb22231b0632946b2 11-Mar-2010 John Wang <johnwang@google.com> Merge "Make getCellLocation return null if not available."
41a46718b3deec95661e149b3acea2a9e54016be 10-Mar-2010 John Wang <johnwang@google.com> Make getCellLocation return null if not available.

For bug 2422284.

Check the cell location and return null if the location is not available.

Change-Id: Ie9a331b906a8253c9a9596365af8705dc03823ce
ndroid/telephony/CellLocation.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/cdma/CdmaCellLocation.java
ndroid/telephony/gsm/GsmCellLocation.java
a9729deb9cb5b79962bba76c0d3d5d852d3e27df 09-Mar-2010 Robert Greenwalt <robdroid@android.com> Merge "Update the Mcc Table for Canada."
e640a5aee4dbc3417f2b40d21b4c6304ba921415 09-Mar-2010 Robert Greenwalt <robdroid@android.com> Update the Mcc Table for Canada.

Changing the mnc length from 2 to 3. We don't have any canandian APNs with 2 digit mncs
and wikipedia doesn't list any canadian carriers with 2 digit mncs.

Rogers was reporting some sims with 72 and others with the correct 720 - a sample "72" sim
didn't have the mnc-length field set so we went with 2. With this fix all rogers sims will
be picked up correctly.
om/android/internal/telephony/MccTable.java
01b6d244174b4fe5434593fc89189ba94bc76e7d 05-Mar-2010 Wink Saville <wink@google.com> Allow the configuration string to have quotes.

This makes properties easier to read so from:
ro.cdma.data_retry_config=default_randomization=2000,0,0,120000,180000

to this:
ro.cdma.data_retry_config="default_randomization=2000,0,0,120000,180000"

Change-Id: Ied2a7be0102512cd2ce528d566c19ed3a8e2f480
om/android/internal/telephony/RetryManager.java
fe4f2c9ea2c97c58ace24d6abaeae30165f16e0e 04-Mar-2010 John Wang <johnwang@google.com> Merge "Add r-w property of emergency number list."
fc26c77f617eb64857127d80618b79de61b18341 04-Mar-2010 John Wang <johnwang@google.com> Update DSAC notification.

Update the notification string of CS restricted per DoCoMo's request. More restricted message string are added for future use.
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
0bd36175fbdf4f1506c5dcf93b43f3559837e207 04-Mar-2010 John Wang <johnwang@google.com> Add r-w property of emergency number list.

Currently, the emergency calls are put into an readonly property ro.ril.ecclist.

It is possible that ecclist has to be changed before and after SIM pin lock.

And ecclist can also be changed after network broadcasts the local emgergency numbers.

So add r-w property ril.ecclist to make emergency number list changable, while still

check r-o property to make old RIL work.
ndroid/telephony/PhoneNumberUtils.java
1a61b586b59243dab6c70984ab4418451f7d78fa 04-Mar-2010 Naveen Kalla <nkalla@codeaurora.org> Retry pending memory status update to modem when radio is ON.

When radio is powered off / airplane mode, memory status updates are
ignored by RIL. With this fix, pending memory status updates are sent
again when radio is powered back on.
om/android/internal/telephony/SMSDispatcher.java
16dc6dbf30d3682491f65ca702023a92481d32c4 03-Mar-2010 Wink Saville <wink@google.com> Fix a loss of data.

Fix a bug in DataConnection state machine where the notification
of disconnection completion was sent before we actually transitioned
to the in active state. Also, change conn.reset to send a response
so the user can know when the transition to the in active state
completes for that also.

bug: 2471897
Change-Id: I5776324ac89a607925d07f4a600bc5b34c3f3ed6
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
448fa8ba41b61b86d66c6f7ac5cf6d0fd611984e 26-Feb-2010 Mike Lockwood <lockwood@android.com> CdmaDataConnectionTracker: Add DUN to list of supported APN types.

Change-Id: I72549a761757f93cfeb9d16e2f64331134155156
Signed-off-by: Mike Lockwood <lockwood@android.com>
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
2269d1572e5fcfb725ea55f5764d8c3280d69f6d 25-Feb-2010 Dianne Hackborn <hackbod@google.com> Re-arrange android-common so framework no longer links with it.

This is the framework part, moving classes around so the framework
no longer needs to link to android-common. Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
om/android/internal/telephony/IccProvider.java
om/android/internal/telephony/cdma/EriManager.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/SpnOverride.java
om/android/internal/telephony/gsm/VoiceMailConstants.java
c03fa5014912684367174ff3cce664deb29f5e0e 24-Feb-2010 Robert Greenwalt <robdroid@android.com> Add mobile data on/off switch.

bug:2251458
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
5cde63a60d3c70e613642ad8a3910bcd3475e9cb 24-Feb-2010 Robert Greenwalt <robdroid@android.com> Merge "Add USB RNDIS enable/disable control"
65ae29bd852ff468ad003af241d5177fe016c74a 18-Feb-2010 Robert Greenwalt <robdroid@android.com> Add USB RNDIS enable/disable control

Also adding interface configuration to the tethering machine.
Also fixing netd bug that didn't send up/down portion of iface config command.
om/android/internal/telephony/DataConnectionTracker.java
a1303e0193aeb32131572fb0dfe8e595a908b4e0 23-Feb-2010 Romain Guy <romainguy@android.com> Calling super.finalize() in finalize() methods.
Also cleanup code, mostly removing unused handlers and casts.
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
om/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
7b1c067b90f6768c14516603528adf270fb3bc39 17-Feb-2010 Kenny Root <kroot@google.com> Merge "Correct use of logical AND"
433735f8719b418cb56133bf4862db68a96fbc70 17-Feb-2010 Kenny Root <kroot@google.com> Merge "Prevent sign extension in IccUtils.parseToRGB"
a409128a7238b7b7a2b38f8b3732ca8905b89c71 17-Feb-2010 Kenny Root <kroot@google.com> Prevent sign extension in UsimPhoneBookManager

When performing a logical OR on a byte value, make sure to truncate its
value to prevent possible sign extension when it is converted to 32-bit.

Change-Id: I7bdfded32cec3e8a5f6b5c45316b2af5ab9471d1
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
d142df535d42b6927bcdb864d64fb5ef439da94e 17-Feb-2010 Kenny Root <kroot@google.com> Prevent sign extension in IccUtils.parseToRGB

When a signed byte value is taken from an array, make sure to truncate
it so it doesn't have a problem when it's sign extended to 32-bit.

Change-Id: Ic2b35c317e21c63dff960501145a4f3074b687ad
om/android/internal/telephony/IccUtils.java
7ae17760462e4c16ef0ea4289612c5950258d5da 17-Feb-2010 Kenny Root <kroot@google.com> Correct use of logical AND

A bitwise AND was use when a logical AND was meant to be used.

Change-Id: I4e5529ff9fce1e6397d7cd9483268766fc92dcf5
ndroid/telephony/PhoneNumberUtils.java
5b31fdae6004c48e4915afb084c3f7944ac0f9aa 13-Feb-2010 Wink Saville <wink@google.com> am 58d6a20c: am 6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair

Merge commit '58d6a20cfaa55ebe269ac0736999b90c3227b0c1'

* commit '58d6a20cfaa55ebe269ac0736999b90c3227b0c1':
Always assume evdoXxxx signal strength values are correct.
7d97ff10c7555d6b80dc5e6925f066fa8df8258c 13-Feb-2010 Wink Saville <wink@google.com> Always assume evdoXxxx signal strength values are correct.

This solves a race condition between the network type changing and
a signal strength changing. This could cause StatusBarPolicy to see
the -1 values for the evdo strength parameters and hence 0 bars would
be displayed.

Bug: 2419251
Change-Id: Iba0bdbd2023b6a5e49fc1f82c997ec3219158286
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
9384b145e625b3bb6ff8b829ddb1466e16a78f49 11-Feb-2010 Mark Vandevoorde <mtv@google.com> Map base station lat-lng of "0","0" to undefined.

Also introduce a public constant for the invalid lat/lng value.

Change-Id: Ifaa1e563bfa94c06dfbba51157b9160055442682
ndroid/telephony/cdma/CdmaCellLocation.java
ndroid/telephony/gsm/GsmCellLocation.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
777db0c08a1bee45acc2ca3fcc62ef1db6d0e221 11-Feb-2010 Eric Laurent <elaurent@google.com> Merge "resolved conflicts for merge of 61bb25f2 to master"
d7b92a0ff395fa45d934eaa4242bf2598da88964 11-Feb-2010 Eric Laurent <elaurent@google.com> resolved conflicts for merge of 61bb25f2 to master
18e939623556928f73fcc7511c85a537929a4a7e 11-Feb-2010 Dan Egnor <egnor@google.com> Eliminate dependencies on Checkin, replacing checkin events with EventLog
events (and in one case, a DropBox entry).

Add a simple intent that triggers master-clear (and toggle EFS), given the
right permissions.

Bug: 2264596
Bug: 2350452
Bug: 2264596
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/EventLogTags.logtags
om/android/internal/telephony/TelephonyEventLog.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
7749adfd0184b876ff6f8d1961959ca95ab82244 10-Feb-2010 Eric Laurent <elaurent@google.com> Fix issue: 2413494: Add TTY support.

This is a new implementation of TTY support.
Previous implementation in commit aead64def1fe58c95c086a0ca00cf0b13fa32ef1 is reverted.
The new method does not rely any more on the kernel headset driver to send a UEvent containing
current TTY mode.
om/android/internal/telephony/cdma/TtyIntent.java
7188f946521d64ea21121939d2a4c279f33fe910 02-Feb-2010 Wink Saville <wink@google.com> Cleanup comments, see bug 2401350.

Change-Id: Ieaeeba44b235038ad9b75a57b37658738532df3f
om/android/internal/telephony/Phone.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaInformationRecords.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
6a31dfa905695b3f6837fe76ab2f1c68e9d14b16 01-Feb-2010 John Wang <johnwang@google.com> am 1ef6fb3b: am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair

Merge commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785'

* commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785':
Handle RIL_UNSOL_RESEND_INCALL_MUTE.
1ccc41ed938ff005ae3d621292580a90601242ca 29-Jan-2010 John Wang <johnwang@google.com> Handle RIL_UNSOL_RESEND_INCALL_MUTE.

For bug 2400052.

Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
5bb33718236cee8dea9457ffa5ba99ba930ac9ab 28-Jan-2010 John Wang <johnwang@google.com> am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair

Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

* commit '89fec7b155981d6e99eb1e05793f343a5d04aa59':
Updated emergency string when locale changes.
70aaacac8217552ae4def243011c5359075836b0 28-Jan-2010 John Wang <johnwang@google.com> am 64c92f75: am 08cb0024: Handle emergency calls only status in ServiceStateTracker.

Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'

* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
Handle emergency calls only status in ServiceStateTracker.
ec22b4c468e5a47c64782a8d9f81f46cd3dbb2e1 28-Jan-2010 jsh <jsh@google.com> am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.

Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d'

* commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d':
Fix NPE when importing from USIM.
c30ffda0d84e0c3d9b8a4ccc18b3895ae467ae40 26-Jan-2010 Irfan Sheriff <isheriff@google.com> resolved conflicts for merge of d0514347 to master
670db2c696251370c4806ee3ecc3c7d6370b38e8 22-Jan-2010 John Wang <johnwang@google.com> Updated emergency string when locale changes.

For bug 2352094.
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
08cb0024026e0f42612ab569e1e4067d5ede3bf8 22-Jan-2010 John Wang <johnwang@google.com> Handle emergency calls only status in ServiceStateTracker.

For bug 2352094, handle emergency calls only status and
pass the emergency calls only string via SPN_STRING_UPDATED intent.
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
036e21083d9936425687d7de29e95b2c458a7e4a 22-Jan-2010 jsh <jsh@google.com> Fix NPE when importing from USIM.

Need to check if fileIds is empty.

b/2349232
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
ac376f4854e3ddf0b8fc337dfbdfe8f2ec3e62ed 21-Jan-2010 Wink Saville <wink@google.com> Fix build, GsmServiceStateTracker was using old EventLog API.

Change-Id: Ib202d0ebbbb11c0ccad40445426c0c3704eb30b5
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
88a195b58aa06d0c73ce5cc927fdab2cce996751 21-Jan-2010 John Wang <johnwang@google.com> am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair

Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'

* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
Add Event log for RAT switch.
dcc14d6a26961a3ba45eaeb7305fdafb2b6694e2 21-Jan-2010 Irfan Sheriff <isheriff@google.com> Merge "Use MCC value to always override channel count setting" into eclair
51e2f71f4aeaed56e1e7819685f7ff8cff66d011 21-Jan-2010 Irfan Sheriff <isheriff@google.com> Use MCC value to always override channel count setting

FCC raised the issue of not allowing users to configure
channel counts beyond 11. This change enforces the channel
count based on MCC values.

Bug: 2378844
om/android/internal/telephony/MccTable.java
15abc90147333fccf7c9576cbf90d40d73e5a20f 17-Dec-2009 Robert Greenwalt <robdroid@android.com> Cleanup of process-specific DNS.

Backport of MR2 change 421c72b6.

Removes entries sooner. A bug.
Doesn't add one for phone process at all. This was intended to be removed long ago.

bug: 2329900
bug: 2377507
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
b61c1a0f8b813347f376e7eea6d388342d8adfe3 14-Jan-2010 John Wang <johnwang@google.com> Add Event log for RAT switch.

Write event log while the 2G/3G radio access technology switched.
om/android/internal/telephony/TelephonyEventLog.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
f6f56c051c85828de790f9b0b7f78e93abd9c4a2 13-Jan-2010 John Wang <johnwang@google.com> Merge "Hangup calls before powering off radio."
c72509b4d815e23bfa563cfe96e04f54f2a221fe 06-Jan-2010 Nicolas Catania <niko@google.com> Fix the CallerInfo lookup when a phone URL is used.

Typically the CallerInfo is looked up based on a phone number, in which case the '_id' column
contains the contact id.

However when the lookup is based on a phone row, the '_id' column is the row number we queried.
The contact id is stored somewhere else in a 'contact_id' column.

The current fix, checks the mime type of the contactRef URL to find out which column contains
the contact id.
I think the contact DB should be more consistent and always return the contact id AS contact_id even
in the phone number scenario.

Bug:2269240
om/android/internal/telephony/CallerInfo.java
3805c7ca324f232972c959e06253de4242f83607 07-Jan-2010 John Wang <johnwang@google.com> Hangup calls before powering off radio.

Bug 2339655. Should hangup the existing voice call (including onhold ones) before powering off radio to ensure the proper sequence at radio protocol level. Otherwise the carrier will treat it as drop calls.
om/android/internal/telephony/Call.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
edc5189c33de03f3e2f5f73edc0e007992b933c9 07-Jan-2010 Doug Zongker <dougz@android.com> change remaining frameworks/base Gservices to Secure settings

Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
62136d3e1c1262fc31a1f77f6d6acbd75e5ea81d 06-Jan-2010 Dan Egnor <egnor@google.com> Simplify EventLog interface -- remove supported for nested
sequences (which nobody used) and streamline the API, adding
documentation in preparation for inclusion in the SDK.

Gut and deprecate EventLogTags, which unfortunately was put
into the public SDK (an oversight). Include the functionality
in EventLog proper, in a simpler and easier to use manner.

This change doesn't actually un-@hide anything, but it does
change it to @pending.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
6aa8a21bb48ee6fe8fb496ede609727131837a6e 05-Jan-2010 Wink Saville <wink@google.com> Fix data connection support on emulator.

Bug: 2353316
Change-Id: I34765c70fc6ef160956d400647565c577141c0bf
om/android/internal/telephony/DataConnection.java
08dca8fa4bd3e90bd7b98feb15dc0efdea8193c7 28-Dec-2009 Wink Saville <wink@google.com> Turn off HSM debugging in DataConnection, to verbose.

Change-Id: I101b228e5810884084519bbc5ffd86cb3ab7a54e
om/android/internal/telephony/DataConnection.java
759a77e50211b9b1ba937f9ff89ae1fa35ca88e9 24-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I0fa1b245

* changes:
telephony: Populate the User-to-user signaling info fields.
5e26465abb97c674df00ae620137e776aae3d541 23-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ia834022d

* changes:
Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.
02722fbd77fa22f60ed3778b806b1e8f176b88c1 22-Dec-2009 Wink Saville <wink@google.com> Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.

Change-Id: Ia834022d04e65c42d671f63b2fec46804fe8a562
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataLink.java
om/android/internal/telephony/DataLinkInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/PdpConnection.java
0fa1b24593bbe7972bfbc5290519359db8c4ade6 04-Dec-2009 Naveen Kalla <nkalla@quicinc.com> telephony: Populate the User-to-user signaling info fields.

Since the RIL interface has been enhanced to support user-user signaling
information, we need to populate the fields for RIL_REQUEST_DIAL and
decode the fields in RIL_Call. Handle the default case when UUS Info is not
present so that the RIL interface change does not break the normal case.
om/android/internal/telephony/RIL.java
f0108cda21bec61418b24aa6217406072780b5d5 22-Dec-2009 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of ad2fa35d to master

Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
1d2f5c39bbc50f0cae1daf77c9df6fc2dd5954a2 22-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I76d2295c

* changes:
SIM toolkit: Phone app crashes while reading SIM card
d4a4729c0cac582a2dcec7c8cfb316b81885a0f0 21-Dec-2009 Tom Taylor <tomtaylor@google.com> Update imports to android-common

Several files were moved to android-common. Update all the references
to import those files from the new location.
om/android/internal/telephony/IccProvider.java
om/android/internal/telephony/cdma/EriManager.java
om/android/internal/telephony/gsm/SpnOverride.java
om/android/internal/telephony/gsm/VoiceMailConstants.java
76d2295c8e01a21e9574adb81bdca0894a51af54 16-Dec-2009 John Joseph <jnjoseph@quicinc.com> SIM toolkit: Phone app crashes while reading SIM card

Incorrect log message results in an IllegalFormatConversionException
when trying to print SIMRecords Object as an integer.
om/android/internal/telephony/gsm/stk/StkService.java
83fd7b0d53f2fecb5b92cb911910e07659e246ca 16-Dec-2009 John Joseph <jnjoseph@quicinc.com> frameworks/base: Handle broadcast sms properly

Broadcast SMS does not have teleservice id field. Add
support to identify broadcast SMS based on message type.
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
41c561781323c697e42eef5c08310dbd8c1bf63a 18-Dec-2009 Robert Greenwalt <robdroid@android.com> am 24317443: am 421c72b6: Cleanup of process-specific DNS.

Merge commit '24317443fde973c762afbea1a3f6f2c830dfe3dd'

* commit '24317443fde973c762afbea1a3f6f2c830dfe3dd':
Cleanup of process-specific DNS.
421c72b6773582dd1473ace44c42d4e0ee1287e3 17-Dec-2009 Robert Greenwalt <robdroid@android.com> Cleanup of process-specific DNS.

Removes entries sooner. A bug.
Doesn't add one for phone process at all. This was intended to be removed long ago.

bug: 2329900
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
1e5710ce6fb76013a96473564d7a8a06db5e54cb 16-Dec-2009 Scott Main <smain@google.com> am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair

Merge commit '73536dda20594e4b5e83396d705127a823bfa362'

* commit '73536dda20594e4b5e83396d705127a823bfa362':
docs: add 2.1 platform notes, win usb driver notes
b149ee883502af8ae71757f9098c8e98c8548d25 15-Dec-2009 Scott Main <smain@google.com> docs: add 2.1 platform notes, win usb driver notes
and fix some javadocs for PhonestateListener
ndroid/telephony/PhoneStateListener.java
74a76d5e071ba11eb92c92933fa5de338010374d 15-Dec-2009 Dianne Hackborn <hackbod@google.com> am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2

Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
Implement API to have new broadcasts replace existing broadcasts.
1c633fc89bae9bf0af6fe643ac7ad2e744f27bed 09-Dec-2009 Dianne Hackborn <hackbod@google.com> Implement API to have new broadcasts replace existing broadcasts.

Use this in various places where it should serve no purpose to deliver
both broadcasts. This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
7a4fb7376b6819f609b8f462c56329eff50fcb6d 11-Dec-2009 Wink Saville <wink@google.com> am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2

Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
Implement a HierarchicalStateMachine
8fb0faf3cc2f792db8cf38fe5ab67c5eab7baa5c 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I0a56959e into eclair-mr2

* changes:
Implement a HierarchicalStateMachine
dd9571f0a543d9987b30052c480280509520ec51 10-Dec-2009 Wink Saville <wink@google.com> am 9f4cea68: am a41e0680: Merge change I36785a9d into eclair-mr2

Merge commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727'

* commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727':
Telephony: Make resetting radio on a radio technology change optional
fc5b4802a544b6ca304aa7e58a26018ef714d233 09-Dec-2009 Wink Saville <wink@google.com> Implement a HierarchicalStateMachine

A hierarchical state machine is a state machine which processes messages
and can have states arranged hierarchically. Each state in the state
machine may have a single parent state and if a child state is unable to
handle a message it may have the message processed by its parent.

Change-Id: I0a56959ece8f89e4f9122dc8044120b82d517bbb
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
d7d6fb39470e212ce53b05fdc1c4dd8a724e9db7 09-Dec-2009 Wink Saville <wink@google.com> Telephony: Make resetting radio on a radio technology change optional

When there is a radio technology change in a multimode modem, resetting
the radio is not necessary always. Reset radio only when a property is
set. Notify applications that data connection is lost and ignore
notifications coming on the old radio technology.

Minor optimizations and bug fixes in CdmaDataConnectionTracker.
- Stop netstat polling when data connection is not active
- check all the elements of the data call list array to figure out if the
data connection is active.

Change-Id: I36785a9d1bf8ee135b574b61e9ba371faa04ffc7
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
cc602381656b13dfc20e51ef1dc4302364ea82dc 03-Dec-2009 Takaoka G. Tadashi <takaoka@google.com> am 94985152: am d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm

Merge commit '949851525a1aebca0d7d6b9a3465d5e572c8c621'

* commit '949851525a1aebca0d7d6b9a3465d5e572c8c621':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
bdb9b3042ad019bede603fe2fa0aed8ba5217876 03-Dec-2009 Takaoka G. Tadashi <takaoka@google.com> am 5d2a7b26: am 7d51517c: Merge change I611c15cf into eclair-mr2

Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'

* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
Add DoCoMo vendor specific OMNA WSP content type number
16fbdbfb01fffd249e4445dcfb9f19108481687c 03-Dec-2009 Wink Saville <wink@google.com> am a7493240: am 2f9d8dbe: Merge change I749d6801 into eclair-mr2

Merge commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af'

* commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
03fe67da5a3c180c4624a1129bcbe14082190eef 03-Dec-2009 Wink Saville <wink@google.com> am ea200b0c: am 7d2fd650: am cc6ff2bc: Cleanup @hide and @deprecated directives.

Merge commit 'ea200b0c6f92ebdd116b088cf895b4aa82fe8c2e'

* commit 'ea200b0c6f92ebdd116b088cf895b4aa82fe8c2e':
Cleanup @hide and @deprecated directives.
d5b325aaaca7e5197851d26332f48b917d961b9d 04-Nov-2009 Takaoka G. Tadashi <takaoka@google.com> Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Import CL 146651 from //branches/cupcake_dcm
om/android/internal/telephony/WapPushOverSms.java
7d51517cec75cbccd1ac53ac6ca7dd506af4637e 03-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I611c15cf into eclair-mr2

* changes:
Add DoCoMo vendor specific OMNA WSP content type number Import CL 145261 from //branches/cupcake_dcm
144fdfec240a56890657d2248a22bdda9f22470c 03-Dec-2009 Wink Saville <wink@google.com> Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
and minor fixes.

Fix the following
- When PROPERTY_OPERATOR_NUMERIC is not set, the value is "" when CDMAPhone
is initialized. The constructor tries to extract MCC and MNC from this
property and results in a StringIndexOutOfBounds exception. Check for empty
OperatorNumeric string before trying to extract MCC and MNC
- Handle RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING response gracefully.

Change-Id: I749d6801bb4794d56e8fd672dec69dfea2b5c756
om/android/internal/telephony/MccTable.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CDMAPhone.java
7d2fd6501595137e91ad042cd550decd2f8040fc 02-Dec-2009 Wink Saville <wink@google.com> am cc6ff2bc: Cleanup @hide and @deprecated directives.

Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2

* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.
cc6ff2bc6011294367d9a8c644f811449e952eb7 02-Dec-2009 Wink Saville <wink@google.com> Cleanup @hide and @deprecated directives.

Bug: 2294396
Change-Id: Icb34706a203fb34e52c67b904328e91a7803d4fc
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/SignalStrength.java
611c15cfc607e5fb29d0dab0907d00cf84f1767b 04-Nov-2009 Takaoka G. Tadashi <takaoka@google.com> Add DoCoMo vendor specific OMNA WSP content type number
Import CL 145261 from //branches/cupcake_dcm

See http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.aspx
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
76065faf5ebe636f953d416014955a1a008b352a 02-Dec-2009 Bai Tao <michaelbai@google.com> am 57928702: am a8c79a8c: am 90aaaef5: Merge change I0e200c3c into eclair

Merge commit '57928702bf4311f875bc3e2cccfdccbffb99a461'

* commit '57928702bf4311f875bc3e2cccfdccbffb99a461':
Sending UCS2 encoded SMS correctly
a8c79a8c65f0b6ccd0e33b3b05060350381bbb7b 02-Dec-2009 Bai Tao <michaelbai@google.com> am 90aaaef5: Merge change I0e200c3c into eclair

Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2

* commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
Sending UCS2 encoded SMS correctly
0e200c3cbed83283c79703b552fe8e3d49040f10 25-Nov-2009 Bai Tao <michaelbai@google.com> Sending UCS2 encoded SMS correctly

http://b/2285139
om/android/internal/telephony/gsm/SmsMessage.java
be02501de757eeee382d8bebcbf23f3251244292 25-Nov-2009 Naveen Kalla <nkalla@quicinc.com> am 694e8662: am 5f69f726: Merge change I3f4f5f05 into eclair-mr2

Merge commit '694e8662a51bd878cd5630d47adaace471ea6f7c'

* commit '694e8662a51bd878cd5630d47adaace471ea6f7c':
cdma tones: Fix Call Waiting Tone in the hash map
5f69f7260ff34b2bed7cc3309f91b750f1a833d3 25-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I3f4f5f05 into eclair-mr2

* changes:
cdma tones: Fix Call Waiting Tone in the hash map
deb5a9b997452cf72847f7afb3c99154e6d7dbfb 20-Nov-2009 Naveen Kalla <nkalla@quicinc.com> cdma tones: Fix Call Waiting Tone in the hash map

Change-Id: I3f4f5f050c50f328f95a1660dc61cce37059bddd
om/android/internal/telephony/cdma/SignalToneUtil.java
b5dcac06b0186551517389d2b2ca62460c8e40e6 25-Nov-2009 Robert Greenwalt <robdroid@android.com> am 12715c36: am 8e2eb583: Merge change I22cf0509 into eclair-mr2

Merge commit '12715c366c69b54b3e5218fd25647980a6502be0'

* commit '12715c366c69b54b3e5218fd25647980a6502be0':
Add China data to MccTable.
22cf0509b24ff4490327aa99fa8ac7688cc5d98e 24-Nov-2009 Robert Greenwalt <robdroid@android.com> Add China data to MccTable.

We didn't have the wifi channel count data there, so we failed to
attempt connections on channel 13.

bug: 2282285
om/android/internal/telephony/MccTable.java
39cabc69d0afc7cb28541dcd3fada217d3ce3e58 21-Nov-2009 Wink Saville <wink@google.com> am 2111be3f: am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2

Merge commit '2111be3f9c1059222c08814e81de6ab55be222c0'

* commit '2111be3f9c1059222c08814e81de6ab55be222c0':
Increase the default wake lock timeout.
0e57e73575f27682b57b8ba615215d1bc2669b3a 20-Nov-2009 Wink Saville <wink@google.com> Increase the default wake lock timeout.

Previously the wake lock time was 5 seconds but there
are operations which take longer such as setting up
and tearing down so increase the default to 30 seconds.
Also provide TelephonyProperty.PROPERTY_WAKE_LOCK_TIMEOUT
so it can be overridden at build time.

Bug: 2268276
Change-Id: I3ae1fb196564c9fd5b9ea3e3b0927be9dd9ef255
om/android/internal/telephony/RIL.java
om/android/internal/telephony/TelephonyProperties.java
20fbb79825f30391c91664775cddf060ec3992f8 18-Nov-2009 Dan Egnor <egnor@google.com> resolved conflicts for merge of a351b7f0 to master
ded0e6447ed6e0f200dbca13e43c6cf4efc16a1d 18-Nov-2009 Dan Egnor <egnor@google.com> Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps. Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
om/android/internal/telephony/gsm/PdpConnection.java
ec76a23c98a29d33d2be46e0626fa74540282fbe 13-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am d96c94aa: am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair

Merge commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03'

* commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03':
Return null if SIM doesn't have the MSISDN Aplha tag.
b74ebcabe05d8ba91ff4a3bda4cc3fc6790ac39d 13-Nov-2009 Wink Saville <wink@google.com> am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2

Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040'

* commit '126fee88d480939d46b8ddd1e3a03cdd193fa040':
Add code to use Gservices provided values for throtting NITZ updates.
ae29ac179ee579234ecc6ed590e00d30831e02f8 13-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> am 572e0087: Merge change Idfc116fe into eclair

Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2

* commit '572e0087a86c6781e3334f8a6f901039a407138d':
Return null if SIM doesn't have the MSISDN Aplha tag.
db9f06d9c44cd640f282b1a631ae82d3652beeef 13-Nov-2009 Wink Saville <wink@google.com> resolved conflicts for merge of 2a1e9641 to eclair-mr2

Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
572e0087a86c6781e3334f8a6f901039a407138d 13-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Idfc116fe into eclair

* changes:
Return null if SIM doesn't have the MSISDN Aplha tag.
de1fcd49e786735555f0c289dd5d6044617b7337 12-Nov-2009 Jaikumar Ganesh <jaikumar@google.com> Return null if SIM doesn't have the MSISDN Aplha tag.

This makes both the GSM and CDMA version compatible.

Bug: 2247067
Dr No: jsh
om/android/internal/telephony/gsm/GSMPhone.java
7a59f80b4fe44a3e68951b7dd0af544effc008cb 12-Nov-2009 Wink Saville <wink@google.com> am dfaec0d9: am f7394fca: am 38210df3: Merge change I326c1f7e into eclair

Merge commit 'dfaec0d987f8f8e8822f554020795bea090e96c1'

* commit 'dfaec0d987f8f8e8822f554020795bea090e96c1':
Throttle nitz updates as the are too numerous on cdma.
42e7577082d9ef0aa72746f37dedf82420f3be16 12-Nov-2009 Gilles Duboscq <gilwooden@gmail.com> am 929429e0: am a883bb05: am 9d9dda53: Merge change Ia629e0f8 into eclair

Merge commit '929429e01895f1a2f7f1f51184bd07d68974d6f8'

* commit '929429e01895f1a2f7f1f51184bd07d68974d6f8':
Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
f7394fcaedbbf84f7934d0bfcc157948a2d5c166 12-Nov-2009 Wink Saville <wink@google.com> am 38210df3: Merge change I326c1f7e into eclair

Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-mr2

* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
Throttle nitz updates as the are too numerous on cdma.
a883bb057a1a3b6ef5bf69535b1418e9a4056b12 12-Nov-2009 Gilles Duboscq <gilwooden@gmail.com> am 9d9dda53: Merge change Ia629e0f8 into eclair

Merge commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697' into eclair-mr2

* commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697':
Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
ce9b59f0ba00e006d2697480b5e5d1fcbd0d2818 12-Nov-2009 Wink Saville <wink@google.com> Add code to use Gservices provided values for throtting NITZ updates.

bug: 2251845
Change-Id: Ie122606fb852868bb76a9930bb5e6ba906273619
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
38210df337a1485bd3d2eb5adc223f443fe1b5b0 11-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I326c1f7e into eclair

* changes:
Throttle nitz updates as the are too numerous on cdma.
aeff5fd8eb17bc0f611918d6482139c1921e7b60 11-Nov-2009 Wink Saville <wink@google.com> Throttle nitz updates as the are too numerous on cdma.

bug: 2251845
Change-Id: I326c1f7e28d19b678ea748e36f8286dd1378cecf
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
1fa7fae1399f735ea15242484fb5def187e07fde 24-Oct-2009 Gilles Duboscq <gilwooden@gmail.com> Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
all the parts should have the same encoding.

Fixes b/2040561
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SmsMessage.java
665187ee72131e1a4515a29e2c4db84796726c69 10-Nov-2009 Robert Greenwalt <robdroid@android.com> am 69da1fe8: am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair

Merge commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d'

* commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d':
Fix the selection of locale from SIM mcc.
feafc202bbfd768423326aeb0faafaee3f348bb6 10-Nov-2009 Robert Greenwalt <robdroid@android.com> am fe225e25: Merge change I70e1f7a6 into eclair

Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-mr2

* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
fe225e25bda5d48eaa67d1fd3fb877de6c40e837 09-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I70e1f7a6 into eclair

* changes:
Fix the selection of locale from SIM mcc.
8031e02bcb5d8840c1f748a04bc4de436b067111 06-Nov-2009 jsh <jsh@google.com> am 414628c5: am 9e63ce81: am 092f0341: Merge change I44d4cbec into eclair

Merge commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8'

* commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8':
Fix some SMS encode issues.
9e63ce81c5e870a058752974286f21d566d092db 06-Nov-2009 jsh <jsh@google.com> am 092f0341: Merge change I44d4cbec into eclair

Merge commit '092f03418a4988e4da706dca27128327b5a5fc55' into eclair-mr2

* commit '092f03418a4988e4da706dca27128327b5a5fc55':
Fix some SMS encode issues.
092f03418a4988e4da706dca27128327b5a5fc55 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I44d4cbec into eclair

* changes:
Fix some SMS encode issues.
3e5c3a6db4c8ad4842ee1f6a2cdb04f6e107db57 06-Nov-2009 jsh <jsh@google.com> Fix some SMS encode issues.

1. Spanish SMS 71-160 chars not sent. This was because calculateLength
allowed for single-segment EMS encoding, while encodeUserDataPayload
did not. For now, change calculateLength to match encodeUserDataPayload
(ie, fallback to UTF16 in this case). (b/2224849)
2. Unicode value of N w/tilde was incorrect. (b/2224849)
3. Add '\' and '/' to the list of valid separators in CDMA SMS numeric
addresses. (b/2236527)
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
7cfee29baff65203f14f8ac7fb717813ca42cf13 06-Nov-2009 Wink Saville <wink@google.com> am 47601c74: am e14861ea: am 09263e1b: Merge change Id0267cc0 into eclair

Merge commit '47601c74f1302f70716c81714373687358ce8d8b'

* commit '47601c74f1302f70716c81714373687358ce8d8b':
Add needsOtaServiceProvisioning and used to not allow
e14861eaa7e01e28e1f5a8dc9c10924400ac2cb7 06-Nov-2009 Wink Saville <wink@google.com> am 09263e1b: Merge change Id0267cc0 into eclair

Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-mr2

* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
Add needsOtaServiceProvisioning and used to not allow
70e1f7a6b773ae3e9c72730fd78e8095b7904cee 06-Nov-2009 Robert Greenwalt <robdroid@android.com> Fix the selection of locale from SIM mcc.

Two issues - getting config then setting locale by mcc and then setting the config (to set
mcc/mnc) would overwrite the locale set in the middle. Also, using a "new Configuration()"
instead of asking the ActivityManager.getConfiguration gets different values than the current
ones, and would also overwrite our change.

bug: 2241461
bug: 2239810
om/android/internal/telephony/MccTable.java
684b802dd9ec9e145220855d2380a3a9cd39a033 04-Nov-2009 Wink Saville <wink@google.com> Add needsOtaServiceProvisioning and used to not allow
data calls until the device is provisioned.

Bug: 2221241
Change-Id: Id0267cc02fdf31e14e66e5acd2ca5cbdc504f507
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
3e1cf402b9aeb32ca5a9b2f240767a06f25defe3 29-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> am 33728557: am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils included.

Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'

* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
7badc0cabf0c9e07afc3999227ef9ff3dd0f80a9 29-Oct-2009 Wink Saville <wink@google.com> am e6028e52: am 02d89898: am a2058e43: Merge change I11c3cdc7 into eclair

Merge commit 'e6028e52c9b66957311d25b6e72a2f683c507a5e'

* commit 'e6028e52c9b66957311d25b6e72a2f683c507a5e':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
e8f3542c31e89db86ed2441d8152f7e02e63f097 29-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> am e1cba3db: am 9fa7048c: am 6158038a: Merge change I2811f162 into eclair

Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4'

* commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4':
Add Authentication Type field to the APN settings.
d95a02c2a652ffe35dcc0336a3e35d91b1027d54 27-Oct-2009 Daisuke Miyakawa <dmiyakawa@google.com> Fix test breakage in Zaku. Modification to PhoneNumberUtils included.

Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
ndroid/telephony/PhoneNumberUtils.java
02d89898c9b48426d5add48868a640c198a3321f 28-Oct-2009 Wink Saville <wink@google.com> am a2058e43: Merge change I11c3cdc7 into eclair

Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2

* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
9fa7048ca3a7b5184ce761bbf908c512d524b9e2 28-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> am 6158038a: Merge change I2811f162 into eclair

Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2

* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
ef7b12940c8537d91f9d091750318d1641d3329c 26-Oct-2009 Wink Saville <wink@google.com> Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.

This is the simple fix for bug 2199271 which increases the timeout
for DEACTIVATE thus allowing more time to complete before SETUP_DATA_CALL
is retried. This should fix some occurrences of this bug as the current
time is known to be too short.

Bug: 2199271
Change-Id: I11c3cdc74678399de5f812133c83d687d0ed9937
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
6158038a09069bc178970160d4b3667573bfc655 26-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I2811f162 into eclair

* changes:
Add Authentication Type field to the APN settings.
2811f1625ebdb7f7483b8b866694474f89112d8c 26-Oct-2009 Jaikumar Ganesh <jaikumar@google.com> Add Authentication Type field to the APN settings.

Use auth type to setup data connection.
This value defaults to -1 (unset) to maintain compatibility.
When the value is -1, the auth type gets set to 0 (if no user is specified)
or 3.
Bug: 181700
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/PdpConnection.java
76c8da22119e50be19620636ca703b1415df9beb 23-Oct-2009 Wei Huang <weih@google.com> am 2c726389: am 45db67f2: Merge change I808651dc into eclair-mr2

Merge commit '2c726389fb4a6d3b9b3ab67063527b341079f9c4'

* commit '2c726389fb4a6d3b9b3ab67063527b341079f9c4':
bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
45db67f2e89341412613ea6b162dd0ad36f091c6 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I808651dc into eclair-mr2

* changes:
bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
fd7b4f1d12779a0363e98a37e7f5a7ccacba5ee8 23-Oct-2009 Wei Huang <weih@google.com> bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().

- when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
- update unit test.
ndroid/telephony/PhoneNumberUtils.java
65d15c8e861bfd02348462aba4ff92b257dbb33a 23-Oct-2009 Tom Taylor <tomtaylor@google.com> am bee4b10a: am 171ad634: am 6c618c68: Merge change Ie7105dae into eclair

Merge commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae'

* commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae':
Handle bad SIM message
171ad63488fedbf0176b3d8cef5502007399b4dd 23-Oct-2009 Tom Taylor <tomtaylor@google.com> am 6c618c68: Merge change Ie7105dae into eclair

Merge commit '6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-mr2

* commit '6c618c68f251e42210f7c2f45d69498352da87e0':
Handle bad SIM message
6c618c68f251e42210f7c2f45d69498352da87e0 23-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ie7105dae into eclair

* changes:
Handle bad SIM message
72fac6778119e42f39e00f5b7e36b7500893f45c 22-Oct-2009 Tom Taylor <tomtaylor@google.com> Handle bad SIM message

When trying to view the saved sms messages on my SIM, I ran into a null ref.
With this fix, we don't try and wrap a null message, but just skip it.
This is part one of three fixes for BC-triaged bug 2205782.

Change-Id: Ie7105dae7e3134b98681deabcc14f5db555902f3
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
3751dbbe40923ebbe02314cfd75aba944afc4fcb 22-Oct-2009 jsh <jsh@google.com> am 10d97d27: am f214dd9d: am f14da417: Merge change I3ff560d7 into eclair

Merge commit '10d97d27808abe6b89caae3cee8383bb3514ad08'

* commit '10d97d27808abe6b89caae3cee8383bb3514ad08':
Send "encoding problem" to the network for general errors during SMS dispatch.
f214dd9d4f9f5f923a77aa91cd8cf3efa5bc3765 22-Oct-2009 jsh <jsh@google.com> am f14da417: Merge change I3ff560d7 into eclair

Merge commit 'f14da417f3cb1f80a62732238623bb83173255c0' into eclair-mr2

* commit 'f14da417f3cb1f80a62732238623bb83173255c0':
Send "encoding problem" to the network for general errors during SMS dispatch.
22bf022dc093b596c5ebfde0d8326bcd0c800a10 22-Oct-2009 Naveen Kalla <nkalla@quicinc.com> am 466c08ae: am 6183a3ed: am 076cb23a: Merge change I13dd02fc into eclair

Merge commit '466c08ae9889208b41a475ee8a8f8c2c6483ea8e'

* commit '466c08ae9889208b41a475ee8a8f8c2c6483ea8e':
telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
6183a3ed5b72902a8e4a441b4d9e99630cb42ee3 22-Oct-2009 Naveen Kalla <nkalla@quicinc.com> am 076cb23a: Merge change I13dd02fc into eclair

Merge commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7' into eclair-mr2

* commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7':
telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
e0f01c8ac95d63bd21034cb76bb41009ebe66004 22-Oct-2009 Robert Greenwalt <robdroid@android.com> am 2fe12102: am 98a7c454: Merge change I66ff8af6 into eclair-mr2

Merge commit '2fe121025cd8f24a3652728effe86188a9d4b5fa'

* commit '2fe121025cd8f24a3652728effe86188a9d4b5fa':
Move calc of EriIconIndex/Mode to whenever basis changes
3ff560d7ba9fcedc4d388f63b756108a715266f4 22-Oct-2009 jsh <jsh@google.com> Send "encoding problem" to the network for general errors during SMS dispatch.

Previously we were returning "other terminal problem" to the network, but this
had the potential of blocking MT SMS messages for days at a time (eg, if the
problematic message is resent). Sending the "encoding problem" cause code is
reasonable since in most cases the we have encountered an error while trying
to parse the message.

Addresses b/2200412.
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
cc5c1ad53ce4541f17842daba29e7ccba221c079 16-Oct-2009 Robert Greenwalt <robdroid@android.com> Move calc of EriIconIndex/Mode to whenever basis changes

We need this info in the ServiceState, but rather than calcing it every time
a ServiceState is requested, we can update the values whenever the constituents
change.

bug: 2182568
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
d393184ac595ab5490c77305a27fd049badf9a5d 12-Oct-2009 Naveen Kalla <nkalla@quicinc.com> telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing

When Android Telephony receives response to GET_REGISTRATION_STATE
message from RIL it may contain few fields set to NULL. Due to a parsing
exception encountered while parsing that field, the remaining fields will
not be parsed even if they are valid data. Ignore all fields that are NULL
while letting it parse non-NULL data.

For Latitude and Longitude, the values should not be hexadecimal. They
shall be parsed as decimal values as specified in the 3GPP2 C.S0005-A
specification. Invalid value is changed from -1 to Integer.MAX_VALUE.

Bug: 2201613
Change-Id: I13dd02fcfa2ae7fcb6f21c4b94b830786bd7270c
ndroid/telephony/cdma/CdmaCellLocation.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
6a19d0e13951b52fc1aadcd048f646d9dbd94f97 21-Oct-2009 Tammo Spalink <tammo@google.com> am 60be8485: am 8785c064: Merge change Ie5df08ef into eclair-mr2

Merge commit '60be84855435c2f354833a98e1bf6154cc45078c'

* commit '60be84855435c2f354833a98e1bf6154cc45078c':
Let PLUS occur once anywhere in dial-str network portion.
8785c064fab3429c792ac160aeeb19e9926382f0 21-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ie5df08ef into eclair-mr2

* changes:
Let PLUS occur once anywhere in dial-str network portion.
9e534153264138cfee383c626db92b934fafc1af 19-Oct-2009 Tammo Spalink <tammo@google.com> Let PLUS occur once anywhere in dial-str network portion.

Create a new extractNetworkPortion() function, since the old one is
public, that does effectively the same thing but is more flexible as
just mentioned.

Addresses issue:
http://buganizer/issue?id=2013998

Change-Id: Ie5df08ef9c871881e8728a44abf0385908000823
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/DriverCall.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmConnection.java
788cfe3470fde1f2dcff3b1fbd02ac6abe698b66 20-Oct-2009 jsh <jsh@google.com> am 2312b65d: am 6ef38fb4: am cea8f8e4: Merge change I4219797a into eclair

Merge commit '2312b65ddf3b9bff11fc31caef8d145faed106ea'

* commit '2312b65ddf3b9bff11fc31caef8d145faed106ea':
Log exception if we hit an error parsing an incoming SMS message.
4219797afc2f5369c27cf7be752e9bc3bdb8057d 20-Oct-2009 jsh <jsh@google.com> Log exception if we hit an error parsing an incoming SMS message.

This will help debug b/2197566. We should have been logging the error
anyway.
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
12814856cb48e81bc7e160d7de7ba13fb1bab2a6 16-Oct-2009 jsh <jsh@google.com> am cd1b9912: am 13982956: am 2a39758e: Merge change I51d41230 into eclair

Merge commit 'cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1'

* commit 'cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1':
Make sure CF icon updates when using "all CF" MMI.
51d412304f41e0d553c7e401e288e9394dbca950 15-Oct-2009 jsh <jsh@google.com> Make sure CF icon updates when using "all CF" MMI.

Fixes b/2074739.
om/android/internal/telephony/gsm/GsmMmiCode.java
638b1ca07c92b520356e00b41a49605872521ed3 14-Oct-2009 Robert Greenwalt <robdroid@android.com> am 317d1c9e: am 770d5c4f: am 64d54042: Merge change I61c08260 into eclair

Merge commit '317d1c9e975c729d399406ec697ce0c863826bb6'

* commit '317d1c9e975c729d399406ec697ce0c863826bb6':
Futher reduce the logging of EriManager.
80b9c9f4cb57652489bcd849fd10469fc2f31579 14-Oct-2009 Libin Tang <Libin.Tang@motorola.com> am 715aba5a: am edb98812: am febb94cd: Make standard roaming indicator display indications configurable

Merge commit '715aba5a7a9970cb4413041644f002823dfbd08b'

* commit '715aba5a7a9970cb4413041644f002823dfbd08b':
Make standard roaming indicator display indications configurable
a8ac1997ec5b12307d802e279853b4263f306d0e 14-Oct-2009 Robert Greenwalt <robdroid@android.com> am e93f07c3: am 1cf6c2c3: am 6d02f3f3: Merge change I71f48a21 into eclair

Merge commit 'e93f07c3f8148ae249292ef05d2da8ac65428950'

* commit 'e93f07c3f8148ae249292ef05d2da8ac65428950':
Reduce the amount of EriManager Logging.
1215c57ed878ce7a5745b6c31bf6e5a24b20b42d 13-Oct-2009 David Krause <david.krause@motorola.com> am a614b948: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'

* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
Make PhoneStateListeners not call TelephonyManager
Setting WebCore cache limit depending on the memory class.
61c082603fe2bc192606407c9dda2a81d92d44c5 13-Oct-2009 Robert Greenwalt <robdroid@android.com> Futher reduce the logging of EriManager.

There was another log statement that was poluting radio logs.

bug: 2180891
om/android/internal/telephony/cdma/EriManager.java
febb94cdbb7c7b7091401d21824bfab32b9daca5 07-Oct-2009 Libin Tang <Libin.Tang@motorola.com> Make standard roaming indicator display indications configurable

Allow the ERI overlay file to specify the text for any built-in strings.
Currently only the hard-coded strings are used for those.

Bug: 2170881
Change-Id: I5d6169696a4558e62587585e17f908f823c54a2b
om/android/internal/telephony/cdma/EriManager.java
71f48a21b0533a5b9dc1c0eab3c675800b78fa5e 12-Oct-2009 Robert Greenwalt <robdroid@android.com> Reduce the amount of EriManager Logging.

It was filling the radio log with noise. Added a VDBG set to false to preserve the logging
but deactivate it.

bug: 2180891
om/android/internal/telephony/cdma/EriManager.java
fa7edb48437685dce08570c3ed022b2edd58f31b 12-Oct-2009 Tammo Spalink <tammo@google.com> am 7589ae77: am ef5aed64: am 5c8dba21: Merge change I61aac7b3 into eclair

Merge commit '7589ae77224a28a2162cde74c3ae8b1d826c635c'

* commit '7589ae77224a28a2162cde74c3ae8b1d826c635c':
Add PERIOD char to CDMA address sugar list.
ee9512efa6955b864b0b25f5a5ef02d6c1683c05 12-Oct-2009 John Wang <johnwang@google.com> am dcd1fe5f: am 99510681: Unhide constant DATA_ACTIVITY_DORMANT.

Merge commit 'dcd1fe5fc8c51b977e80dc3d8856de7572728dcf'

* commit 'dcd1fe5fc8c51b977e80dc3d8856de7572728dcf':
Unhide constant DATA_ACTIVITY_DORMANT.
98e0b146b80670b52805b4b210ef5582dad6bb68 09-Oct-2009 Robert Greenwalt <robdroid@android.com> Make PhoneStateListeners not call TelephonyManager

Since the StatusBarPolicy is run in the System Process and shouldn't therefore call into
the Telephony process we decided to make sure all the needed info was passed along with the
original notifications.

bug: 2173053
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/cdma/CDMAPhone.java
61aac7b377ac4878a5778457cad239fe3a50604a 05-Oct-2009 Tammo Spalink <tammo@google.com> Add PERIOD char to CDMA address sugar list.

Addresses issue:
http://buganizer/issue?id=2164455
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
82583b8312403ed734c30b161750d40c26086ee2 02-Oct-2009 Elliott Hughes <enh@google.com> Remove last vestiges of adb networking support.

Bug: 1122968
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
99510681e9f1c76f82719e724990f744cfdbcefd 01-Oct-2009 John Wang <johnwang@google.com> Unhide constant DATA_ACTIVITY_DORMANT.
ndroid/telephony/TelephonyManager.java
29e4a3c566f435c32f0b95e4ac8e8b33cac6faba 01-Oct-2009 Dianne Hackborn <hackbod@google.com> Update from API review.

Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
ndroid/telephony/NeighboringCellInfo.java
984d22b180e68d6b9f8e2c81c4eb271deccfc94a 01-Oct-2009 Robert Greenwalt <robdroid@android.com> Revert setDataEnabled to setting a master switch.

This is independent of whether or not the ConnectivityManager wanted any particular APN on
and allows us to track the two seperately - so when data is re-enabled we don't turn
things on that CM wants off.

bug: 2158290
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
27d074e0efbdabd40f00eca41169ea225c05fcbe 25-Sep-2009 Naveen Kalla <nkalla@quicinc.com> Telephony: Add a failure cause for CDMA call failures and rename
RIL_REQUEST_CDMA_VALIDATE_AKEY to
RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY

Add failure cause for CDMA call failures due to access blocked by the
CDMA network. Rename RIL_REQUEST_CDMA_VALIDATE_AKEY to
RIL_REQUEST_CDMA_VALIDATE_AND_WRITE_AKEY. This change needs to go in
with the corresponding change in ril.h (1141)
om/android/internal/telephony/Connection.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CallFailCause.java
om/android/internal/telephony/cdma/CdmaConnection.java
c46c255f7f8aa3e70a607493c550ffb863666ef1 29-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix the reporting of ActiveApnTypes on CDMA

Previous fix limiting what was reported active was too strict, leading to
DISCONNECTED messages not being accepted (apn list was empty).

bug: 2151520
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
22cbf51ef5f374cb32be3295d7de3f7be404e5be 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I49fbfc68 into eclair

* changes:
Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.
ac5bd144f1add259d53f2e09dc0cef38f1f5bd3f 29-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ib23e57cf into eclair

* changes:
Set roaming based on both data and voice.
db1f4993989bb03cae2f3e008d4db3e49577aa73 29-Sep-2009 Evan Millar <emillar@google.com> Add PhoneNumberUtils.compare() method that uses a resource to determine strictness.

Change-Id: I49fbfc683f7089f052671b567ad3e19203a568f0
ndroid/telephony/PhoneNumberUtils.java
59ceeae4ec2284ad0b90b0101f2c491be72cec33 29-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix the reporting of ActiveApnTypes on CDMA

Previous fix limiting what was reported active was too strict, leading to
DISCONNECTED messages not being accepted (apn list was empty).

bug: 2151520
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
37b80ee451a7404c288738255725f78a5af02130 26-Sep-2009 John Wang <johnwang@google.com> Set roaming based on both data and voice.

In GSM network the data roaming (from +CGREG) and the voice roaming (from +CREG) could be different. Set GSM roaming based on both data and voice roaming status and set it true if either indicates roaming.

This solves the unwanted roaming billing issues and respects the download roaming setting in systemUpdater, DownloadProvider, and MMS downloader. For more details refer to bug 2052473.
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
e436d46e575c7ded49d4f79dac115894daa13f99 27-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix Cdma re-start of default connection.

We dropped an onTrySetupData call because onEnableNewApn calls that automatically on GSM,
but CDMA was not doing anything. Made CDMA simply call onTrySetupData.

Also, isApnTypeActive for CDMA was returning true even when no data was working. Changed
to report true when initing or connected, like GSM.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
d1aca6aa73b0f1e22229829db89b1f3513a16aa8 25-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix ConnectivityManager's handling of apn switch.

It was clearing the interfacename when it was needed later in the process - the prevented us
from clearing the route to private dns servers and clearing the flag that this was set.
Consequently future uses would not set the private dns servers (since it thought they were already
set) and our lookups would fail.

bug: 2146929
om/android/internal/telephony/DataConnectionTracker.java
fb2b04b7bc505f5e600e360a9de6f63e16c21bf9 25-Sep-2009 John Wang <johnwang@google.com> Unhide NETWORK_TYPE_XXX.

Make NETWORK_TYPE_HSDPA etc. unhide in TelephonyManager.
ndroid/telephony/TelephonyManager.java
9c118c80fd0a5416051f2a49f515301f2cf3fd6f 12-Sep-2009 johnwang <johnwang@google.com> Update CID in NeighboringCellInfo

NeighboringCellInfo works in GSM and UMTS network.

In GSM network, the locaiton value is the combination of LAC and CID.

In UMTS network, the locaiton value is PSC code.

NeighboringCellInfo should access and store those two values seperately.

It involves the change of Public API.

1. Add new API getRadioType(), getLac(), and getPsc() to get location info in GSM and UMTS.

2. Deprecate setCid() and NeighboringCellInfo(int cid) because cid is set by interpreting network type.
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/RIL.java
694bd8bf733aee372705e00d13964a20e5b16209 24-Sep-2009 Peng Zhu <w46254@motorola.com> Add null check at isEmergencyNumber().

Change-Id: I7eca1ba1ce42e02c7506a7d969e4865778bb49cc
ndroid/telephony/PhoneNumberUtils.java
70f8faf4ec3f02276059a98591849f45019a93d5 24-Sep-2009 jsh <jsh@google.com> Print IMEI/MEID in dumpsys.

Helps with debugging.
http://b/issue?id=2133066
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/PhoneSubInfoProxy.java
3cc97f8dbc22eff56f17f30e1633084af507eff4 21-Sep-2009 Tammo Spalink <tammo@google.com> Add Phone.getPhoneType() operation.

This routine returns integer values defined in the Phone interface,
derived from RILConstants values. Direct references to the
RILConstants are replaced by references to these new ones for
consistency.

API CHANGE:
unhide TelephonyManager.PHONE_TYPE_CDMA

Addresses issue:
http://buganizer/issue?id=1905415

Change-Id: Icfec6d457231b098c031677a66770b5e57be4a44
ndroid/telephony/CellLocation.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
e4e8e4d4f2a8ccd552670df592bed67481133344 04-Sep-2009 Yong Zhang <yzhang@motorola.com> Resolve race conditions with disconnect of CDMA data and airplane mode

Specifically, wait for data to be deactivated when setPowerStateToDesired()
is called during data activation.

Bug: 2101430
Change-Id: Ia97dd799f779c3f88f66bc1235e7a65958e1e04f
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
8451c25b919ecef694d293d6bbd84d08d5fb60be 21-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 26171 into eclair

* changes:
Fix several CDMA call collision cases
b14300140d9f8b0af4d573eb0420035f814e2d03 19-Sep-2009 Wink Saville <wink@google.com> Fix several CDMA call collision cases

1. Continous ringing after receiving a call waiting while in a call,
and before user answers the call waiting, the 1st call drops. If another
MT call comes in, while it rings, it also drops, the phone will keep
ringing.

2. Data call is not re-initiated if emergency MO call collides with an MT call.

Bug: 2123287
Change-Id: I6b12a900ec60b478691544ab5326eac4952ce834
om/android/internal/telephony/cdma/CdmaCallTracker.java
02b5948a4375dba5d287a59ba023eaf1e02b45dc 21-Sep-2009 Wei Huang <weih@google.com> make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.

Change-Id: Id4a08c3834b727e253ab189293d5715ffbbe8f35
ndroid/telephony/PhoneNumberUtils.java
bbd754b8fe7563234b5c4c8d1425a7417337f2f2 19-Sep-2009 John Wang <johnwang@google.com> Add ring back tone notification.

Some networks may not play ring back tone, RIL will send UNSOL ringback notification.

Apps can register for ring back tone msg and play tone to user for receiving ALERTING message.

The return value indicates to play or stop ring tone.
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
9a24bc563f28d8489c7178b93ff05f02e8b8a893 19-Sep-2009 Daisuke Miyakawa <dmiyakawa@google.com> Implement compareStrictly() using phone_number_compare() written in C.

As per several discussions, we stick to the default behavior now.
In stead, we provide compareStrictly() as a hidden method, so that some
internal components are able to use the method if needed.

Since these are static methods, they cannot refer to the configuration files,
whose values can be obtained only via Resources object.

Please make callers' side if you want to use strict version of compare().

Internal issue number: 1892808
ndroid/telephony/PhoneNumberUtils.java
338c48554f35dbee3faa4e39525a972f20a7c32d 18-Sep-2009 Nicolas Catania <niko@google.com> Moved the toString method in the parent Connection class.

Beefed up the output to get more info in the logs about
a connection.
Personal data is only logged at debug level.
om/android/internal/telephony/Connection.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/gsm/GsmConnection.java
001d0abd3e523dce5c8a4c14e22bd1ea79976f03 19-Sep-2009 jsh <jsh@google.com> Fix potential ArrayIndexOutOfBoundsException.

When parsing an SMS message as email, extractEmailAddressFromMessageBody()
checks parts.length >= 1, but then proceeds to access parts[1] (which
may not exist). Instead, check for parts.length >= 2, and treat
parts.length = 1 as non-email.

b/2122698
om/android/internal/telephony/SmsMessageBase.java
6286f311c3b80ee6b4b1985a290a889f895203f9 18-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25810 into eclair

* changes:
Fix pause-wait dial string conversion error
963558b0f36b0a3cc143ebb04688d074e69a08b3 16-Sep-2009 Libin Tang <Libin.Tang@motorola.com> Fix pause-wait dial string conversion error

Resolves these specific cases:
- 8475766800;,1234
- 8475766800,;1234

Both of these should be converted to 8475766800;1234

Change-Id: Ic329007a3a6e99b1dd55cd8cdec7239dd734c3ca
om/android/internal/telephony/cdma/CdmaConnection.java
aad261730c566332e7b4ab29e800cca3cee9a15c 18-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix typo in SECONDARY_DATA_RETRY_CONFIG

The parser doesn't like ';'.

bug: 2130639
om/android/internal/telephony/DataConnectionTracker.java
1b90def3c683afaea528a0ee705b14df6ce2e2c7 17-Sep-2009 Mike Lockwood <lockwood@android.com> telephony: Add CdmaCellLocation class to the public API.

Its twin sister GsmCellLocation is public, so this really should be in the SDK too.

Change-Id: If6f5899047546a7398f1e4191c67acf15555c21b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid/telephony/cdma/CdmaCellLocation.java
ea803b8e0cc613309d0ce096df9c13e9690243ff 16-Sep-2009 Satish Roddom <satishroddom@motorola.com> Message Reject notification shouldn't be shown in Emergency Calling Mode

Issue: While in emergency mode, if we receive a message, there is a notification
being shown as "Text Message rejected".

Fix: In CdmaSMSDispatcher.java, send RESULT_OK response instead of RESULT_SMS_GENERIC_ERROR
for messages during Emergency mode. So, that SMS_REJECTED action is not broadcasted.

If the result is RESULT_OK from CdmaSMSDispatcher, the function notifyAndAcknowledgeLastIncomingSms()
is not called from SMSDispatcher.java and hence SMS_REJECTED_ACTION intent is not broadcast.
Consequently SMSRejectReceiver.java will not receive the broadcast and will not show reject
notification.

Change-Id: I2aa8f239393b3e6eeac6b0c2bb69799018e9ae9d
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
8460be7a57117d786adf2e1233ef02c4e96f0030 17-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25535 into eclair

* changes:
CDMA Check for network duplicate sms
9d34319f1ce5be4124a0b6293162587f4573496f 16-Sep-2009 Christian Gustafsson <christian.gustafsson@motorola.com> CDMA Check for network duplicate sms

In some cases a sms acknowledgement might be lost. The network will then resend
the same sms. These duplicate sms should be acknowledged but not shown to the
user.

C.S0015-B 4.3.1.6 Unique Message Identification.

The fields used to identify a message are:
* Message Identifier,
* Originating Address,
* Originating Subaddress, and
* Message Center Time Stamp.

Since some of the fields are optional, the Teleservice Layer shall use as
many of the fields as are present in the SMS message to determine message
uniqueness. Mobile stations should discard repeated messages.

1. Add a fingerprint function to SmsMessage.java. This returns a byte array
to be used as a unique identifier. Parts that make up the identifier are
the originating address, teleservice id and the bearerdata. Using all of
the bearerdata saves parsing time. There are no random bits allowed in
the standard. This makes binary comparison possible. Using all of the
bearerdata accounts for the message id, smsc timestamp and "... shall
use as many of the fields as are present in the SMS message".
2. Have CdmaSMSDispatcher.dispatchMessage() pull a fingerprint and check if
it matches the last acknowledged fingerprint. When it matches return and
signal that message was handled.
3. Have CdmaSMSDispatcher.acknowledgeLastIncomingSms() take the last
dispatched fingerprint move it to the last acknowledged fingerprint.
Only do this if processing of the sms was successful.

Change-Id: If79f8fe40896cd290940b7ccd5a17531ab937b60
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
60d45f0f0320801a16db2ad038453c098e98966c 16-Sep-2009 Nicolas Catania <niko@google.com> Added a field to track if the call is to a voicemail instance.

Refactored common code between CallerInfo and CallerInfoAsyncQuery that deal
with voicemail number comparison.

In CallerInfo.java added a new field mIsVoiceMail to indicate this is a
voicemail call.
Added a new method to convert the CallerInfo into a VM instance.
Added a new method to generate a debug string from an instance.

PhoneNumberUtils has a new method "isVoiceMailNumber" to check if a number
is a VM one. I left the method as hidden. Previously any security exception
failure was cached in a static variable. I removed that and
privilege the optmistic scenario. I am not sure if the security exception
is only for the 'regular' telephony layer and if it applies if a 3rd party
VM app is installed (e.g googlevoice), hence i removed the cashing to make
sure we can pick up new voicemail providers when installed/enabled/disabled.

Bug:2112640
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
d9e28017f6e3da3a176d11fd0c722b1d7811d27b 16-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25092 into eclair

* changes:
New field in CallerInfo to cache if the call is an emergency one.
e22415817febc8d3229d1774f3b0dfda0fda8f46 15-Sep-2009 Nicolas Catania <niko@google.com> New field in CallerInfo to cache if the call is an emergency one.

Fixed a bug in the sync call, the photo resource was not set to picture_emergency.

Added tests to check the correct emergency fields are set in the caller info instance.

Bug 2112640
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
2189daf50c174b5bed048a2777fae8b57df8e467 11-Sep-2009 Libin Tang <Libin.Tang@motorola.com> Fix call collision issue

This patch is to fix the call collision issue between an MT call
and an MO call causing the MT call screen shown with the MO call info.
The fix is to add the condition of foreground call to determine the
call collision on top of the pendingMO call only.

Bug ID: 2116865
Change-Id: I73aa310d39ebea97e6183281821bf941b5890ccf
om/android/internal/telephony/cdma/CdmaCallTracker.java
50f7ea53c3f356453fc4304b911c9a022290d924 15-Sep-2009 jsh <jsh@google.com> Some SMS logging improvements.

Use Log.isLoggable() to enable logs at runtime. Implement SmsResponse.toString()
so we can see what's returned.

Hopefully helps with debugging b/2086832.
om/android/internal/telephony/SmsResponse.java
om/android/internal/telephony/cdma/SmsMessage.java
70f74b79c3e4c88e0e7b747796f76187e4ea8259 14-Sep-2009 Christian Gustafsson <christian.gustafsson@motorola.com> Assemble WAP datagram correctly when segments arrive out of order

The WAP assembly code will always attach the last received segment at the end
of the WAP datagram. Change the code to add the current segment at the correct
location during the WAP datagram assembly.

Change-Id: I4cc18bf33bc68ab9a328a0107f21e3670b5026ac
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
53793416d408366270d21f81734997db348bd918 15-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24662 into eclair

* changes:
Fix URI returned by IccProvider.
a28948d754fc5e1b631d9bd53f0072d0ae5878ea 12-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24754 into eclair

* changes:
Handle secondary APN connect failures.
89bd269975cae2d44c871c997b4eb0d42ba1f43c 11-Sep-2009 Robert Greenwalt <robdroid@android.com> Handle secondary APN connect failures.

Without this we'd only try a secondary APN once and the stop silently, leaving
no APN connected.

Adds a second retry manager with configuration strings to do a more approriate
retry. Don't retry secondary apn forever.

On permanent failure or retry count hit, we send a Phone.REASON_APN_FAILED
disconnect status.

bug: 2112114
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
b942db35c52acc6842438b0de8f60d4de1e34e21 12-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 24773 into eclair

* changes:
Fix NPE in TelephonyManager.
5f1f26a7ffb3e1130108bc670960cb5368038a1b 11-Sep-2009 johnwang <johnwang@google.com> Fix NPE in TelephonyManager.

It is for bug 1971628 but affects almost every API function in TelephonyManager. When phone is not ready (for example, after crash and restart) the getSubscriberInfo and getITelephony returns null and causes NPE.
ndroid/telephony/TelephonyManager.java
12f413d29e1fb32f00213b1eaae6d45c856dc0d6 11-Sep-2009 jsh <jsh@google.com> Fix URI returned by IccProvider.

insert() had a typo in the URI it returned.

b/2113186
om/android/internal/telephony/IccProvider.java
d304ae583d862250a21b5949fc3dbdf3af1febac 03-Sep-2009 Tammo Spalink <tammo@google.com> Fix CDMA SMS delivery status reporting.

CDMA SMS status reports are messages with bearer data message type
DELIVERY_ACK. Identify these messages after parsing during demux,
update the deliveryPendingList and generate a RESULT_OK intent in the
same manner as GSM.

Addresses issue:
http://buganizer/issue?id=2047571

Change-Id: Ia38718b0bb169a0f3398f50c27a95e8bce7e4c99
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
88e3f827e657ef741099b24896c17533fa9ef61e 10-Sep-2009 Wink Saville <wink@google.com> Allow an alternate eri file.

For testing purposes it is deseriable to allow
vendors to provide an alternate eri file. This
fixes Part A of bug 2108379.

Bug:2108379
Change-Id: I51703c9ac211ced053418e28e277dfab68deea21
om/android/internal/telephony/cdma/EriManager.java
84b4d37dd1e9269f73c2a9cacadcd88ec4256e3f 10-Sep-2009 Dmitri Plotnikov <dplotnikov@google.com> [Issue 2099206] Encoding phone number prior to sending it to the phone lookup filter

Change-Id: I80327febe7134ac1bdef958251943a9777879d53
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
7a043b351b43e963605afef6ab76a52ae3a9270e 25-Aug-2009 Tammo Spalink <tammo@google.com> Make Phone.updateServiceLocation acquire a one-shot wake lock.

Phone.updateServiceLocation() is the internal routine triggered by
external calls to CellLocation.requestLocationUpdate().

addresses bug http://b/issue?id=1724246

Change-Id: Id3d5cab1a77df12d3e94373a58ae94688a8630c6
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
98a5ba78f99f6537b34b673521f7d4ab9893c80b 09-Sep-2009 Tammo Spalink <tammo@google.com> Avoid CDMA messages with IDs of zero.

In reference to issue:
http://buganizer/issue?id=2047571

Change-Id: I88b5cdbb988f12206663bbb3fdc9508a437b19ad
om/android/internal/telephony/cdma/SmsMessage.java
bf87c9e7d4a11dd6e237222190d6b92b25bf8ac9 05-Sep-2009 Robert Greenwalt <robdroid@android.com> Fix mncLength in cases with a malformed AD_DONE msg from SIM

Several cases error out and skip our guessing of the mcnLength. This
results in no operator_numeric being set and no APN's matching.

bug: 2101770
om/android/internal/telephony/gsm/SIMRecords.java
ccc41a26b8e1d702c1ccec1642758bde52e1b435 04-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23870 into eclair

* changes:
Allow hasIccCard to be useable by any processes.
34efc39f256d5833687c7bd7d83258d6394c9307 26-Aug-2009 Jaikumar Ganesh <jaikumar@google.com> Implement USIM and add support for importing emails from USIM.

Refer to 3GPP Spec 31.102 for more details.
We read and parse USIM records instead of the RIL doing it for us.
We only support reading of USIM Phonebook records.
om/android/internal/telephony/AdnRecord.java
om/android/internal/telephony/AdnRecordCache.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/IccProvider.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SimTlv.java
om/android/internal/telephony/gsm/UsimPhoneBookManager.java
e40f66ffc11cfc7e1bbe3e4c2ae1cf6dbc24cc17 03-Sep-2009 Wink Saville <wink@google.com> Allow hasIccCard to be useable by any processes.

This is accomplished by adding hasIccCard to ITelephony and do
the implemenation in PhoneInterfaceManager.java. Then change
TelephonyManager to use getITelephony().hasIccCard().

Change-Id: I26970fdf92a058502b8156a4f52c14e213217fc6
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b 01-Sep-2009 Robert Greenwalt <robdroid@android.com> Promote MccTable to telephony and use it for both gsm/cdma

This adds timezone/locale/wifi-regulator-channels initialization to cdma (gsm already had it).

bug: 2071211
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/MccTable.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
9b62851c3fbcd7fb61ead7583dcae33e411232d0 01-Sep-2009 Libin Tang <Libin.Tang@motorola.com> Exit Emergency Callback Mode if phone process crashes/restarts

If the phone process crashes while the phone is in ECM, there
is currently no way to get out of ECM without rebooting the
phone. This change forces the phone out of ECM if the phone
process restarts.

Change-Id: Ie4eb103fdc151ca20aa0b29dec43e60ad819e5b7
om/android/internal/telephony/cdma/CDMAPhone.java
558340f2143b5efe4bc14b901ae1dc1b8cec7901 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23793 into eclair

* changes:
add conditional verbose logging for when sending a SMS message.
8be9ccdc5c76b015ee8c7aa9922c80fdc4dc59ea 03-Sep-2009 Wei Huang <weih@google.com> add conditional verbose logging for when sending a SMS message.

Change-Id: I969e4cbee87ce5a42eaf5809292442e90db294cf
om/android/internal/telephony/IccSmsInterfaceManager.java
aace799b9c5ca15bfddbe66b0c69c1ccc30a99a1 25-Aug-2009 Libin Tang <Libin.Tang@motorola.com> Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.

The change fixes the issue that dialing *86 during the call, the dialing voicemail
screen is not shown, instead it shows feature code screen.

For CDMA, when flash is sent to the network, there is no response from the
network to indicate if the feature code is completed or not. This is different
from MMI code in GSM network. So it's confusing to show any UI to indicate MMI
(feature code) for CDMA.

The change is to remove the feature code handling in CDMAPone, and handle the
feature code dialing the same way as the 3 way call dialing. Basically, when
feature code is dialed, the dialing screen will be shown.
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/FeatureCode.java
fb16e5ccdb230a11cbbbfd17d323db7b88395c2f 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23607 into eclair

* changes:
Reject (NAK) CDMA SMS with unknown teleservice ids.
983b837ea1effc462ecd9c14620b19178f98fd92 03-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23510 into eclair

* changes:
SMS-to-email fix for messages from the web
8ecd2aecf66010e974d9125f40282168be76b440 02-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23548 into eclair

* changes:
Fix some sign in errors.
af6bb1ce9aa0f1f73666b25af404640930be8c10 31-Aug-2009 Satish Roddom <satishroddom@motorola.com> SMS-to-email fix for messages from the web

Certain carrier websites allow sending SMS to phones on their network. They allow filling
out a "Reply to Address" which can be a phone number. The website may send that message to
the device as an SMS-to-email, but the "From" address will be an SMS short code and not a
valid email address. When the user replies to this message, the response is directed to the
short code and not delivered correctly.

In extractEmailAddressFromMessageBody(), currently it checks if the sender is a shortcode
and an email address is present as the first word in the message body. If so, it replaces
the email address as the sender replacing the short code.

The fix to support the above case is remove the email address check and treat the first word
as FROM address regardless of what the user types.

Change-Id: Ifd39a39b352f204024c76fde293164dcd2b0896b
om/android/internal/telephony/SmsMessageBase.java
7e207afd497f8822ca34babe1d9cd1f6d5402fad 02-Sep-2009 Tammo Spalink <tammo@google.com> Reject (NAK) CDMA SMS with unknown teleservice ids.

Addresses issue:
http://buganizer/issue?id=2066191

Change-Id: I56124379534bf19f128b6228749c7ee2ef455fed
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
5b462477a90cd08551149fc649ff3035b5331d2d 02-Sep-2009 jsh <jsh@google.com> Fix some sign in errors.

AccountManagerService.SimWatcher was checking if storedImsi = "initial"
instead of null as an initial condition. Also, on NV-only CDMA devices
we were only sending SIM_STATE_CHANGED notifications when the radio
powered down, which meant storedImsi was only initialized if the radio
powered down.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
65d62c774e42d8bf9a55ef50e153ffc9e277ef37 02-Sep-2009 Wink Saville <wink@google.com> Add hasIccCard to IccCard and TelephonyManager.

Expose the presence/absence of IccCards in the system.
This is needed to fix bug 2033811 which needs to show
some SIM menus in the Mms app and Contact apps only if
there is a SIM and on CDMA there is no sims yet.

The current implementation assumes CDMA never has an
IccCard this is true at the moment but needs to change.

Change-Id: I4167368e364623ea68e9b2778556e6d730b1e715
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/IccCard.java
a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019 28-Aug-2009 jsh <jsh@google.com> Some fixes to SMS processing in the framework.

Always process class 0 and other unstored SMS (eg, MWI). We were
rejecting all SMS messages in storage full situations, but certain
messages do not require storage.

Also, notify apps when the framework rejects MT SMS, with new
SMS_REJECTED_ACTION intent.

b/2066775
b/2015906
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
1f952a178db86559ff4bab79c4a9b5fae18096bf 25-Aug-2009 Tammo Spalink <tammo@google.com> Move SMS pdu creation fully into the central Phone process.

Previously pdu creation was haphazardly done sometimes by the app and
sometimes centrally by the phone process -- specifically the phone
process did creation for multipart texts. This change gets rid of the
previous IPC interface for sending raw pdus to SMSDispatch in the
phone process, and instead makes everything work like multipart
messages worked before, namely the structured data is passed and pdu
encoding done centrally.

The motivation for this was the need to ensure that CDMA message id
numbers were strictly monotonic, including across reboots, which
necessitated central state in the form of a system property, which
could in turn only be modified by the phone process.

Hence, this (in part) addresses issue: http://buganizer/issue?id=2075760

Change-Id: I94ca207b6e657c465e8472534704db8646ee277c
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/ISms.aidl
om/android/internal/telephony/IccSmsInterfaceManager.java
om/android/internal/telephony/IccSmsInterfaceManagerProxy.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SmsMessage.java
95434bfaee62161ce02012c6424f0c0c8fffccb5 28-Aug-2009 Tammo Spalink <tammo@google.com> Allow fragmentText to be called for singleton CDMA messages.

Corrects for previous partner changes, addressing issue:

http://buganizer/issue?id=2063332

Change-Id: I49e564d81c5db3e92a6bad973f21a02a7302875d
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/SmsMessageBase.java
33567c5f3dab39cbb8c526c919e7e526042d1acf 01-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23271 into eclair

* changes:
Cleanup egregious style issues.
00416365dedc03c9ed74d94728025fd2d68f648d 31-Aug-2009 Tammo Spalink <tammo@google.com> Cleanup egregious style issues.

No actual code logic changes, only cosmetics.

Change-Id: I81d537610394fcb119dd80ddbc3d3f0295fd5a9a
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
6ce96faa0c8dc74ea6d1391aa54d9c6909810dc1 28-Aug-2009 Robert Greenwalt <robdroid@android.com> Don't mark an APN disabled if setup fails

We need to leave the phone in a connectable state so that it connects whenever it's able
(reception or just timing). If we mark it disabled on failure it wont try again. The retry
comes from the phone layer, not from ConnectivityService.

Also Fix the Phone layer so it retries even if it disconnected by request (DATA_DISABLED).
This was a bug from long ago that didn't become visible until recently with fast wifi and slow
mobile teardown.

Change-Id: I04bf39fba0cb578c87d5fc6ea5d220820ff9f364
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
616195a3b3a50b4f504806cea629af2fe34ae953 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23182 into eclair

* changes:
MO SMS fail after sending 100 messages
51b2b33219a0e97ed1e5ea75dabe4113a38871b9 21-Aug-2009 Yong Liu <yong.liu@motorola.com> MO SMS fail after sending 100 messages

After sending 100 messages, SMSDispatcher always displays dialog to user to
confirm the sending. If the user sends messages too fast then there will be more
than one dialogs waiting for the response, but SMSDisptcher can only handle one.
ndroid/telephony/SmsManager.java
om/android/internal/telephony/SMSDispatcher.java
a3659232ba9f7f3ba87ff036d17e08a46cf1be62 28-Aug-2009 Wink Saville <wink@google.com> Fix bug 2040024 phone rings only once sometimes.

The phone only rang once on rings that did't loop. In the GSM phones
the vendor ril sends a RIL_UNSOL_CALL_RING event to cause the phone
to properly play non-looping ring tones. To reproduce select a non-looping
ring tone such as "Digital Phone" and call it from another phone, the
phone will only ring once.

Three solutions were discussed:

*) Have all ring tones loop; rejected because to more space would be taken
by the silence.

*) Require all vendor RIL's to send RIL_UNSOL_CALL_RING; rejected because
it is inefficient to send a notification from the bottom of the stack.

*) Modify the PhoneApp or the audio layer; rejected because it would be
to big of change.

*) Modify the framework; this is the solution accepted.

The framework was modified to use two now properties to control the
call ring notification.

ro.telephony.multiple_call_ring: a boolean that if true the vendor ril
is assumed to send multiple RIL_UNSOL_CALL_RING messages. If false
only one is assumed and the framework will generate additional events.
(The default if absent is true).

ro.telephony.call_ring_delay: the delay in milli-seconds between
the generated events. (default if absent is 3000)

To minimize code duplication this change does some reorganization
of the PhoneBase class hierarchy and PhoneBase becomes a handler
and implements a default handleMessage method handles events associated
with call ring notification. This handler is overridden by derived
classes, CDMAPhone and GSMPhone which will pass unknown events
to PhoneBase.handleMessage and thus handle call notification for any
derived class.

Change-Id: I5b147b2b69b647d9987052f16ada41c9b66e4bf1
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
c18776d5bcd3a1ceadf676df778ccb4bdd521573 23-Jul-2009 Tammo Spalink <tammo@google.com> optimize MCC table

Replace a table of objects that was created at boot
in a costly manner, with a pre-generated table of
more densely formatted numerical data.

Based on data from runhat on the phone process,
this looks to shrink the memory footprint from about
16kB to less then 2kB.

Addresses http://buganizer/issue?id=874072

Change-Id: I5a7b9d7de4c9b9a0360e8370252582969fbd8d4f
om/android/internal/telephony/gsm/MccTable.java
29418e98731b4a5f94d9ac5f4a0df9d5d21bca55 28-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22529 into eclair

* changes:
Track apn Enable synchronously and notice failures
868b34bd740a279fa243dce6803af40f8cc42db7 24-Aug-2009 Robert Greenwalt <robdroid@android.com> Track apn Enable synchronously and notice failures

Another way to fix this problem. Notice the failures of dataSetup and mark the requesting
apn as unenabled so future attempts can be made.

bug: 2069221
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
767be5f0b929cc1eeb8a7d5aa7a02e228053e9bb 26-Aug-2009 Jim Miller <jaggies@google.com> Integrate CDMA provisioning into SetupWizard
om/android/internal/telephony/ITelephony.aidl
0badd0b700ed618dac421cb6cde4654b51acb3a4 25-Aug-2009 Robert Greenwalt <robdroid@android.com> Note net availability even when apn not enabled

Fixes a problem where mms apn was on when we lost the network (airplane mode) but mms was
off when airplane mode was turned off so it kept thinking we didn't have access and
future mms always failed.

bug: 2075145
om/android/internal/telephony/DataConnectionTracker.java
4a51c20ce607c74914f90fd897f04080121ac13b 22-Aug-2009 Dianne Hackborn <hackbod@google.com> I am getting tired of the java doc warnings, so fix them.

Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/gsm/GSMPhone.java
55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d 23-Aug-2009 Wink Saville <wink@google.com> Fix missing break statement found by Motorola.
om/android/internal/telephony/RIL.java
7b0cdc8890a849283d31a15126e73edce3bdf3a6 22-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22362 into eclair

* changes:
Fix +NANP issue and cleanup plus code conversion.
1cef22890d10417977397a5dccf34956858d0803 20-Aug-2009 Guo-Bin Zhang <Guo-binZhang@motorola.com> Disable data call in emergency call

Same change as 79ef673d56e2599932b8b7f13695d23b4df54d09 rebased
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
ebe66345e7099ca6fc95e8aa4d31a5b5cbbd6224 14-Aug-2009 Li Zhe <jqc837@motorola.com> Framework changes to support HSDPA/HSUPA/HSPA
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA: High-Speed Packet Access

Add support for HSDPA/HSUPA/HSPA:
1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
3) set radioTechnology into ServiceState in GsmServiceStateTracker
4) change the implementation of TelephonyManager.getNetworkType to
solve the competition timing issue between the time of setting
system property and the time of receiving notification through
PhoneStateListener
4.1) add a getNetworkType interface in ITelephony.aidl
5) add icons resources for HSDPA/HSUPA/HSPA
6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
7850cdde66705152b859aafda875833acdda9653 18-Aug-2009 Libin Tang <Libin.Tang@motorola.com> Fix +NANP issue and cleanup plus code conversion.

This patch includes the plus code conversion clean up.
1. change the plus code conversion based on the current and default
number systems retrieved from MCC.
2. for format such as +NANP, replace the '+' with the current IDP (011).
3. comments changes.
ndroid/telephony/PhoneNumberUtils.java
c813129fe7317c45e07211cd285c614e8b319ca7 21-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22282 into eclair

* changes:
Fix Calling screen shows "In Call" on pressing mute button
25254db31a7c4190cc453d38cd50d65a17885305 17-Aug-2009 Yong Zhang <yzhang@motorola.com> Delay radio reset to wait for data cleanup in CdmaDataConnectionTracker

Issue to be addressed:
In radioRestart() method in CdmaDataConnectionTracker, if the radio is
restarted right after cleaning up connection, it is possible that the
connection setup request triggered by radio-on may happen before the
connection cleanup has been completed so that the connection may not
be set up correctly after the radio is restarted. The end result could
be that the phone lost the data capability.

The patch includes the following changes:
1) Add EVENT_RESTART_RADIO in DataConnectionTracker.
2) In CdmaDataConnectionTracker, method restartRadio(), send a message
delayed by 20s, the purpose of which is to wait for connection cleanup
to be completed, then to restart radio.
3) In CdmaDataConnectionTracker, method trySetupData(), don't try to setup
data if there is pending message to restart radio.

Addtional notes:
A system property is not used to config the delayed timer because we
think this fix is to address the unusual error case and waiting for
long time should not impact user experience much. 12s is the longest
time to complete the data cleanup as we have seen so far, so we are
using a 20s timer.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
5abc78405f03e739f972692aa100f25609301ff5 18-Aug-2009 Guo-Bin Zhang <Guo-binZhang@motorola.com> Fix Calling screen shows "In Call" on pressing mute button

Send a flash command to CDMA network for putting the other party on hold.
For CDMA networks which do not support this the user would just hear a beep
from the network.
For CDMA networks which do support this, it will put the other party on hold.
om/android/internal/telephony/cdma/CdmaCallTracker.java
49bd918dc26a3a599d8d04212de5600abc3e48c4 20-Aug-2009 Tammo Spalink <tammo@google.com> more cdma sms debug logging
om/android/internal/telephony/cdma/SmsMessage.java
079ad20da7df79f26880c9076967dc3fbce6528c 17-Aug-2009 Tammo Spalink <tammo@google.com> cdma sms encoding tweaks and logging / debugging annotations.
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
a64bf834ffa677405af1c87c9f53eed0cd3853ce 20-Aug-2009 Robert Greenwalt <robdroid@android.com> Fix various issues found when testing Mms.

Fix some race conditions (check isTeardownRequested).
Fix the passing of mInterfaceName to subtypes (mms, etc).
Fix the generation of CONNECTED message to already active subtypes.
Fix the enabling of Data in DataConnectionTracker.

bug: 2065037
om/android/internal/telephony/DataConnectionTracker.java
3c513ed95cee2e0bcd7208cb7e46307f09c907c9 20-Aug-2009 Dmitri Plotnikov <dplotnikov@google.com> Converting CallerInfo to new Contacts API.
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
41e7363f98964a27e194f8cb6d3c2cb04e7ee090 19-Aug-2009 Jaikumar Ganesh <jaikumar@google.com> Return ICC Card ABSENT instead of NOT_READY when it is not present.
om/android/internal/telephony/IccCard.java
d324c81c049f30b779967c73de591e20f9a15d99 18-Aug-2009 Wink Saville <wink@google.com> Dormant ICON was not being displayed, fixes bug 2039239.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
95a1d1a89e383dab893750638c2393dec54833ff 18-Aug-2009 Wink Saville <wink@google.com> E911 call fix in ECM

Based on the VZW requirement, phone should be still in ECM mode in 2nd emergency call.
but in the current phone call, if a 2nd emergency call is originated, ECM mode will exit.

For fixing this problem, the coding design is as below:
1. In framework, canceling the first ECM timer immediately upon the origination of the
2nd E911 call, and restarting a new timer when the 2nd E911 ends.
2. Framework needs to syncronize the timer with phone app by sending notification to phone app to
inform timer is canceled or re-started, since phone app needs to show how much ECM time left
on the status bar.
3. In phone app's emergency callback mode service, the timer in this service will be canceled
when it receives the timer cancel notification from framework; the timer will be restarted
once it receives timer restart notification from framework.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
01ae863611244b745e47190d3ee8ed79db50b549 18-Aug-2009 johnwang <johnwang@google.com> resolved conflicts for merge of 696b912e to eclair

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

modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
25a5d3db3ff06b9952395832308bc3b48913c4ee 14-Aug-2009 Robert Greenwalt <robdroid@android.com> Fix CDMA to startup/shutdown based on apn en/disab

Fixes MMS during wifi.
Also fixes CDMA for ConnectivityManager change.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
fa2944d93f4c5050fb4a99d90006791c2995b31c 14-Aug-2009 Yong Zhang <yzhang@motorola.com> Replace loop-delay in setPowerStateToDesired() with async approach

Issues to be addressed:
The method setPowerStateToDesired() in CdmaServiceStateTracker class sends
a msg to CdmaDataConnectionTracker class to deactive data call, and then starts
a loop which calls SystemClock.sleep() to wait for several seconds.The purpose
of this is to wait for data-disconnection before sending RADIO_POWER off request.
However, the CdmaServiceStateTracker and CdmaDataConnectionTracker are running in
the same process so that the CdmaDataConnectionTracker is not able to process the
message to deactive data before the loop ends.

The patch includes the following changes:
1) In setPowerStateToDesired() in CdmaServiceStateTracker, replace implementation
of loop-delay by sending a delayed msg to set RADIO_POWER off.

2) In CdmaDataConnectionTracker, when getting EVENT_DISCONNECT_DONE, call a new
method in CdmaServiceStateTracker to process pending request to turn RADIO_POWER
off.
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
e6a9bcb7e8280512b0f68230fb72a004f86c8ae1 15-Aug-2009 Wink Saville <wink@google.com> A hack that when restartRadio is called the CdmaDataConnectionTracker
to retry a connection and possibly reconnect after a temporary data loss.

The root cause appears to be because DEACTIVATE and POWER_RADIO_OFF are
sent back to back and POWER_RADIO_OFF completes before DEACTIVATE.
When this happens CdmaDataConnectionTracker won't attempt to reestablish
a data connection until a voice call terminates.

At this time it appears the better solution is have CdmaDataConnectionTracker
wait for DEACTIVATE to complete before issuing POWER_RADIO_OFF, this fix
will be implemented in the near future.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
ad4d9e5bebb5a9ba01c1459d941019887f4a7d6d 15-Aug-2009 Wink Saville <wink@google.com> Allow CdmaDataConnectionTracker to handle RIL_UNSOL_OTA_PROVISION_STATUS
and when data roaming is enabled reset the retry manager.

This change also refactors mRetryMgr to DataConnectionTracker
removing it from Cdma and Gsm data connection trackers child classes.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
763101efcdcf306142af891f98eaaa971e6edaf0 14-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21171

* changes:
Allow max_retires to be set to infinite.
9e0426087b35ddbe965b71f929ef4109a2299b2c 14-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21166

* changes:
Rename bcdByteToInt to gsmBcdByteToInt and beBcdByteToInt to cdmaBcdByteToInt.
a646c56b21599d6fc56eaeb06e79bab298e57bb4 14-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21186

* changes:
Trigger data connection update if network type changes.
50e05ead5e4fb2e4899e2e1c92cd48692b254ac8 14-Aug-2009 jsh <jsh@google.com> Trigger data connection update if network type changes.

Data connection icon could be stale otherwise.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
a03ab1a6a07614f3d588232e12d9c45d840bae82 13-Aug-2009 Wink Saville <wink@google.com> Allow max_retires to be set to infinite.

Setting max_retires to infinite sets mRetryForever to true and therefore
isRetryNeeded will always be true. This is better than an alternative
which is to set max_retires to a large value such as 2147483647.
om/android/internal/telephony/RetryManager.java
a9085a59ecdd3bf05fe997c790a5a5146f3a97f6 13-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20853

* changes:
Add net type to mobile for mobile-required traffic
9688c6046fdbf6a24e3541bd6342995b4605fd5d 12-Aug-2009 Wink Saville <wink@google.com> Rename bcdByteToInt to gsmBcdByteToInt and beBcdByteToInt to cdmaBcdByteToInt.
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/gsm/SmsMessage.java
8c6b883cd3c835df32cab4cbf395ebf648bb7d7e 13-Aug-2009 John Wang <johnwang@google.com> Use dataRoaming in dataConnectionTracker.

Seperate dataRoaming from gsmRoaming. dataRoaming is based on +CGREG returns in GSM while gsmRoaming is based on +CREG returns. Previously, the status of dataRoaming is always treated the same as gsmRoaming. However there is a situation where +CREG returns 0 and +CGREG returns 5, i.e., gsmRoaming is off and dataRoaming is on. In such situation, the phone should setup data connection if the phone enables data service when roaming (for example, data only card). The phone shouldn't setup data connection if the phone disable data service when roaming (to prevent roaming data charge). So gsmDataConnectionTracker should use dataRoaming instead of gsmRoaming to decide if data service allowed.

modified: GsmDataConnectionTracker.java
modified: GsmServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
42acef37339afe6ac608c842f1637870ee9c4f6c 13-Aug-2009 Robert Greenwalt <robdroid@android.com> Add net type to mobile for mobile-required traffic

This also refactors ConnectivityService a bit towards supporting multiple simultaneous connections by making each a seem like a seperate Network with it's own stateTracker, etc.
Also adds tracking of process death to clean orphaned startUsingNetworkFeature features.
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
aaa1fa96e1fc77d5212587cafdf5da74610d6275 13-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21006

* changes:
Fix the issue of incorrect conversion of the plus sign in a dial string.
18e7b98c1c7e3cf340e39e93be67b777e7036cc4 04-Aug-2009 Tang@Motorola.com <Tang@Motorola.com> Fix the issue of incorrect conversion of the plus sign in a dial string.

The issue is that the plus sign in a dial string is always converted
to the IDP (International Dial Prefix).

This fix implements a plus sign conversion mechanism based on the default
telephone numbering system that the phone is activated and the current telephone
number system that the phone is camped on. Currently, we only support the cases
where the default and current telephone numbering system are NANP.
ndroid/telephony/PhoneNumberUtils.java
om/android/internal/telephony/cdma/CdmaConnection.java
71a08c1d78f3a152253ca51679e14bd33bfbaccd 12-Aug-2009 jsh <jsh@google.com> am 4cc16a7b: Merge change 20859 into donut

Merge commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3'

* commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3':
Fix for sending 16-bit SMS message with header.
7f304d2cce936ac273aaa4d1ee998292ba5755f4 12-Aug-2009 jsh <jsh@google.com> Fix for sending 16-bit SMS message with header.

Header length was missing from the PDU. This addresses http://b/issue?id=2040561
om/android/internal/telephony/gsm/SmsMessage.java
7d8913336435d6184e4a5ab2e648d5e0dd76e96f 11-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20683

* changes:
Add operator name in network selection.
f28ca902ad07ca3cf9c2f2e5d2d20dd58c0f13e5 09-Aug-2009 Jeff Sharkey <jsharkey@android.com> Update getNumberFromIntent() to read from both providers.

This method is used by the Phone app to decode ACTION_CALL
Intents, resolving to a real phone number. Because the
columns are changing with the new provider, I added logic
to query using the correct columns for the authority of the
requested Uri.
ndroid/telephony/PhoneNumberUtils.java
c6f79ce6bcc77abe222e5cc39a0b065bc76bce83 11-Aug-2009 johnwang <johnwang@google.com> Add operator name in network selection.

Save the operator name during network selection. The name will be used by UI to provide network selection notification. See bug 1414247.

modified: java/com/android/internal/telephony/PhoneBase.java
modified: java/com/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/gsm/GSMPhone.java
597f2b7022db1368831251d776f42b98d10ba2cd 10-Aug-2009 johnwang <johnwang@google.com> Add ro.telephony.disable-call check in dialing.

When ro.telephony.disable-call is set to true the phone disable actual calls. It provides a way to test in user-debug builds for stability runs. See bug 2031157.

modified: java/com/android/internal/telephony/TelephonyProperties.java
modified: java/com/android/internal/telephony/cdma/CdmaCallTracker.java
modified: java/com/android/internal/telephony/gsm/GsmCallTracker.java

modified: java/com/android/internal/telephony/TelephonyProperties.java
modified: java/com/android/internal/telephony/cdma/CdmaCallTracker.java
modified: java/com/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/gsm/GsmCallTracker.java
e00dd1e5a37bed0de964b353d47a4bd7cdff532f 28-Jul-2009 Tammo Spalink <tammo@google.com> Make GSM 7-bit encoding properly deal with initial padding.

For CDMA, clean up the GSM encapsulation to properly align
user data payload after the user data header.

Addresses http://buganizer/issue?id=2007011
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/cdma/sms/BearerData.java
3918e13b24d4e7ad410089eb615721ca026bec01 09-Aug-2009 Wink Saville <wink@google.com> Add configurable data-retry.

Add RetryManager and change GsmDataConnectionTracker and
CdmaDataConnectionTracker to use it.

Add TelephonyUtilsTest which tests RetryManager.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/RetryManager.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e4ebbd29f78df25e22c701b597c3c15b7f8add73 08-Aug-2009 Christian Gustafsson <christian.gustafsson@motorola.com> CDMA voicemail notification fixes

1. Convert the voicemail count of a VM notification from
BCD to decimal. That way the user will not be notified
of 16 new VM when there are only 10.
Ref: 3GPP2 C.S0015-B / 4.5.12 Number of Messages.
2. Allow VMN-95 notifications without "User Data" to be
processed. Only mandatory items for VMN-95 are
"Message Identifier" and "Number of Messages".
Ref: 3GPP2 C.S0015-B / 4.3.5 Voice Mail Notification.
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/sms/BearerData.java
5221dfdec95a75b0c608b4e0c9ead0623e2eaab4 08-Aug-2009 Wink Saville <wink@google.com> Revert "Disable data call in emergency call"

Temporary rollback of this change, for now the radio can prevent data traffic,
but that's not the desired long-term solution.

This reverts commit 79ef673d56e2599932b8b7f13695d23b4df54d09.
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
9e652dcc213b96087ccadc730b1e6b1891cd02ae 06-Aug-2009 Jinghui Guo <w001091@motorola.com> Touch activation screen shown up fix

During the time of OTA activation screen startup, the app needs
to get MIN by calling getCdmaMin(). The issue in current code is that
OTA app calls getCdmaMin() before framework gets MIN data from lower
layer.

To fix this issue, framework will be providing the following new APIs
to applications for checking if MIN data is ready:
1. isMinInfoReady():
Check if mMin variable in getCdmaMin() has been assigned a non-null value.
2. registerForSubscriptionInfoReady():
Apps uses this API to register for notification.
3. unregisterForSubscriptionInfoReady():
This API is used by apps to unregister notification.

Framework will be sending out the notification in the following situations:
1. when mMin is assigned a non-null MIN value;
2. When app calls register API and MIN is ready.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
d1cb1d22af0775a7c030822e04db1c9ecad9beab 06-Aug-2009 jsh <jsh@google.com> Bubble up SMS send fail error code to the app.

Framework portion of the fix for http://b/1978375:
We'll pass up the error code returned by the RIL on send failure.
ndroid/telephony/SmsManager.java
om/android/internal/telephony/SMSDispatcher.java
33777d2096c6877ab925db562067ac7272076399 04-Aug-2009 Libin Tang <Libin.Tang@motorola.com> Fix the issue of datacall not being reinitiated after exiting
Emergency Callback Mode.
om/android/internal/telephony/cdma/CDMAPhone.java
2d65082b158564819404e556db6492272111b5b3 05-Aug-2009 Tammo Spalink <tammo@google.com> fix CDMA SMS ASCII decode and mapping
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
529fcf97ea860ce605ccdc07e02f9c5736b8a590 05-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9684

* changes:
Add a DISCONNECTING call state.
e7a9201edbb4d18f12d00ba1b80e2481a5cb446f 04-Aug-2009 jsh <jsh@google.com> Add a DISCONNECTING call state.

This indicates to the UI that the hangup command has been received by the
Telephony layer and passed down to the RIL, but we have not yet been notified
of a successful DISCONNECT.

Addresses http://b/issue?id=1659876.
om/android/internal/telephony/Call.java
om/android/internal/telephony/cdma/CdmaCall.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/gsm/GsmCall.java
om/android/internal/telephony/gsm/GsmCallTracker.java
dfb8f07a954ffee3e96c9901230e44f444725846 01-Aug-2009 Tang@Motorola.com <Tang@Motorola.com> Fix WPS Queued pip tone not working issue.

The alert pitch included in the signal information record
should not be involved in the calculation for Pip tone type
mapping.
om/android/internal/telephony/cdma/SignalToneUtil.java
98aed46992679cf1ddc99bdb735c9d18b92ce940 02-Aug-2009 Tammo Spalink <tammo@google.com> relax ia5 parsing, and combine with ascii
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
a1c94ae4f75dab030219069864029f5bd9498fb0 13-Jul-2009 Richard Meng <richard.meng@motorola.com> Handle SMS during CDMA emergency callback mode

If in emergency callback mode, any 3rd party application tries
to send Message using telephony API, return a NO_SERVICE error code.
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
106d27140bdd1acf388310807d662f08cb6292c6 31-Jul-2009 johnwang <johnwang@google.com> Add technology and authentication type in setupDataCall.

SetupDataCall needs radio technology parameter to identify CDMA and GSM type. 0 means CDMA and 1 means GSM. The values are different from GSM_PHONE and CDMA_PHONE. Add authType parameter to identify PAP/CHAP authentication. Currently the authType is set to use both PAP and CHAP in CDMA phone.

modified: telephony/java/com/android/internal/telephony/CommandsInterface.java
modified: telephony/java/com/android/internal/telephony/RIL.java
modified: telephony/java/com/android/internal/telephony/RILConstants.java
modified: telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
modified: telephony/java/com/android/internal/telephony/gsm/PdpConnection.java
modified: telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/test/SimulatedCommands.java
bd55b0cb156280f44e82c50e02f9a07d6b528dcd 29-Jul-2009 Satish Roddom <satishroddom@motorola.com> Second word lost when SMS is received from email

When SMS is sent from a email address, Email Gateway server sends a string
containing from address, message text. Current code is treating the first
word as from_address, second word as subject and rest of the string as message_body.
Because of this second word is getting stored in separate variable and not as part
of message text, so second word is always lost.
om/android/internal/telephony/SmsMessageBase.java
992c1ebda18ac23c905d61d309dc8cdf9a030267 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9260

* changes:
Fix crash while dialing "*228;1"
20b8e3a347fa5ea40aff83b767e33739a4bf6fe8 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 1247a644: Merge change 9243 into donut

Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb'

* commit '1247a6444bb9f006e0b9def5cd15d626785424bb':
Clean up RIL_SIM_* in RILConstants
ae7d38ad9294630505b26b2947c174c5138d89f2 31-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
ab752276ee9838fe05b3fedb18075120c72cfb54 31-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> am 0da3bdb4: Fix public API caused due to CDMA changes.

Merge commit '0da3bdb476086db02a1076780676b21e239c79d6'

* commit '0da3bdb476086db02a1076780676b21e239c79d6':
Fix public API caused due to CDMA changes.
0d45e37069e2a9041b3a93b0f9e55f61d7baa07c 31-Jul-2009 John Wang <johnwang@google.com> Clean up RIL_SIM_* in RILConstants

GET_SIM_STATUS now returns structure RIL_CardStatus. So RIL_SIM_* status are obsoleted.

modified: java/com/android/internal/telephony/RILConstants.java
om/android/internal/telephony/RILConstants.java
d903014c1f42884531372f18a754e5d6ff7366a7 27-Jul-2009 Libin Tang <Libin.Tang@motorola.com> Fix crash while dialing "*228;1"
om/android/internal/telephony/cdma/CDMAPhone.java
d23b2cd28cae547aaa884964c3fef2a010bcca3a 27-Jul-2009 Libin Tang <Libin.Tang@motorola.com> Fix CDMA ERI/roaming indicator issues

- If the SID is not in NAM and PRL, the phone should use default Roaming
Indicator
- If a system is acquired that matches the NAM but does NOT match the PRL,
the device shall display a FLASHING roaming indicator
- Handle corner cases for PRL is not loaded / Home SID is not programmed
- Reorganize the ERI logic
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
0da3bdb476086db02a1076780676b21e239c79d6 28-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Fix public API caused due to CDMA changes.
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
ndroid/telephony/gsm/SmsManager.java
om/android/internal/telephony/SmsMessageBase.java
d2fb98006054f94753d8c58cf6a809840964db2e 30-Jul-2009 johnwang <johnwang@google.com> Represent SID/NID in decimal format.

Interpret SID/NID ad decimal and add try/catch block to prevent crashing in wrong format. Update SID/NID comments.

modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
98ad09880b148d69f4202ad40872d1cdfc1e491e 30-Jul-2009 Wink Saville <wink@google.com> am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.

Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
c84401fb8b3ed90039bd132b343852303ef88ce6 13-Jul-2009 yong liu <yong.liu@motorola.com> CDMA Message Waiting Indication support

Add support for Message Waiting Info Record defined in 3GPP2 C.S-0005
and used for voice mail count by some CDMA networks
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
96f2747dd6fabd998619524bcff4a44502a64bbd 23-Jul-2009 Yong Zhang <yzhang@motorola.com> Fix wrong Singal Strength interpretation.

The issue this change fixes is that phone status bar shows full
signal strength bar even when phone is in bad signal area. The
root cause is that the signal strenth is incorrectly interpreted.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
fc6627a892bc80ea32f9ac6ef2fd5ec7b0b90f78 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 9054

* changes:
Increase waiting time for data disable action in setPowerStateToDesired().
6afac8b2926c166458fde085e6068473a95688fe 24-Jul-2009 Yong Zhang <yzhang@motorola.com> Increase waiting time for data disable action in setPowerStateToDesired().

The issue this change fixes is that phone did not send MIP deregisteration
and LCP termination message when user powered down phone while data call was
in dormant state. The root cause is Framework Telephony did not wait long
enough before it sent the request to power off the radio. The fix is to
increase the waiting timer.
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
79ef673d56e2599932b8b7f13695d23b4df54d09 25-Jul-2009 Jinghui Guo <w001091@motorola.com> Disable data call in emergency call
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
b307c8945d4bf8d843445f3cc6d727f4e43d90f0 29-Jul-2009 Wink Saville <wink@google.com> Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.

This bug originally reported that PHONE_TYPE_CDMA needed to be 2 because
it was public. But as far as I can tell it has never been public and it
is still marked @hide so is not public now. There is a bug in that
PHONE_TYPE_NONE and PHONE_TYPE_CDMA were both 0. But this doesn't
appear to have been a problem because PHONE_TYPE_NONE doesn't looked to be
used anywhere except in TelephonyManagerTest.
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/RILConstants.java
f62a2bf29a6cf87be03b290b8b660db245022881 28-Jul-2009 Tammo Spalink <tammo@google.com> allow illegal subparam sizes for CDMA SMS

addresses http://buganizer/issue?id=2008358
om/android/internal/telephony/cdma/sms/BearerData.java
a1fd1efb52294360d09a4a4f5b6daabafd3c6603 27-Jul-2009 repo sync <dxn738@motorola.com> Voicemail number setting is throwing exception
om/android/internal/telephony/cdma/CDMAPhone.java
08e97226646c3789f08c22611a26116459a5f551 28-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8745

* changes:
Refix the MT call screen stuck issue. The issue this change fixes can be reproduced by following steps: 1. Originate and connect a call to remote party #1 that is not in Contacts. 2. Receive a call from the remote party #2 that is not in Contacts, the call waiting tone is sounded and the call waiting screen is displayed. 3. Press menu key and ignore the call, and the call waiting screen is dismissed and the remote party #2 is forwarded to voice mail. When we ignore the incoming call, Phone gets stuck with incoming call screen.
6e4cb2a0017c86cf7fbda2640fa81e10e99a406c 28-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am ecbbecf6: Merge change 8620 into donut

Merge commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464'

* commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464':
Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
8125864adcf27f706f261903ae5adf84f30b1987 22-Jul-2009 Ling Li <wlll01@motorola.com> Refix the MT call screen stuck issue.
The issue this change fixes can be reproduced by following steps:
1. Originate and connect a call to remote party #1 that is not in Contacts.
2. Receive a call from the remote party #2 that is not in Contacts, the
call waiting tone is sounded and the call waiting screen is displayed.
3. Press menu key and ignore the call, and the call waiting screen is
dismissed and the remote party #2 is forwarded to voice mail.
When we ignore the incoming call, Phone gets stuck with incoming call
screen.

The fix is to update the phone state before notifying the state change
in hangup() function.
om/android/internal/telephony/cdma/CdmaCallTracker.java
e30d4bf531cf8873f345cff0503974952c2daf65 17-Jul-2009 Jinghui Guo <w001091@motorola.com> Fix the issue of new call failing in 3-way call scenario.

The issue this change fixes can be reproduced by:
1. place an MO call;
2. place the second MO call;
3. hangup from the other end for one of the calls so there is only
one call connected;
4. try to place another call.
This issue is that the new call would fail.
om/android/internal/telephony/cdma/CdmaCallTracker.java
3bd5b0154faa02e197cdc344b45d968aba43d726 17-Jul-2009 Anna Markova <crwn43@motorola.com> Fix for unknown number issue in CDMA call waiting

During a call, if 2nd call is received, the 2nd remote party number
should be properly displayed in case numberPresentation is set to
ALLOWED
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
5e5b8c45dbb87be5468821ed298747ab065d73a6 27-Jul-2009 Tammo Spalink <tammo@google.com> Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
ndroid/telephony/SmsMessage.java
1424fe0059a3fe163fb98bad807a1eb635b0a161 23-Jul-2009 Tammo Spalink <tammo@google.com> added non-numeric cdma sms address support

addresses bug http://buganizer/issue?id=1992198
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
om/android/internal/telephony/cdma/sms/UserData.java
eafe72a0db89b5867ccd4b8170377309827785a2 07-Jul-2009 Satish.Kulkarni <Satish.Kulkarni@motorola.com> Fix for missing call drop notice in CDMA mode

In case the cdma modem indicates unspecified error as a reason for a
dropped call, then the cause was wrongly being translated to NORMAL call in
DisconnectCause. This has been fixed to report ERROR_UNSPECIFIED as
DisconnectCause in Connection.java.
om/android/internal/telephony/Connection.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/gsm/GsmConnection.java
c6d6b687af385d2a4e5f5210a9111d7b1acc233c 24-Jul-2009 Wink Saville <wink@google.com> Add method in Phone interface to check whether data is enabled.

This adds isDataConnectivityEnabled to allow test methods to query the
data connectivity state.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
97b270abd5e5200a3c512e08e06033397e2abfd6 24-Jul-2009 johnwang <johnwang@google.com> Fix bug# 1997056

The SID and NID in CDMA_SUBSCRIPTION are in hexadecimal format. So change the parseInt() in CdmaServiceStateTracker and add comments in CommandsInterface.

modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
modified: java/com/android/internal/telephony/RIL.java

modified: java/com/android/internal/telephony/CommandsInterface.java
modified: java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
modified: java/com/android/internal/telephony/RIL.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
5e9760c16b0b0dca96b59fdb2fd3c875ecfd33eb 16-Jul-2009 Jinghui Guo <w001091@motorola.com> Fix remote caller ID unknow issue in 3 way call
om/android/internal/telephony/cdma/CdmaConnection.java
3720cf2de9a86b4fb5583f190b183498f0ad3fc0 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7709

* changes:
Fix MT Call screen stuck issue.
84d5585b99f08caba384c933906c0da175fce995 17-Jul-2009 Cheng Yang <chengyang@motorola.com> Fix MT Call screen stuck issue.

The issue this change fixes can be reproduced by following steps:
1. Originate and connect a call to remote party #1 that is not in Contacts.
2. Receive a call from the remote party #2 that is not in Contacts, the
call waiting tone is sounded and the call waiting screen is displayed.
3. Press menu key and ignore the call, and the call waiting screen is
dismissed and the remote party #2 is forwarded to voice mail.
When we ignore the incoming call, Phone gets stuck with incoming call
screen.

The fix is:
1. Update phone state promotly based on the call waiting state.
2. Remove new call handling in handlePollCalls() function because in CDMA,
the call drop should be determnited by the number of calls in the call
list.
om/android/internal/telephony/cdma/CdmaCallTracker.java
abccd7eaa52d0b8579ba3d1c954dfe7529945c0f 17-Jul-2009 Wink Saville <wink@google.com> DO NOT MERGE. Implement IMSI function for CDMA phones

Includes support to get the MCC and MNC from system properties, since
they are known to be unreliable from the network.

This is known to conflict with master and will be
added by hand so as not to break the build.
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
142eefc67b661a63f95dd2b92cf622e7b57fcb4b 17-Jul-2009 Wink Saville <wink@google.com> Implement IMSI function for CDMA phones

Includes support to get the MCC and MNC from system properties, since
they are known to be unreliable from the network.
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
60b707075b2cf0eb5f0e215468385fd980d238fa 16-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7526

* changes:
Implement the carrier specified OTASP numbers
90b34b37731307cd0ccd5dfa60971364b37515d8 16-Jul-2009 jsh <jsh@google.com> resolved conflicts for merge of 8e0fb366 to master
ae49180f280fdda509103a403ec909fbebdf3971 15-Jul-2009 jsh <jsh@google.com> Minor tweak to CDMA_SUBSCRIPTION.

H_SID and H_NID are now comma separated lists, so update CdmaServiceTracker
accordingly. Note: For now, we still only store away the first of each.

Also remove H_SID and H_NID fetching from RuimRecords.java, since it is unused
(and unlikely to be used) in that class.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
e4a84af11d94e90f8d0a376582e0c91cdfc1c4fe 01-Jul-2009 Ling Li <Ling.Li@motorola.com> Implement the carrier specified OTASP numbers

It defines a new system property for carrier defined OTASP number.
It also includes the change to check the dial string against the OTASP
number.
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CDMAPhone.java
1c42769339d8fe98ecb2698c64e7dc6672e3d59d 13-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Rename registerPhoneStateChange to registerPreciseCallStateChange

As registerPhoneStateChange was actually notifying CallStateChange,
rename appropriately.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmCallTracker.java
2a71ee7129a7a346a4f1fb9d63b82bc06b9120d5 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7007

* changes:
Update name getCdmaMIN to getCdmaMin
35eea54a405cfeb88e48fed4bfa59687351c49a0 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6935 into donut

* changes:
DO NOT MERGE: backporting from master:
019581bf6055eb69ee7e4cb844dafe2b6c23597e 07-Jul-2009 Cheng Yang <a17673@motorola.com> Update name getCdmaMIN to getCdmaMin

1. update name getCdmaMIN to getCdmaMin
2. update DEFAULT_ECM_EXIT_TIMER_VALUE from 30000 to 300000
om/android/internal/telephony/cdma/CDMAPhone.java
b9cb7c970b04c59d490ed480635a93df63eadeb9 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6963

* changes:
Block incoming SMS in CDMA Emergency Callback Mode
390e9df5f0545b6ddf8b33af586f5de97b29fe02 13-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6934

* changes:
Add Get-CDMASubscription in EVENT_RUIM_READY.
117eace23924f575877ae8ecbb899af22e6f16c0 10-Jul-2009 Cheng Yang <chengyang@motorola.com> Block incoming SMS in CDMA Emergency Callback Mode

Block incoming SMS in CDMA Emergency Callback Mode

CDMA carriers expect that incoming SMS is not processed by phone while
it is in Emergency Callback Mode, so don't acknowlegde it to the network.
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
45becf90a80833dd4b98ef90b93708c6ea0c325a 13-Jul-2009 jsh <jsh@google.com> am aa459370: Update javadoc for TelephonyManager.getNetwork* for CDMA.

Merge commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f'

* commit 'aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f':
Update javadoc for TelephonyManager.getNetwork* for CDMA.
2872e30684cf837e330c8fa3bb8b2a2b73d44ddb 07-Jul-2009 Mike Lockwood <lockwood@android.com> DO NOT MERGE: backporting from master:

CDMA: Add Network ID and System ID to CdmaCellLocation.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid/telephony/cdma/CdmaCellLocation.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
aa4593706e4586fb4dfa6bd00d49c6f6159cbe0f 13-Jul-2009 jsh <jsh@google.com> Update javadoc for TelephonyManager.getNetwork* for CDMA.

These are unreliable for CDMA, so note it in the javadoc. Also update
for the corresponding TelephonyProperties.
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/TelephonyProperties.java
56d97ebb3ab05407ceea781c5bddc4527f98d828 24-Jun-2009 Cheng Yang <a17673@motorola.com> Add Get-CDMASubscription in EVENT_RUIM_READY.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
5b93050d484e602f5e716f60a33e7e4dc4619e0b 13-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am f6c96839: Merge change 6850 into donut

Merge commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0'

* commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0':
Extra parameters for sendBurstDtmf.
a4d2fb5ef6bb5dfb6e26ac6a139de389984db5d3 07-Jul-2009 Mike Lockwood <lockwood@android.com> CDMA: Add Network ID and System ID to CdmaCellLocation.

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid/telephony/cdma/CdmaCellLocation.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
54a26bc85f4fe972e929e42b986c65a710a229b3 11-Jul-2009 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 889c2d37 to master
dafa22a3ef9328c72319aeec605f6a6d20e46080 11-Jul-2009 jsh <jsh@google.com> Extra parameters for sendBurstDtmf.

ON length and OFF length.
Also, define PROFILEs for use with SETUP_DATA_CALL.
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/test/SimulatedCommands.java
7882e20d594fcdce357acc8bc74f95702fd9bf8f 10-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6814

* changes:
Change 107 and 146 from partner repo.
daccacb865947c00f277f1823333e2fbf91e652a 10-Jul-2009 Wink Saville <wink@google.com> Change 107 and 146 from partner repo.

These were combined to save testing time.

cpr107:
Enhance the MDN change during OTA

1. Remove the OTA MDN change code in RuimRecords.java and move
to CdmaServiceStateTracker.java
2. Reduce the frequent function GET-CDMASubscription. Move the
Get_CDMASubscription from pollstate() to EVENT_NV_READY handler.
The CDMA Subscriber MDN/MIN is only changed by OTA programming.
Only need fecth the subscriber information when power on and OTA
completed.
3. Add new variable for PRL version in cdma subscription

cpr146:
SMS-to-Email fix for extracting e-mail address
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
05b301b9df83ee7aa7ac2a93e137bc1fd58d3fce 10-Jul-2009 Wink Saville <wink@google.com> Changes 203 and 225 from partner repo.

These are combined to save testing time.


Change 225:
make NV_READY return State.READY.

Change 203:

CDMA SMS decoding support for Latin and fix for WAP concatenation

1. Enabled support for 8bit Latin decoding.
2. Change octet decoding to remove an extra pad byte from the payload.
This caused problems with the concatenation of WAP PUSH messages.
3. Decode octet encoded data as if it was Latin. There are devices out
there that will use 0 instead of 8.
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
854060af30f928c0a65591e9c8314ae17056e6b8 10-Jul-2009 Dianne Hackborn <hackbod@google.com> Fix bug #1873249i: Apps can DoS/brick device

This is the problem where various things are listening for broadcasts
(such as battery status, PIN/PUK/Network) that an application can send
to cause harm to the system.

Solving this is tricky because many of these broadcasts are sticky,
and I have never figured out how to do permissions with sticky
broadcasts in a sane way. So instead, I am going to punt on the
general problem and just brute force it:

There is new a way for system components to declare specific
broadcast actions to be protected, which means that only the system
and the phone can send them. This is good enough for now. None
of it is exposed in the public API so we can make something a little
less stupid in the future if we ever need to.
om/android/internal/telephony/TelephonyIntents.java
2291616d846dcc7ed81ac534ff45962e6056ad12 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6092

* changes:
Remove duplicate code in Sim/Ruim card, handle IccCardStatus.
cdadaad0e4e76a69eba144d3501cca9765cee80c 02-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Remove duplicate code in Sim/Ruim card, handle IccCardStatus.

a) Push code to IccCard.java base class.
b) Handle IccCardStatus.
c) Add some helper functions for USIM use.
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccCardStatus.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SimCard.java
om/android/internal/telephony/test/SimulatedCommands.java
2fa57a3fd1f5be9136b51c955e0ecc355021ecba 30-Jun-2009 yong liu <yong.liu@motorola.com> Message address encoding fix

Set DIGIT_MODE_4BIT_DTMF as the default digitMode and
TON_UNKNOWN as the default 'type of network'.
om/android/internal/telephony/cdma/SmsMessage.java
bcd18e0151cf0d7a16f98eb997515bf9e28dd6a4 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 62edc960: Merge change 6383 into donut

Merge commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44'

* commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44':
Cleanup connection when airplane mode is entered.
62edc960224fd6410d5e08cbb0e09ee4ac6e0c44 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6383 into donut

* changes:
Cleanup connection when airplane mode is entered.
51759015a39c15810ac4581359c6d72879b8155f 07-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6392

* changes:
Add the condition check of ERI for CDMA roaming.
024af038a7ad04bb551c305c235d25e51cbeda13 07-Jul-2009 Jaikumar Ganesh <jaikumar@google.com> Cleanup connection when airplane mode is entered.

The message was being sent to the wrong handler.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
8e80fd4478764643ac9543d63a77db62014a843a 06-Jul-2009 Yong Zhang <yzhang@motorola.com> Add the condition check of ERI for CDMA roaming.

With this fix, phone will not show that it is roaming
when it is not, and there is no need to enable the
"Data Roaming" in order to get the data to work.
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
6e2863ec16828b77c494592410e6b01281596e87 07-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 37ea7112: Merge change 6338 into donut

Merge commit '37ea71122579e9e2ad1f91b3eca5e4d436b54ea9'

* commit '37ea71122579e9e2ad1f91b3eca5e4d436b54ea9':
septet-align UD after any UDH for GSM-7bit coding
0fd833a50f43239e619fa383045374459f42ca49 07-Jul-2009 Tammo Spalink <tammo@google.com> septet-align UD after any UDH for GSM-7bit coding
om/android/internal/telephony/cdma/sms/BearerData.java
a95fe061c77fac5565689f7b618f3d49b8326f7e 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6232

* changes:
frameworks/base: Update mPdu in createFromPdu
907a8589babf8f22df4cc5d75c232d337a2c4d3a 06-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 922f1b85: Merge change 6146 into donut

Merge commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1'

* commit '922f1b85b9096d9056f1b9e2d777098d1e4ed8b1':
Fixing 1949086 Sholes telephony crash after waking from sleep.
5082fd58e33aa54d760459de3368912c37864a4f 24-Jun-2009 Satish Roddom <satishroddom@motorola.com> frameworks/base: Update mPdu in createFromPdu

Inside createFromPdu(), the passed-in parameter 'pdu' is assigned
to msg.mPdu, so that we can call getPdu() to get it back.
om/android/internal/telephony/cdma/SmsMessage.java
1eee698c3e98561e5d9ddab7e4396b9281b31eb3 03-Jul-2009 Wink Saville <wink@google.com> Fixing 1949086 Sholes telephony crash after waking from sleep.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
10063c10899976c70c64c4dd15f171728e9b3036 03-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 392282f1: Merge change 5962 into donut

Merge commit '392282f1e01518491c6536d931500c4bfac7f24f'

* commit '392282f1e01518491c6536d931500c4bfac7f24f':
SimRecords.getServiceProviderName() always returned null.
4a79a017a18391116abf66f5f31410d580d2ec94 02-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am daa5a215: Merge change 5810 into donut

Merge commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825'

* commit 'daa5a21562cb4b1fda21400bc638be4d6b7f5825':
Fix bug 1930055 of NullPointerException.
730babbd5e2bdd45b80b1d16f0d4ebb653e6574e 02-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 85d650c8: Merge change 5804 into donut

Merge commit '85d650c89998eb108faa2c02dcc32467e23f9555'

* commit '85d650c89998eb108faa2c02dcc32467e23f9555':
Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
8890aaf77cf188adc88fdeb90c59d901eb9c4f03 01-Jul-2009 jsh <jsh@google.com> SimRecords.getServiceProviderName() always returned null.

Fixes bug 1955060. spn was defined in both SimRecords and base class IccRecords.
om/android/internal/telephony/gsm/SIMRecords.java
c2b9d63953c1261b12a99f295366d43ed90bae7f 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am a79ee8e2: Merge change 5792 into donut

Merge commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e'

* commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e':
Fix typo introduced during variable cleanup.
71b62d29ce5d590d72e55dc000961d1776359336 01-Jul-2009 Tammo Spalink <tammo@google.com> am 8561de15: eliminate byte-typed cdma sms fields

Merge commit '8561de157c78e65e49f6989cd2c242c416631df7'

* commit '8561de157c78e65e49f6989cd2c242c416631df7':
eliminate byte-typed cdma sms fields
50f380074a78d7fed9ab065da9d4be928df6b036 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 0178afe4: Merge change 5485 into donut

Merge commit '0178afe415a598b5b3b4ab5bbeec96a079a124e1'

* commit '0178afe415a598b5b3b4ab5bbeec96a079a124e1':
cdma sms is91 support
4a301cb49527dfe941a8f6ac3c65a14ee42e01d1 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 8aadf7ae: Merge change 5359 into donut

Merge commit '8aadf7ae278961926de5452a46863503303735cf'

* commit '8aadf7ae278961926de5452a46863503303735cf':
fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
a01fda542703535c9cad667339f377b975cf4c74 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am bda04135: Merge change 5669 into donut

Merge commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4'

* commit 'bda04135ee9375d5a6b2bf00e464c3ae69ae9ab4':
Fix setting of the APN type.
daa5a21562cb4b1fda21400bc638be4d6b7f5825 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5810 into donut

* changes:
Fix bug 1930055 of NullPointerException.
85d650c89998eb108faa2c02dcc32467e23f9555 01-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5804 into donut

* changes:
Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that the index is always < the array's length. Also ensures that the object's state is consistent. Should resolve a denial-of-service bug when handling malformed WAP pushes.
107821369b7af3b739a0b5617fb34ff19f7ca9b5 30-Jun-2009 John Wang <johnwang@google.com> Fix bug 1930055 of NullPointerException.

The NullPointerException in getCallState is caused by the restarting of phone process. getITelephony() was not ready to be used at that moment.

modified: java/android/telephony/TelephonyManager.java
ndroid/telephony/TelephonyManager.java
38567852256d215847bc33263422bde0ddd1d150 30-Jun-2009 Chris Palmer <palmer@google.com> Ensure that we never trigger ArrayIndexOutOfBoundsException by checking that
the index is always < the array's length. Also ensures that the object's
state is consistent. Should resolve a denial-of-service bug when handling
malformed WAP pushes.
om/android/internal/telephony/WspTypeDecoder.java
cd15475bc3c096a0d17e76c6917ea253e54f7641 30-Jun-2009 Mike Lockwood <lockwood@android.com> Revert "ConnectivityManager: Add support for bringing up the default APN."

This reverts commit a84b6faffbe7ef5981f3202be0f68a8b44d61a76.

I will work on a better mechanism for bringing up the default APN
when Wifi is enabled.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
34267f7e17214d182c0858f14a961aab0598093f 30-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix typo introduced during variable cleanup.

This prevented data connection being established after voice calls on 2G networks.
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
da6edf4d8a1716b193c4c779167e02bca883dda6 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 4cb1276e: Merge change 4956 into donut

Merge commit '4cb1276e143e175590c69ceefa58eb721aa52846'

* commit '4cb1276e143e175590c69ceefa58eb721aa52846':
Tune the Reconnect back off timer.
8561de157c78e65e49f6989cd2c242c416631df7 28-Jun-2009 Tammo Spalink <tammo@google.com> eliminate byte-typed cdma sms fields
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
0178afe415a598b5b3b4ab5bbeec96a079a124e1 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5485 into donut

* changes:
cdma sms is91 support
8aadf7ae278961926de5452a46863503303735cf 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5359 into donut

* changes:
fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper
1f9508ce4d55626f6a9ed40d7d3852d4494415e9 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am ae352273: Merge change 5192 into donut

Merge commit 'ae3522734ef83254626cacee18a9490f6af62415'

* commit 'ae3522734ef83254626cacee18a9490f6af62415':
make BitwiseInputStream.read return int
c0303921d028b4616010e96f66820fb0e9ab9254 29-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix setting of the APN type.

The user is on wifi, then enables SUPL APN. When wifi is switched off,
we try to establish DATA connection on the Default APN. If this fails,
we were not retrying as the mRequestedApnType variable was not being reset.
This was happening because the SUPL APN and the data connection APN
were the same.
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
3a08cec99e104f74f28ba2463f00c8d4e6d1967e 25-Jun-2009 Tammo Spalink <tammo@google.com> fix potential string index problems in PhoneNumberUtils.numberToCalledPartyBCDHelper

addresses http://buganizer/issue?id=1489784
ndroid/telephony/PhoneNumberUtils.java
8203dc1bc8d99e2fe430a1a3026983e2e440e6d5 09-Jun-2009 Tammo Spalink <tammo@google.com> cdma sms is91 support
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
e7e12b44bc37ba971507dde265bb999b63a580e8 22-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Tune the Reconnect back off timer.

Cap the max limit to 30 mins.
Re-register to the network once, when we reach the 30 min max.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
ae3522734ef83254626cacee18a9490f6af62415 26-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5192 into donut

* changes:
make BitwiseInputStream.read return int
a84b6faffbe7ef5981f3202be0f68a8b44d61a76 24-Jun-2009 Mike Lockwood <lockwood@android.com> ConnectivityManager: Add support for bringing up the default APN.

The default APN can now be requested by calling
ConnectivityManager.startUsingNetworkFeature(Phone.FEATURE_ENABLE_DEFAULT).

Signed-off-by: Mike Lockwood <lockwood@android.com>
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
aec9632db02bd2c9850bd6827359cd3d6282c797 26-Jun-2009 David Krause <david.krause@motorola.com> am 5c7d9e81: CDMA incoming MMS fixes

Merge commit '5c7d9e8194900a2b1699cd57f95b22ca5f7b9be2'

* commit '5c7d9e8194900a2b1699cd57f95b22ca5f7b9be2':
CDMA incoming MMS fixes
5c7d9e8194900a2b1699cd57f95b22ca5f7b9be2 16-Jun-2009 David Krause <david.krause@motorola.com> CDMA incoming MMS fixes

Need to correctly interpret WAP Datagram data. Specifically the
source and destination ports are only included in the 1st segment,
not subsequent segments but the original implementation was looking
for the ports for all segments.
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
80e90c5fac8bcaf208f364c0831f037c318d8ae0 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 24a4f20c: Merge change 5239 into donut

Merge commit '24a4f20c0b907babb11dd824550018cbab09b7b2'

* commit '24a4f20c0b907babb11dd824550018cbab09b7b2':
Fix SMS Ack.
3960ced4638fdb24ddf904fcb6734dae0959671e 23-Jun-2009 jsh <jsh@google.com> Fix SMS Ack.

There were a few places where we were not sending SMS ack. This change fixes that, and helps ensure that we don't miss any others.

Also fix a bug I introduced in RIL.java for CDMA SMS ACK (it uses RIL_CDMA_SMS_Ack and not int[]).
om/android/internal/telephony/RIL.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
e92b1e7633188e9e72a237f84266d390bb4b87ed 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am d48388ab: Merge change 5344 into donut

Merge commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca'

* commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca':
frameworks/base: CDMA voicemail support
d48388ab8239d2b0f4b8a9a4189fe9eeddddedca 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5344 into donut

* changes:
frameworks/base: CDMA voicemail support
2377dc999e5943edc6292561257f5186089682bc 25-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 6184a2ad: Merge change 5339 into donut

Merge commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e'

* commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e':
Fix intermittent crash related to call waiting
ce099c3226b33b43e0dd5d1f24347b14a2223ee1 01-Jun-2009 David Krause <david.krause@motorola.com> frameworks/base: CDMA voicemail support
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/gsm/GSMPhone.java
8a9ae45015a4cabdd56b1160261d4e7cbe551014 15-Jun-2009 David Krause <david.krause@motorola.com> Fix intermittent crash related to call waiting

Previously, when call waiting is ignored by user or timed out
by PhoneApp, the connection object for call waiting does not
release the wake lock. It causes the phone process to crash
randomly.

The fix is to release the wake lock when call waiting is
ignored by user or timed out by PhoneApp.
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
326c66d888f9b3ce82af93fe63e4828a4a4e3fbe 24-Jun-2009 Tammo Spalink <tammo@google.com> make BitwiseInputStream.read return int

Keep the maximum access 8 bits to avoid dealing with
endianness issues.
om/android/internal/telephony/cdma/sms/BearerData.java
cf01aa3cfff321a774139c054e7cfc262ee27921 23-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 1bee98af: Merge change 5100 into donut

Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7'

* commit '1bee98af6532eba3c6cda636eee890530c95a2a7':
Fill in CDMA gaps and clean up ToneGenerator code
b6d90ca1292ffab015d5068f9e184b1dc84b7233 17-Jun-2009 David Krause <david.krause@motorola.com> Fill in CDMA gaps and clean up ToneGenerator code
om/android/internal/telephony/cdma/SignalToneUtil.java
82bc988eb3e9d4f2e0b7352b1cc9bff9f2bc4aa7 22-Jun-2009 jsh <jsh@google.com> am be7f0f78: Add remaining retry count to response for PIN/PUK commands.

Merge commit 'be7f0f78afde931ce6ea2d4ba61c340fac5722f6'

* commit 'be7f0f78afde931ce6ea2d4ba61c340fac5722f6':
Add remaining retry count to response for PIN/PUK commands.
be7f0f78afde931ce6ea2d4ba61c340fac5722f6 15-Jun-2009 jsh <jsh@google.com> Add remaining retry count to response for PIN/PUK commands.

RIL_REQUEST_ENTER_SIM_PIN
RIL_REQUEST_ENTER_SIM_PUK
RIL_REQUEST_ENTER_SIM_PIN2
RIL_REQUEST_ENTER_SIM_PUK2
RIL_REQUEST_CHANGE_SIM_PIN
RIL_REQUEST_CHANGE_SIM_PIN2
RIL_REQUEST_SET_FACILITY_LOCK
RIL_ENTER_NETWORK_DEPERSONALIZATION
om/android/internal/telephony/RIL.java
84baa07346bcab3059d98873433a88aa5c4af8ca 20-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 4da7dff5: Merge change 4731 into donut

Merge commit '4da7dff5e79e57494b58a97b285c53c111b18c82'

* commit '4da7dff5e79e57494b58a97b285c53c111b18c82':
gsm: Remove PppLink since pppd_gprs service does not exist.
4da7dff5e79e57494b58a97b285c53c111b18c82 20-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4731 into donut

* changes:
gsm: Remove PppLink since pppd_gprs service does not exist.
c4c819e48d4c62af4e57e6a8f8267c11399b4edb 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am ab48bb9c: Merge change 4686 into donut

Merge commit 'ab48bb9c008ade65e0f1313088a3089f5b65e8de'

* commit 'ab48bb9c008ade65e0f1313088a3089f5b65e8de':
Set AuthType to 0 if username is not specified.
ab48bb9c008ade65e0f1313088a3089f5b65e8de 19-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4686 into donut

* changes:
Set AuthType to 0 if username is not specified.
238bfa9efdcf5b4b7fae8c65c528ea01c4499b8a 19-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Set AuthType to 0 if username is not specified.

If username is not specified, set authType to No PAP / No CHAP
so that the code is backward compatible.
om/android/internal/telephony/RIL.java
4df90a869c3ac889f105104670e31adffbee57ca 19-Jun-2009 Chia-chi Yeh <chiachi@android.com> gsm: Remove PppLink since pppd_gprs service does not exist.
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/PppLink.java
6ff97edef79fda447143e51cc527fc3fb816f310 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 8696d703: Merge change 3874 into donut

Merge commit '8696d7030af6f0d58859f1027c423143b67f9fb4'

* commit '8696d7030af6f0d58859f1027c423143b67f9fb4':
for cdma concatenated (long) messages, replace ascii7bit with gsm7bit encoding
fc78f358cb1d1cee99758bcd6ef998a122ef27c9 11-Jun-2009 Tammo Spalink <tammo@google.com> for cdma concatenated (long) messages, replace ascii7bit with gsm7bit encoding
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/gsm/SmsMessage.java
b0b160ae50497966666bcdcaf974eca2643acfd3 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am a6061e04: Merge change 2563 into donut

Merge commit 'a6061e043cb6056c303206c2c9870ae3758861f1'

* commit 'a6061e043cb6056c303206c2c9870ae3758861f1':
Add PDP Reject causes.
59cbd7c86f8e17de10fccc9e4828d33db92555a9 04-May-2009 Jaikumar Ganesh <jaikumar@google.com> Add PDP Reject causes.

The RIL call LAST_PDP_FAIL_CAUSE, gives us the
PDP setup failure cause. Add support for retry based
on these causes.
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/PdpConnection.java
daf701fa6250ae89ad93e2e41127e0f676a322a5 15-Jun-2009 Christopher Tate <ctate@google.com> am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup

Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'

* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
bbf7c00e06c0f6f39e26f7fdedbc7105b2f5c415 12-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix data connection issues.

a)Fix cleanup connection being called twice when switching to wifi.
b) Reset the reconnect timer when voice call ends and APN is changed.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
fbca18574cded1b831fa836e8ac4e81eb81af874 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am cb9534f9: Merge change 3907 into donut

Merge commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197'

* commit 'cb9534f92007b47d86cccc306dc75ca2d64bd197':
Support SMS cell broadcasting for GSM in RIL.java
cb9534f92007b47d86cccc306dc75ca2d64bd197 12-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3907 into donut

* changes:
Support SMS cell broadcasting for GSM in RIL.java
e337d651a5199551ae3d3180176f8ac7d58c9acd 11-Jun-2009 johnwang <johnwang@google.com> Support SMS cell broadcasting for GSM in RIL.java

enable gsm related cell broadcast requests in RIL.java and add SmsBraodcastConfigInfo class.

The gsm related cell broadcast requests include

RIL_REQUEST_GET_BROADCAST_CONFIG
RIL_REQUEST_GET_BROADCAST_CONFIG
RIL_REQUEST_BROADCAST_ACTIVATION
RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS

modified: BaseCommands.java
modified: CommandsInterface.java
modified: RIL.java
modified: RILConstants.java
modified: cdma/CdmaSMSDispatcher.java
new file: gsm/SmsBroadcastConfigInfo.java
modified: test/SimulatedCommands.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/SmsBroadcastConfigInfo.java
om/android/internal/telephony/test/SimulatedCommands.java
97857f8618fb9ee49345414895bcbe3e1452a155 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 0b774530: Merge change 3015 into donut

Merge commit '0b77453076a22569f24318d194b378b68f11a63e'

* commit '0b77453076a22569f24318d194b378b68f11a63e':
make sms calculateLength radio-independent
a94945d3a1cf23caf33759eb1de84195d3fcb37b 03-Jun-2009 Tammo Spalink <tammo@google.com> make sms calculateLength radio-independent
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/gsm/SmsMessage.java
4f84953a4fdbd275871e3260f9ce4f639f2606c5 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 2795c2d6: Merge change 3806 into donut

Merge commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba'

* commit '2795c2d6b73f6e72565569f7d4f2f4b34e526bba':
Fix a couple null pointer exceptions in CDMA voice call handling.
2795c2d6b73f6e72565569f7d4f2f4b34e526bba 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3806 into donut

* changes:
Fix a couple null pointer exceptions in CDMA voice call handling.
041b75bbdefc25d0f1b32e15228e412de32506b7 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am f50ab7f4: Merge change 3777 into donut

Merge commit 'f50ab7f46296786f575b2d171ec05a661d129015'

* commit 'f50ab7f46296786f575b2d171ec05a661d129015':
Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
4be0d4378c3d9c79a094e99ce429907f1e9eda5f 10-Jun-2009 Wink Saville <wink@google.com> Fix a couple null pointer exceptions in CDMA voice call handling.
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
e51d57f4ab035cd9bc316cc0f93a200d326ef5f9 10-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Process the response of RIL_REQUEST_REPORT_SMS_MEMORY_STATUS.
om/android/internal/telephony/RIL.java
d713887dcc86cb9e1c4f50e3691ae753c8a219f9 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 218ebf12: Merge change 3178 into donut

Merge commit '218ebf1274d5eefc59c55cdc60d83d61faeb5c1b'

* commit '218ebf1274d5eefc59c55cdc60d83d61faeb5c1b':
Add additional parameters to SETUP_DATA_CALL and SMS response.
7b3f5520d32b5f149fa9d4a7c953547ba55f1708 04-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Add additional parameters to SETUP_DATA_CALL and SMS response.

1. The authType should be specified in the APN database.
This was hardcoded to 3 in the qmi driver. We currently set it to
3 in the RIL till the apn database side changes are done.
2. RIL_SEND_SMS response has errorCode as a new field,
om/android/internal/telephony/RIL.java
om/android/internal/telephony/SmsResponse.java
164ab6572da92ecf6496922d848718e0c0ed3031 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 8f094ca7: Merge change 3686 into donut

Merge commit '8f094ca7d045132ec93d4e903e784a3c077708c3'

* commit '8f094ca7d045132ec93d4e903e784a3c077708c3':
Fix cleanupConnection when switching from wifi.
8f094ca7d045132ec93d4e903e784a3c077708c3 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3686 into donut

* changes:
Fix cleanupConnection when switching from wifi.
9ac95783fc5aab204077d7c81e17e1b4f8afb3c1 10-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix cleanupConnection when switching from wifi.

Post a message for tearDown data connection when switching from wifi.
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
dfe482c9b5b16fca375b30c47185fc415c71d4e8 10-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am ce8436f5: Merge change 3593 into donut

Merge commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b'

* commit 'ce8436f52e7f2c80f94e43d80d28cc962b7ff83b':
Cleanup whitespace.
2563a3ac05dd3cf8a07203ae682c243f2e793137 09-Jun-2009 Wink Saville <wink@google.com> Cleanup whitespace.
ndroid/telephony/JapanesePhoneNumberFormatter.java
ndroid/telephony/NeighboringCellInfo.aidl
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/package.html
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/IExtendedNetworkService.aidl
om/android/internal/telephony/IccVmFixedException.java
om/android/internal/telephony/IccVmNotSupportedException.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/EriManager.java
om/android/internal/telephony/cdma/package.html
om/android/internal/telephony/cdma/sms/package.html
om/android/internal/telephony/gsm/GsmConnection.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/RestrictedState.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SuppServiceNotification.java
om/android/internal/telephony/gsm/package.html
om/android/internal/telephony/gsm/stk/AppInterface.java
om/android/internal/telephony/gsm/stk/CommandDetails.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/Input.java
om/android/internal/telephony/gsm/stk/Menu.java
om/android/internal/telephony/gsm/stk/ResponseData.java
om/android/internal/telephony/gsm/stk/StkCmdMessage.java
om/android/internal/telephony/gsm/stk/StkLog.java
om/android/internal/telephony/gsm/stk/StkService.java
om/android/internal/telephony/gsm/stk/ToneSettings.java
om/android/internal/telephony/gsm/stk/ValueParser.java
om/android/internal/telephony/test/ModelInterpreter.java
om/android/internal/telephony/test/SimulatedGsmCallState.java
om/android/internal/telephony/test/SimulatedRadioControl.java
889d679b2d7a68b99c8fd87d025a8b1e0ce3a91f 09-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am c11a3fab: Merge change 3530 into donut

Merge commit 'c11a3fab1a7c51bd3ec8ce63c68125fc8c6b3364'

* commit 'c11a3fab1a7c51bd3ec8ce63c68125fc8c6b3364':
Add RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING & reportStkServiceIsRunning.
c11a3fab1a7c51bd3ec8ce63c68125fc8c6b3364 09-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3530 into donut

* changes:
Add RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING & reportStkServiceIsRunning.
e14af0e26eb11d0a9e4620a75aadcc4b40885aa8 09-Jun-2009 Wink Saville <wink@google.com> Add RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING & reportStkServiceIsRunning.

These are used to notify the vendor ril that the StkService is
running and ready to receive RIL_UNSOL_STK_XXX commands.
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/gsm/stk/StkService.java
om/android/internal/telephony/test/SimulatedCommands.java
5f1336d0b59ac5cfa90e62a86f6caa685e961fac 09-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am a08ffc91: Merge change 3479 into donut

Merge commit 'a08ffc9189be105d882bfa4a30a58072025b9cc5'

* commit 'a08ffc9189be105d882bfa4a30a58072025b9cc5':
Report device storage status (for SMS) to RIL.
52f2825c29293a85984f188f5dd5e230d589b29d 06-Jun-2009 jsh <jsh@google.com> Report device storage status (for SMS) to RIL.

Indicate SMS memory available/not available based on DEVICE_STORAGE_OK/FULL
intents, and immediately NAK with MEMORY_FULL if we've received a
DEVICE_STORAGE_FULL notification.

This may end up being a short term solution, as the messaging app is
getting re-worked in Eclair, which may change the way we want to handle
memory full reporting (ie, more app involvement).
om/android/internal/telephony/SMSDispatcher.java
7699318ecd1e31b9ee4ead4acdb430f3aaa36ff1 08-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 1e3d1b4b: Merge change 3107 into donut

Merge commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7'

* commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7':
Motorola changes from 090602 through 090605
22ccaf5321cf9d2df57cf0d686d1abcd74acb193 07-Jun-2009 Wink Saville <wink@google.com> Motorola changes from 090602 through 090605

The changes from 090602 update frameworks/base to support 3way calling
and call waiting.

The changes from 090603 completed the CdmaInformationRecords class
but the original changes submitted has been simplified, toString added
and a bug fixed where the notifications where not being handled properly.

The changes from 090605 added Prl Version, apn fixes.
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/Call.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCall.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaInformationRecords.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/FeatureCode.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/cdma/SignalToneUtil.java
5a7f38922e9d32fea6bbdce305a0e2aebb6b5b10 06-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am b1c28747: Merge change 3305 into donut

Merge commit 'b1c2874790908d1bbb9b99242fc7cc96c7b45a8a'

* commit 'b1c2874790908d1bbb9b99242fc7cc96c7b45a8a':
Fix parameter mismatch for a couple of RIL commands.
b1c2874790908d1bbb9b99242fc7cc96c7b45a8a 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3305 into donut

* changes:
Fix parameter mismatch for a couple of RIL commands.
9c9151eccd27e824fdb7c266bff78c10038e87fe 05-Jun-2009 jsh <jsh@google.com> Fix parameter mismatch for a couple of RIL commands.

Both RIL_REQUEST_SET_SMSC_ADDRESS and RIL_REQUEST_CDMA_FLASH take a string
as a parameter. But RIL.java was sending down an array of strings with a
single element instead.
om/android/internal/telephony/RIL.java
c54f78b83334f1e8f0a018cd28d611e474cb16d7 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 35c46680: Merge change 3226 into donut

Merge commit '35c46680852268d6b7b51dadf3d5349d146ccdcd'

* commit '35c46680852268d6b7b51dadf3d5349d146ccdcd':
Update a javadoc comment suggesting the use of a deprecated class.
7642e3418e026dfa30a9566da1ef38c878934535 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 3d3e307a: Merge change 3126 into donut

Merge commit '3d3e307a63144b1bddd534fefd35a557223d52bf'

* commit '3d3e307a63144b1bddd534fefd35a557223d52bf':
Fix thread safety in DataConnectionTracker.
b111554883ef3d4101c2f3fe9d630f5c1d3bbf7a 05-Jun-2009 Marco Nelissen <marcone@google.com> Update a javadoc comment suggesting the use of a deprecated class.
om/android/internal/telephony/Phone.java
3d3e307a63144b1bddd534fefd35a557223d52bf 04-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3126 into donut

* changes:
Fix thread safety in DataConnectionTracker.
5c6164b3ee441155252a10bd8c37252dda7e784d 13-May-2009 Tammo Spalink <tammo@google.com> cdma getNeighboringCids to fail with an exception
om/android/internal/telephony/cdma/CDMAPhone.java
90cb947c22f05f8ac68ceff1d74af15bf38268c6 13-May-2009 Tammo Spalink <tammo@google.com> cdma getNeighboringCids to fail with an exception
om/android/internal/telephony/cdma/CDMAPhone.java
9c2a3be8bad8867cc524d8813dc6468a7ffb3f09 04-Jun-2009 Jaikumar Ganesh <jaikumar@google.com> Fix thread safety in DataConnectionTracker.

All the methods in DataConnectionTracker should be called only through
the handler. Fix this as trySetupData was being called in the broadcast receiver.

Tested: Airplane mode and GPRS retry.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
ab304022af26c50e0e2bf626a82441de6545c87d 03-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 97c2fdfc: Merge change 2957 into donut

Merge commit '97c2fdfc2e1cb4f51c624dd8e30e6bdb63ea21be'

* commit '97c2fdfc2e1cb4f51c624dd8e30e6bdb63ea21be':
Allow response payload on RIL_REQUEST error
03228fa8f950dfee3f679d280f98d040dea397dc 02-Jun-2009 johnwang <johnwang@google.com> Allow response payload on RIL_REQUEST error

Handle response payload while RIL_REQUEST returns error.

modified: gsm/GsmServiceStateTracker.java
om/android/internal/telephony/RIL.java
cf2924efa0914e57c9d1cf3de4943ec969a8f3fd 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am c6653495: Merge change 1522 into donut

Merge commit 'c665349543b481b14e423ea9e7e2b368569ae311'

* commit 'c665349543b481b14e423ea9e7e2b368569ae311':
support more minor cdms sms bearer data subparameters
c665349543b481b14e423ea9e7e2b368569ae311 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1522 into donut

* changes:
support more minor cdms sms bearer data subparameters
8d3002e04755c0e7d0d1ed6c8f872c4bb2201f8e 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 35feec46: Merge change 2761 into donut

Merge commit '35feec46d90d434a2439765d127a9e8f68a52340'

* commit '35feec46d90d434a2439765d127a9e8f68a52340':
TODO's from Teleca with modifications from wink.
35feec46d90d434a2439765d127a9e8f68a52340 02-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2761 into donut

* changes:
TODO's from Teleca with modifications from wink.
19db02b94504c84c8301f5ae076a4af7ac185a88 02-Jun-2009 Tammo Spalink <tammo@google.com> am 641bb3d8: expose (but still hide) sms user data headers

Merge commit '641bb3d8dfd72f57356d39ef00256d6077c9e235'

* commit '641bb3d8dfd72f57356d39ef00256d6077c9e235':
expose (but still hide) sms user data headers
baae313f896d8048f23e4acc76e554c8aa4667bd 12-May-2009 Tammo Spalink <tammo@google.com> support more minor cdms sms bearer data subparameters

- also clean up CdmaSmsAddress
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
641bb3d8dfd72f57356d39ef00256d6077c9e235 27-May-2009 Tammo Spalink <tammo@google.com> expose (but still hide) sms user data headers

addresses bug http://b/issue?id=1751571
ndroid/telephony/SmsMessage.java
om/android/internal/telephony/gsm/SmsMessage.java
f315238a2b07c7e84f6ade800e504f520d262e66 01-Jun-2009 Wink Saville <wink@google.com> TODO's from Teleca with modifications from wink.
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CallFailCause.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/EriInfo.java
om/android/internal/telephony/cdma/EriManager.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/stk/StkService.java
18ebf6d425267a4bab5b28c0288c54f41b802e72 01-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am ff0d9147: Merge change 2766 into donut

Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'

* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
Manually merge a few fixes from cupcake and cupcake_dcm.
faf4413dffdc9079683b951736088ff2a01073a4 30-May-2009 jsh <jsh@google.com> Manually merge a few fixes from cupcake and cupcake_dcm.

CL 144717: Correctly set user data payload length for non-7-bit encoded payload.
CL 149058: Check for null TP-OA in SmsMessage.parseMessageBody().
CL 138094: Make sure call state (and other updates) have a chance to get processed between data setup attempts.
CL 132624: Added a comment for a way to save a message to the SIM.
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/SmsMessage.java
969a74ae5e63b164edc1d18877c35e30bf8b3723 30-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 6190fe6e: Merge change 2758 into donut

Merge commit '6190fe6e7d7c8a917472637f5ab2fb21fc8a6eea'

* commit '6190fe6e7d7c8a917472637f5ab2fb21fc8a6eea':
Fix concat SMS for GSM.
ef354fdd634de93004fddd7966d70f70a1351ca8 30-May-2009 jsh <jsh@google.com> Fix concat SMS for GSM.

Bug 1883998: We only support sending 8-bit references for now.
Bug 1885080: Also fix the GsmAlphabetTest, which started failing when SmsHeader
was re-worked.
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
733f840aaa979c010e77cf2a69cfa106279e4721 30-May-2009 Android (Google) Code Review <android-gerrit@google.com> am c3b7e4e7: Merge change 2736 into donut

Merge commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2'

* commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2':
Telephony support for SMS memory reporting to the network.
867641ece36e2fd17faaea79cf19506ab17177c6 28-May-2009 jsh <jsh@google.com> Telephony support for SMS memory reporting to the network.

- Use ordered broadcast to allow receivers to set a result code.
- Ack SMS with result code.
- New RIL command to report memory status.
- Fixed a typo in a Gservices setting.
- Merge in CL 137895 (hold a wake lock while broadcasting SMS_RECEIVED).
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/test/SimulatedCommands.java
8e19b7c0e4c578703a1df0f8346b22b9e7c8a0f7 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> am a3d28bd5: Merge change 520 into donut

Merge commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01'

* commit 'a3d28bd5c278f750c70f2b87fce23df221cd4a01':
Enforce permissions for PhoneStateListener events.
45515659438964ec47f4feac247f0e9dce587c86 24-Apr-2009 Jaikumar Ganesh <jaikumar@google.com> Enforce permissions for PhoneStateListener events.

PhoneStateListener events like LISTEN_CALL_STATE_CHANGED,
have privacy information like phone numbers and hence,
need to be protected with a permission. The permission
READ_PHONE_STATE is used for this purpose. Use the permission
trick to ensure backward compatability.
ndroid/telephony/PhoneStateListener.java
a70396cd0a914d61081eb201864e0bb18f478b84 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> am f6355e24: Merge change 2399 into donut

Merge commit 'f6355e24f5382356ea197135fdeff827aabfdb90'

* commit 'f6355e24f5382356ea197135fdeff827aabfdb90':
Motorola additions for CDMA support without CdmaSuppConnTracker
dda5391d5079537e275c9f4ed2637a1484d0e4e8 29-May-2009 Wink Saville <wink@google.com> Motorola additions for CDMA support without CdmaSuppConnTracker

There are corresponding changes to hardware/ril and packages/apps/Phone
that are required to go with these changes.
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CdmaInformationRecord.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaCallWaiting.java
om/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaInformationRecords.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/FeatureCode.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/cdma/SignalToneUtil.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/test/SimulatedCommands.java
c5261874b7ad8cfe1e63726a91858b0c2a434578 27-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2503

* changes:
Stop the NANP number formatter from putting dashes in shortcodes.
5214376d2b1ce082765f766be1c7d56b50df74a7 27-May-2009 Ficus Kirkpatrick <ficus@android.com> Stop the NANP number formatter from putting dashes in shortcodes.

This changes the result of PhoneNumberUtils.formatNumber("46645") from
"466-45" to "46645".
ndroid/telephony/PhoneNumberUtils.java
8c1ba0d7ec3d4789c1e422b18d873875479fd299 26-May-2009 Jaikumar Ganesh <jaikumar@google.com> am cf2119a9: Check for desiredPowerState (airplane mode) before setting up data.

Merge commit 'cf2119a9755d9e2713ce78e84d0826d430a11a62'

* commit 'cf2119a9755d9e2713ce78e84d0826d430a11a62':
Check for desiredPowerState (airplane mode) before setting up data.
Remove dimmed background (and accompanying animation) for global
cf2119a9755d9e2713ce78e84d0826d430a11a62 26-May-2009 Jaikumar Ganesh <jaikumar@google.com> Check for desiredPowerState (airplane mode) before setting up data.

Check for airplane mode before trying to setup data.
Send an event while switching from wifi to cell data,
instead of calling trySetupData directly.
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
de6d65461975bf632c05790fbed8ad9cb1abccbe 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am a5f158bd: Merge change 2347 into donut

Merge commit 'a5f158bdde77f8d173d1f1c95d0f92405c519b0f'

* commit 'a5f158bdde77f8d173d1f1c95d0f92405c519b0f':
Fix Disconnect path for CDMA.
552d3f832cfd93e933cbe2613ec9e555432085ef 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 90215834: Merge change 418 into donut

Merge commit '9021583421ace854a7affeb5e767d1da56e4f7de'

* commit '9021583421ace854a7affeb5e767d1da56e4f7de':
add additional CdmaDataConnectionTracker event logging
2c0858a4815a0eb3877595cc562564d34713939b 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 511a0134: Merge change 2302 into donut

Merge commit '511a0134e1bfe90a23960eea72eca565e52aa816'

* commit '511a0134e1bfe90a23960eea72eca565e52aa816':
added SmsMessage ConcatRef parsing validation
a5f158bdde77f8d173d1f1c95d0f92405c519b0f 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2347 into donut

* changes:
Fix Disconnect path for CDMA.
9021583421ace854a7affeb5e767d1da56e4f7de 26-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 418 into donut

* changes:
add additional CdmaDataConnectionTracker event logging
b3d49f1569ae5ccaf6017bb39d8cf39122dbdbb8 22-May-2009 Jaikumar Ganesh <jaikumar@google.com> Fix Disconnect path for CDMA.

The corresponding fix has already been made for GSM.
When data state is in CONNECTING state and and we try
to disable the data, we set a pending disconnect but never
disconnect once we are connected.
om/android/internal/telephony/cdma/CdmaDataConnection.java
b5010cc3c33c74cc406a70f34f93d330a3f0db6a 22-May-2009 Robert Greenwalt <robdroid@android.com> Add carrier/mcc factors to wifi-channel decision.

Uses ro.carrier and MCC when available to try to set
(non-persistingly) the number of allowed wifi channels.
Part of the fix for 1625953.
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/SIMRecords.java
550885d158f5371cb207228eb1b7fb06aac32ea3 22-May-2009 Tammo Spalink <tammo@google.com> added SmsMessage ConcatRef parsing validation

addresses bugs:
http://b/issue?id=1870607
http://b/issue?id=1688238

and prior perforce commit:
http://s9/?change_num=136189
om/android/internal/telephony/SmsHeader.java
31fd22923aaefc85652a5b5939c6d4aa6fa289e2 20-May-2009 jsh <jsh@google.com> Make sure smsHeader != null before using it.

Fixes bug 1866578 - NPE while trying to dispatch a non-concatenated SMS with
no user data header (ie, your typical SMS).
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
5bc21aa0671d83e406b46e0431816dea8d9ca5cb 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1127 into donut

* changes:
SmsHeader rewrite, in preparation for migration to public API.
76b2dfd17fa9031b577b0934f45f86cb30a51cf9 22-Apr-2009 Tammo Spalink <tammo@google.com> add additional CdmaDataConnectionTracker event logging
om/android/internal/telephony/TelephonyEventLog.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
64c499113a758cf80cddfd4d0183f944a1a6645a 05-May-2009 Tammo Spalink <tammo@google.com> SmsHeader rewrite, in preparation for migration to public API.

See http://b/issue?id=1751571

Changes the semantics of SmsHeader from containing only opaque data
to exposing occurs-once frequently-used fields together with a list
of opaque fields. Also changes the coding to and from byte array to
be symmetrical, whereas previous encoding had an extra length field.

Cdma SmsMessage -- cleanup of code paths along with adjustments to
match the new header semantics, which should address at least some
of the issues with concatenated messages. See http://b/issue?id=1809759
ndroid/telephony/SmsMessage.java
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/SmsHeader.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/SmsMessage.java
ee748d37b01b3affb72b701d95ba20c189887b5f 15-May-2009 Jaikumar Ganesh <jaikumar@google.com> Fix network preference getting incorrectly set.

When the phone process crashes, we set the network preference
incorrectly. Also read the default value from a system property.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/RIL.java
9bfbfbd40df381817c0c685b177a2a1d666e101d 15-May-2009 Jaikumar Ganesh <jaikumar@google.com> Add a method to get the PhoneType in CellLocation.

CellLocation uses TelephonyManager to get the PhoneType.
TelephonyManager uses the system property to get the phoneType,
if the ITelephony interface is not up.
ndroid/telephony/CellLocation.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
ac61f6bc2b24f7ab03cdb0089c67c4034ea8549c 19-May-2009 Mike Lockwood <lockwood@android.com> Telephony: Allow getCellLocation() if client has permission ACCESS_FINE_LOCATION

ACCESS_FINE_LOCATION should imply ACCESS_COARSE_LOCATION, so either of these
permissions should be sufficient to allow TelephonyManager.getCellLocation().

Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid/telephony/TelephonyManager.java
3975fe3f21311e41b41e3a3e234a45ca24bed521 19-May-2009 Ramanan Rajeswaran <nobody@android.com> am 808f2919: AI 148962: Default language in Switzerland should be german and not english.

Merge commit '808f2919ee9cd9ff678ef091da0c7b703c929003' into donut

* commit '808f2919ee9cd9ff678ef091da0c7b703c929003':
AI 148962: Default language in Switzerland should be german and not english.
e9b06d754af03faf27012fbed1e7559ec1ba7c79 19-May-2009 Wink Saville <wink@google.com> Teleca 2b changes
ndroid/telephony/CellLocation.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.java
ndroid/telephony/SignalStrength.aidl
ndroid/telephony/SignalStrength.java
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/CdmaInformationRecord.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DataCallState.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CallFailCause.java
om/android/internal/telephony/cdma/CdmaCallWaiting.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/EriInfo.java
om/android/internal/telephony/cdma/EriManager.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/PDPContextState.java
om/android/internal/telephony/test/SimulatedCommands.java
808f2919ee9cd9ff678ef091da0c7b703c929003 18-May-2009 Ramanan Rajeswaran <nobody@android.com> AI 148962: Default language in Switzerland should be german and not english.

Automated import of CL 148962
om/android/internal/telephony/gsm/MccTable.java
caed8208bbcd3ba7226b49a4a40cf6d7d860746f 16-May-2009 Jaikumar Ganesh <jaikumar@google.com> Tear down data, if a disconnect request is pending.

If there is a pending disconnect, and the previous connection
attempt succeeds, we don't disconnect and hence the state remains
in DISCONNECTING. Ex: user is on Wifi, location app calls
enableApnType(SUPL) and then we set state to INITING. It then
calls disableApnType(SUPL) we register a pending disconnect.
When the data connection attempt is successful, we don't disconnect,
as the PDP Connection State has not been set to ACTIVE and we check
for this state. This fix removes the dependency on ACTIVE state check.
om/android/internal/telephony/gsm/PdpConnection.java
c06ce125408696fd49c7fa9e1189ecb61804007a 12-May-2009 jsh <jsh@google.com> Internal APIs to get/set SMSC address.
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/test/SimulatedCommands.java
027405155ff25ebe760dff03128519fb13cb8311 06-May-2009 Robert Greenwalt <robdroid@android.com> Fix Phone-based locale selection to never choose a lang-only locale.

This avoids us using the non-standard lang-only locale when communicating
off device. Fixes 1810133.
om/android/internal/telephony/PhoneBase.java
8478b59f177ec97a9996b71f7fac1509ba9ef493 30-Apr-2009 Tammo Spalink <tammo@google.com> clean up cdma sms creation and parsing

related to issue http://b/issue?id=1782245

- fixes 7bit ASCII encode and decode (previous completely broken)

- also consolidates encoding of user data, and changed to match
the conventions of the new data coding -- previously likely
broken for several cases
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
2a34043d5578deb8d7f93830e13c4efc91eba583 29-Apr-2009 Jaikumar Ganesh <jaikumar@google.com> Add RIL_UNSOL_OEM_HOOK_RAW.

Add RIL_UNSOL_OEM_HOOK_RAW for OEMs to send Unsolicitied
commands from the baseband.
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
e17210c17aa26d600f825e2f45c9aa66452e9988 29-Apr-2009 Bill Napier <> am 14533d2: AI 147720: Set default language for NL to nl.

Merge commit '14533d2652ce786f1ca84af1b54adaa201455989' into donut

* commit '14533d2652ce786f1ca84af1b54adaa201455989':
AI 147720: Set default language for NL to nl.
819c102394bfee2960997fb3fa0c85d3b6427dfc 29-Apr-2009 Bill Napier <> am 78b1511: AI 147541: Add cs as default language for cz.

Merge commit '78b1511d96f0b2123bfadf51c5c1ccf33cdd2b3d' into donut

* commit '78b1511d96f0b2123bfadf51c5c1ccf33cdd2b3d':
AI 147541: Add cs as default language for cz.
8c49d32cb9980959c402eaa243fd5129cd9942fc 24-Apr-2009 Tammo Spalink <tammo@google.com> enable additional cdma sms fields and user data encodings

enable ia5 and octet user data encodings
properly expose parsed user data
support additional bearer data subparameter types
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/UserData.java
f73eaf92e561eb0a010d05cc6357e172e8c9eaf7 25-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 531 into donut

* changes:
Teleca 090414 & 090423 patches for CDMA to complete phase1 work.
14533d2652ce786f1ca84af1b54adaa201455989 24-Apr-2009 Bill Napier <> AI 147720: Set default language for NL to nl.
BUG=1781746

Automated import of CL 147720
om/android/internal/telephony/gsm/MccTable.java
8cac9064f5e4863f62d59560cbe9a54a61ba4a9a 24-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 528 into donut

* changes:
Send the path of the EF file for ICC IO
469d5ba4cd963e9a6b39bb0514f7cf54ea503b30 24-Apr-2009 Jaikumar Ganesh <jaikumar@google.com> Send the path of the EF file for ICC IO

Send the path of the EF file for ICC IO Command.
Currently, this is null. This is for the upcoming support
for USIM and CDMA changes.
Tested:
1. Intial load of records while boot up.
2. Importing contacts from SIM.
3. Voice mail.
4. SMS
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/IccFileHandler.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/gsm/SIMFileHandler.java
e66b5c43cb2d0aece7f4a636a2368a9c66c46cf5 24-Apr-2009 Wink Saville <wink@google.com> Teleca 090414 & 090423 patches for CDMA to complete phase1 work.
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/SmsMessage.java
96a98d61d7a8360e7a70c91281a9d608837a6056 24-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 402 into donut

* changes:
remove seemingly now unnecessary workaround path
dcac00d4d2f656887d2b48d0f314e6cf56b7c68b 24-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 415 into donut

* changes:
code cleanup
3de6da1f9699da8f3d221444195fe599c4233998 22-Apr-2009 Tammo Spalink <tammo@google.com> remove seemingly now unnecessary workaround path
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
78b1511d96f0b2123bfadf51c5c1ccf33cdd2b3d 24-Apr-2009 Bill Napier <> AI 147541: Add cs as default language for cz.
BUG=1781746

Automated import of CL 147541
om/android/internal/telephony/gsm/MccTable.java
39bae346940c274173aeaeb756e68a772c25d5d5 23-Apr-2009 Tammo Spalink <tammo@google.com> code cleanup
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
0a57e5b730beaea75c1c1b1ca51b40c463918b4d 23-Apr-2009 Tammo Spalink <tammo@google.com> removed extra event log tag
om/android/internal/telephony/ServiceStateTracker.java
a14f47f975064816df3008e66055d41ddb9d7353 22-Apr-2009 Wink Saville <wink@google.com> Changes for new ril.h.

These allow RIL.java to assume ril.cpp is interfacing
to the new CDMA capable vendor ril. At the moment we
don't have a full CDMA capabile ril so thre are some
NEWRIL:TODO's in the code base to identify these areas.
om/android/internal/telephony/DriverCall.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/PDPContextState.java
om/android/internal/telephony/test/SimulatedCommands.java
e290ed0f610422fa0420b1fbbf37bb1afd04ab82 21-Apr-2009 Tammo Spalink <tammo@google.com> normalize the DATA_STATE_RADIO_OFF event log id definition

Was this different intentionally? It looks internal, and with very limited usage, and so easy to bring in line with the others...
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/TelephonyEventLog.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
badb11354a6e5ff0fba1d29853a40275242bcc6b 21-Apr-2009 Tammo Spalink <tammo@google.com> remove superfluous lines
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
e87e9506ba130c89a2b76f8ad4677d01d1918dc0 15-Apr-2009 Tammo Spalink <tammo@google.com> eliminate seemingly pointless conversion to and then from hex string
om/android/internal/telephony/gsm/SIMRecords.java
d90ff986b415c7a6747285c1c2d08a2338543cc5 15-Apr-2009 Mike Lockwood <lockwood@android.com> telephony: Don't disable an APN type that is not enabled.

Fixes a bad interaction between MMS and SUPL that occurs when they are using
the same APN.

Signed-off-by: Mike Lockwood <lockwood@android.com>
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
b0d4a3502eb4ceffcd78bb5ec33595853446965d 14-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 133 into donut

* changes:
Initial code for cdma sms encode and decode, in java, with simple tests.
ab6f5c6e86276602605382be73b8df2b08ed494d 14-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 142 into donut

* changes:
telephony: Add support for bringing up GSM data connections for GPS SUPL.
42ad56ead40f6c5986bd2d298b1d36f42da489a1 14-Apr-2009 Mike Lockwood <lockwood@android.com> telephony: Add support for bringing up GSM data connections for GPS SUPL.

Signed-off-by: Mike Lockwood <lockwood@android.com>
om/android/internal/telephony/Phone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
0f48ad767a8457f4ddf1a6a414c692edd1b9dca3 14-Apr-2009 Ramanan Rajeswaran <> Merge branch 'readonly-p4-donut' into donut
54a7a0d27bc7ac48c8bcb7697533a54e1e9a3ee4 14-Apr-2009 Ramanan Rajeswaran <> AI 146124: am: CL 146123 Change Belfast to Dublin
Original author: ramanan
Merged from: //branches/cupcake/...

Automated import of CL 146124
om/android/internal/telephony/gsm/MccTable.java
a69ab9493ca3d35ba3cd722a60f90b092a544de6 14-Apr-2009 Ramanan Rajeswaran <> AI 146123: Change Belfast to Dublin
BUG=1788466

Automated import of CL 146123
om/android/internal/telephony/gsm/MccTable.java
cdb02c136a4357f8504ccbea6f4b0c1690eae80d 14-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 105 into donut

* changes:
Fix crash when mSST is null and change default to GSM.
44038aa032ffd876f3c9b20a84db9d189f77e18e 14-Apr-2009 Wink Saville <wink@google.com> Fix crash when mSST is null and change default to GSM.
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/gsm/GSMPhone.java
83917db040bd7498ebca3b74f879dc1c9e223d8e 14-Apr-2009 Tammo Spalink <tammo@google.com> Initial code for cdma sms encode and decode, in java, with simple tests.

(direct cherry-pick of master 42/42/8)
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
om/android/internal/telephony/cdma/sms/SmsDataCoding.java
om/android/internal/telephony/cdma/sms/UserData.java
0e1c45fd8ba86e295c1b118fd3d4a1bc4b143dec 14-Apr-2009 Robert Greenwalt <> AI 145995: am: CL 145993 Fix Phone-oriented default-locale selection.
When several locales for a given language are available we were always
selecting the first.
Original author: rgreenwalt
Merged from: //branches/cupcake/...

Automated import of CL 145995
om/android/internal/telephony/PhoneBase.java
e4b6b7e2f65fdc5c09f70704625fd08f3c05a7e5 14-Apr-2009 Ramanan Rajeswaran <> AI 145981: am: CL 145892 Add Ireland, Switzerland, New Zealand, South Africa to MccTable
Original author: ramanan
Merged from: //branches/cupcake/...

Automated import of CL 145981
om/android/internal/telephony/gsm/MccTable.java
836054473c5329759cd298214516fe3648c58bd2 14-Apr-2009 Robert Greenwalt <> AI 145993: Fix Phone-oriented default-locale selection.
When several locales for a given language are available we were always
selecting the first.
BUG=1785986

Automated import of CL 145993
om/android/internal/telephony/PhoneBase.java
5320e896e235564321daaa5d9f0a540cf2ca44c4 13-Apr-2009 Ramanan Rajeswaran <> AI 145892: Add Ireland, Switzerland, New Zealand, South Africa to MccTable
BUG=1786030

Automated import of CL 145892
om/android/internal/telephony/gsm/MccTable.java
f8a7ceaef2e7d5cd530c9426bde91b6fa9a40b75 11-Apr-2009 Andy Stadler <> AI 145778: Manual merge changes 145382-145384 from cupcake.

Automated import of CL 145778
ndroid/telephony/TelephonyManager.java
48276ab989a4d775961ce30a43635a317052672a 09-Apr-2009 Dianne Hackborn <> AI 145383: API review: clean up a bunch of @hides that have been pending API review.
Either expose them, or official hide them with an explanation for why.
BUG=1779439

Automated import of CL 145383
ndroid/telephony/TelephonyManager.java
d6c5d527d3fa73dafc6e7cd36e4d6922b6d31845 07-Apr-2009 Wink Saville <> AI 144705: Teleca patch from 03/27/2009, fixes some CDMA issues.

Automated import of CL 144705
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/FeatureCode.java
om/android/internal/telephony/cdma/RuimRecords.java
60a51818483dae32d18414a4f128ca057e267e8c 06-Apr-2009 Jaikumar Ganesh <> AI 144688: Fix CDMA ril call sequence numbers.
RIL calls cannot have any gaps in their numbering. This was introduced
by the CDMA code merge. This was partially fixed only in ril.h. We need
to change the Constants file too.
BUG=1765265

Automated import of CL 144688
om/android/internal/telephony/RILConstants.java
b9db7c9f5a8924361ae2f439509e19993d82b884 05-Apr-2009 Mike Lockwood <> AI 144593: Fix GSM cell location updates.
BUG=1761611

Automated import of CL 144593
ndroid/telephony/CellLocation.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
767a662ecde33c3979bf02b793d392aca0403162 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
ndroid/telephony/CellLocation.java
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.aidl
ndroid/telephony/ServiceState.java
ndroid/telephony/SmsManager.java
ndroid/telephony/SmsMessage.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/cdma/CdmaCellLocation.java
ndroid/telephony/cdma/package.html
ndroid/telephony/gsm/GsmCellLocation.java
ndroid/telephony/gsm/SmsManager.java
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/ATResponseParser.java
om/android/internal/telephony/AdnRecord.aidl
om/android/internal/telephony/AdnRecord.java
om/android/internal/telephony/AdnRecordCache.java
om/android/internal/telephony/AdnRecordLoader.java
om/android/internal/telephony/BaseCommands.java
om/android/internal/telephony/Call.java
om/android/internal/telephony/CallForwardInfo.java
om/android/internal/telephony/CallTracker.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/CommandException.java
om/android/internal/telephony/CommandsInterface.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DataConnection.java
om/android/internal/telephony/DataConnectionTracker.java
om/android/internal/telephony/DataLink.java
om/android/internal/telephony/DataLinkInterface.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/DriverCall.java
om/android/internal/telephony/EncodeException.java
om/android/internal/telephony/GsmAlphabet.java
om/android/internal/telephony/IIccPhoneBook.aidl
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/ISms.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/IccCard.java
om/android/internal/telephony/IccCardApplication.java
om/android/internal/telephony/IccCardStatus.java
om/android/internal/telephony/IccConstants.java
om/android/internal/telephony/IccException.java
om/android/internal/telephony/IccFileHandler.java
om/android/internal/telephony/IccFileNotFound.java
om/android/internal/telephony/IccFileTypeMismatch.java
om/android/internal/telephony/IccIoResult.java
om/android/internal/telephony/IccPhoneBookInterfaceManager.java
om/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
om/android/internal/telephony/IccProvider.java
om/android/internal/telephony/IccRecords.java
om/android/internal/telephony/IccSmsInterfaceManager.java
om/android/internal/telephony/IccSmsInterfaceManagerProxy.java
om/android/internal/telephony/IccUtils.java
om/android/internal/telephony/IccVmFixedException.java
om/android/internal/telephony/IccVmNotSupportedException.java
om/android/internal/telephony/MmiCode.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneProxy.java
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/PhoneSubInfoProxy.java
om/android/internal/telephony/RIL.java
om/android/internal/telephony/RILConstants.java
om/android/internal/telephony/SMSDispatcher.java
om/android/internal/telephony/ServiceStateTracker.java
om/android/internal/telephony/SimCard.java
om/android/internal/telephony/SmsAddress.java
om/android/internal/telephony/SmsHeader.java
om/android/internal/telephony/SmsMessageBase.java
om/android/internal/telephony/SmsRawData.aidl
om/android/internal/telephony/SmsRawData.java
om/android/internal/telephony/SmsResponse.java
om/android/internal/telephony/TelephonyEventLog.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/cdma/CDMAPhone.java
om/android/internal/telephony/cdma/CallFailCause.java
om/android/internal/telephony/cdma/CdmaCall.java
om/android/internal/telephony/cdma/CdmaCallTracker.java
om/android/internal/telephony/cdma/CdmaConnection.java
om/android/internal/telephony/cdma/CdmaDataConnection.java
om/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
om/android/internal/telephony/cdma/CdmaSMSDispatcher.java
om/android/internal/telephony/cdma/CdmaServiceStateTracker.java
om/android/internal/telephony/cdma/FeatureCode.java
om/android/internal/telephony/cdma/RuimCard.java
om/android/internal/telephony/cdma/RuimFileHandler.java
om/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
om/android/internal/telephony/cdma/RuimRecords.java
om/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
om/android/internal/telephony/cdma/SmsMessage.java
om/android/internal/telephony/cdma/TtyIntent.java
om/android/internal/telephony/cdma/package.html
om/android/internal/telephony/cdma/sms/BearerData.java
om/android/internal/telephony/cdma/sms/CdmaSmsAddress.java
om/android/internal/telephony/cdma/sms/SmsDataCoding.java
om/android/internal/telephony/cdma/sms/SmsEnvelope.java
om/android/internal/telephony/cdma/sms/UserData.java
om/android/internal/telephony/cdma/sms/package.html
om/android/internal/telephony/gsm/AdnRecord.aidl
om/android/internal/telephony/gsm/AdnRecord.java
om/android/internal/telephony/gsm/AdnRecordCache.java
om/android/internal/telephony/gsm/BaseCommands.java
om/android/internal/telephony/gsm/CallForwardInfo.java
om/android/internal/telephony/gsm/CallTracker.java
om/android/internal/telephony/gsm/CommandException.java
om/android/internal/telephony/gsm/CommandsInterface.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/DataLink.java
om/android/internal/telephony/gsm/DataLinkInterface.java
om/android/internal/telephony/gsm/DriverCall.java
om/android/internal/telephony/gsm/EncodeException.java
om/android/internal/telephony/gsm/GSMCall.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
om/android/internal/telephony/gsm/GsmCall.java
om/android/internal/telephony/gsm/GsmCallTracker.java
om/android/internal/telephony/gsm/GsmConnection.java
om/android/internal/telephony/gsm/GsmDataConnectionTracker.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmSMSDispatcher.java
om/android/internal/telephony/gsm/GsmServiceStateTracker.java
om/android/internal/telephony/gsm/GsmSimCard.java
om/android/internal/telephony/gsm/GsmSmsAddress.java
om/android/internal/telephony/gsm/ISimPhoneBook.aidl
om/android/internal/telephony/gsm/ISms.aidl
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/NetworkInfo.aidl
om/android/internal/telephony/gsm/NetworkInfo.java
om/android/internal/telephony/gsm/PDPContextState.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/PppLink.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/RILConstants.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/SimCard.java
om/android/internal/telephony/gsm/SimConstants.java
om/android/internal/telephony/gsm/SimException.java
om/android/internal/telephony/gsm/SimFileNotFound.java
om/android/internal/telephony/gsm/SimFileTypeMismatch.java
om/android/internal/telephony/gsm/SimIoResult.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/SimProvider.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SimTlv.java
om/android/internal/telephony/gsm/SimUtils.java
om/android/internal/telephony/gsm/SmsHeader.java
om/android/internal/telephony/gsm/SmsMessage.java
om/android/internal/telephony/gsm/SmsRawData.aidl
om/android/internal/telephony/gsm/SmsRawData.java
om/android/internal/telephony/gsm/SmsResponse.java
om/android/internal/telephony/gsm/TelephonyEventLog.java
om/android/internal/telephony/gsm/stk/BerTlv.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/ImageDescriptor.java
om/android/internal/telephony/gsm/stk/ResponseData.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/StkService.java
om/android/internal/telephony/gsm/stk/ValueParser.java
om/android/internal/telephony/test/SimulatedCommands.java
om/android/internal/telephony/test/SimulatedGsmCallState.java
88b861c8a6c7c6a669ad2fe1bcef580159c2ace4 01-Apr-2009 Robert Greenwalt <> AI 143900: am: CL 143898 Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
Uses a core system resource string-array to contain the mapping
of carrier ID -> default locale. This should be set per project in
an overlay.
Original author: rgreenwalt
Merged from: //branches/cupcake/...

Automated import of CL 143900
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/gsm/SIMRecords.java
f05a98cbff4647de518daf349fe7f69a4993a6fb 01-Apr-2009 Robert Greenwalt <> AI 143898: Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
Uses a core system resource string-array to contain the mapping
of carrier ID -> default locale. This should be set per project in
an overlay.
BUG=1731384

Automated import of CL 143898
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/gsm/SIMRecords.java
38e260a62020af0e6ca45d5a9cc3f8e8c9a2842c 28-Mar-2009 John Wang <> AI 143181: am: CL 142924 Support DCM specific MMI network service.
IExtendedNetworkService has 4 MMI service interface used by PhoneUtils to put DCM related nw service.
void setMmiString(String number);
CharSequence getMmiRunningText();
CharSequence getUserMessage(CharSequence text);
void clearMmiString();
And the service is bind via "com.android.ussd.IExtendedNetworkService".
Original author: johnwang
Merged from: //branches/cupcake/...

Automated import of CL 143181
om/android/internal/telephony/IExtendedNetworkService.aidl
om/android/internal/telephony/gsm/GsmMmiCode.java
2fe6fe1f5f0cdd1ed622e657aa2cc0211a1702d5 26-Mar-2009 John Wang <> Automated import from //branches/cupcake/...@142924,142924
om/android/internal/telephony/IExtendedNetworkService.aidl
om/android/internal/telephony/gsm/GsmMmiCode.java
1d4613c1ec6ddf8aec3f723a7cab4253d19f9e66 25-Mar-2009 John Huang <> Automated import from //branches/donutburger/...@142336,142336
om/android/internal/telephony/gsm/DataConnectionTracker.java
46e6878c4b18b74e820dec5a183125ba9e00096f 25-Mar-2009 John Huang <> Automated import from //branches/cupcake/...@142334,142334
om/android/internal/telephony/gsm/DataConnectionTracker.java
9587f8696aa8a2bb6db4f3203a842e06170b62c3 25-Mar-2009 John Huang <> Automated import from //branches/donutburger/...@140756,140756
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
bd8f9072310fa63ad858287bac6c439d2f299d7c 25-Mar-2009 John Wang <> Automated import from //branches/donutburger/...@140572,140572
om/android/internal/telephony/gsm/RIL.java
c2ad241504fcaa12d4579d3b0b4038d1ca8d08c9 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/RIL.java
105925376f8d0f6b318c9938c7b83ef7fef094da 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/gsm/DriverCall.java
om/android/internal/telephony/gsm/GSMCall.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
om/android/internal/telephony/Phone.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
4df2423a947bcd3f024cc3d3a1a315a8dc428598 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
om/android/internal/telephony/Connection.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/gsm/BaseCommands.java
om/android/internal/telephony/gsm/CommandsInterface.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GsmSimCard.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/RILConstants.java
om/android/internal/telephony/gsm/RestrictedState.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/SpnOverride.java
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid/telephony/CellLocation.java
ndroid/telephony/JapanesePhoneNumberFormatter.java
ndroid/telephony/NeighboringCellInfo.aidl
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.aidl
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/gsm/GsmCellLocation.java
ndroid/telephony/gsm/SmsManager.java
ndroid/telephony/gsm/SmsMessage.java
ndroid/telephony/gsm/package.html
ndroid/telephony/package.html
om/android/internal/telephony/ATParseEx.java
om/android/internal/telephony/ATResponseParser.java
om/android/internal/telephony/Call.java
om/android/internal/telephony/CallStateException.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/MmiCode.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneNotifier.java
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/SimCard.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
om/android/internal/telephony/gsm/AdnRecord.aidl
om/android/internal/telephony/gsm/AdnRecord.java
om/android/internal/telephony/gsm/AdnRecordCache.java
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/BaseCommands.java
om/android/internal/telephony/gsm/CallFailCause.java
om/android/internal/telephony/gsm/CallForwardInfo.java
om/android/internal/telephony/gsm/CallTracker.java
om/android/internal/telephony/gsm/CommandException.java
om/android/internal/telephony/gsm/CommandsInterface.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/DataLink.java
om/android/internal/telephony/gsm/DataLinkInterface.java
om/android/internal/telephony/gsm/DriverCall.java
om/android/internal/telephony/gsm/EncodeException.java
om/android/internal/telephony/gsm/GSMCall.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmSimCard.java
om/android/internal/telephony/gsm/ISimPhoneBook.aidl
om/android/internal/telephony/gsm/ISms.aidl
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/NetworkInfo.aidl
om/android/internal/telephony/gsm/NetworkInfo.java
om/android/internal/telephony/gsm/PDPContextState.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/PppLink.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/RILConstants.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/SimConstants.java
om/android/internal/telephony/gsm/SimException.java
om/android/internal/telephony/gsm/SimFileNotFound.java
om/android/internal/telephony/gsm/SimFileTypeMismatch.java
om/android/internal/telephony/gsm/SimIoResult.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/SimProvider.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SimTlv.java
om/android/internal/telephony/gsm/SimUtils.java
om/android/internal/telephony/gsm/SmsHeader.java
om/android/internal/telephony/gsm/SmsRawData.aidl
om/android/internal/telephony/gsm/SmsRawData.java
om/android/internal/telephony/gsm/SmsResponse.java
om/android/internal/telephony/gsm/SuppServiceNotification.java
om/android/internal/telephony/gsm/TelephonyEventLog.java
om/android/internal/telephony/gsm/VoiceMailConstants.java
om/android/internal/telephony/gsm/package.html
om/android/internal/telephony/gsm/stk/AppInterface.java
om/android/internal/telephony/gsm/stk/BerTlv.java
om/android/internal/telephony/gsm/stk/CommandDetails.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/Duration.java
om/android/internal/telephony/gsm/stk/FontSize.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/ImageDescriptor.java
om/android/internal/telephony/gsm/stk/Input.java
om/android/internal/telephony/gsm/stk/Item.java
om/android/internal/telephony/gsm/stk/LaunchBrowserMode.java
om/android/internal/telephony/gsm/stk/Menu.java
om/android/internal/telephony/gsm/stk/PresentationType.java
om/android/internal/telephony/gsm/stk/ResponseData.java
om/android/internal/telephony/gsm/stk/ResultCode.java
om/android/internal/telephony/gsm/stk/ResultException.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/StkCmdMessage.java
om/android/internal/telephony/gsm/stk/StkException.java
om/android/internal/telephony/gsm/stk/StkLog.java
om/android/internal/telephony/gsm/stk/StkResponseMessage.java
om/android/internal/telephony/gsm/stk/StkService.java
om/android/internal/telephony/gsm/stk/TextAlignment.java
om/android/internal/telephony/gsm/stk/TextAttribute.java
om/android/internal/telephony/gsm/stk/TextColor.java
om/android/internal/telephony/gsm/stk/TextMessage.java
om/android/internal/telephony/gsm/stk/Tone.java
om/android/internal/telephony/gsm/stk/ToneSettings.java
om/android/internal/telephony/gsm/stk/ValueParser.java
om/android/internal/telephony/gsm/stk/package.html
om/android/internal/telephony/package.html
om/android/internal/telephony/test/ModelInterpreter.java
om/android/internal/telephony/test/SimulatedCommands.java
om/android/internal/telephony/test/SimulatedGsmCallState.java
om/android/internal/telephony/test/SimulatedRadioControl.java
om/android/internal/telephony/test/package.html
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
ndroid/telephony/CellLocation.java
ndroid/telephony/JapanesePhoneNumberFormatter.java
ndroid/telephony/NeighboringCellInfo.aidl
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.aidl
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/gsm/GsmCellLocation.java
ndroid/telephony/gsm/SmsManager.java
ndroid/telephony/gsm/SmsMessage.java
ndroid/telephony/gsm/package.html
ndroid/telephony/package.html
om/android/internal/telephony/ATParseEx.java
om/android/internal/telephony/ATResponseParser.java
om/android/internal/telephony/Call.java
om/android/internal/telephony/CallStateException.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/MmiCode.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneNotifier.java
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/SimCard.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
om/android/internal/telephony/gsm/AdnRecord.aidl
om/android/internal/telephony/gsm/AdnRecord.java
om/android/internal/telephony/gsm/AdnRecordCache.java
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/BaseCommands.java
om/android/internal/telephony/gsm/CallFailCause.java
om/android/internal/telephony/gsm/CallForwardInfo.java
om/android/internal/telephony/gsm/CallTracker.java
om/android/internal/telephony/gsm/CommandException.java
om/android/internal/telephony/gsm/CommandsInterface.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/DataLink.java
om/android/internal/telephony/gsm/DataLinkInterface.java
om/android/internal/telephony/gsm/DriverCall.java
om/android/internal/telephony/gsm/EncodeException.java
om/android/internal/telephony/gsm/GSMCall.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmSimCard.java
om/android/internal/telephony/gsm/ISimPhoneBook.aidl
om/android/internal/telephony/gsm/ISms.aidl
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/NetworkInfo.aidl
om/android/internal/telephony/gsm/NetworkInfo.java
om/android/internal/telephony/gsm/PDPContextState.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/PppLink.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/RILConstants.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/SimConstants.java
om/android/internal/telephony/gsm/SimException.java
om/android/internal/telephony/gsm/SimFileNotFound.java
om/android/internal/telephony/gsm/SimFileTypeMismatch.java
om/android/internal/telephony/gsm/SimIoResult.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/SimProvider.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SimTlv.java
om/android/internal/telephony/gsm/SimUtils.java
om/android/internal/telephony/gsm/SmsHeader.java
om/android/internal/telephony/gsm/SmsRawData.aidl
om/android/internal/telephony/gsm/SmsRawData.java
om/android/internal/telephony/gsm/SmsResponse.java
om/android/internal/telephony/gsm/SuppServiceNotification.java
om/android/internal/telephony/gsm/TelephonyEventLog.java
om/android/internal/telephony/gsm/VoiceMailConstants.java
om/android/internal/telephony/gsm/package.html
om/android/internal/telephony/gsm/stk/AppInterface.java
om/android/internal/telephony/gsm/stk/BerTlv.java
om/android/internal/telephony/gsm/stk/CommandDetails.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/Duration.java
om/android/internal/telephony/gsm/stk/FontSize.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/ImageDescriptor.java
om/android/internal/telephony/gsm/stk/Input.java
om/android/internal/telephony/gsm/stk/Item.java
om/android/internal/telephony/gsm/stk/LaunchBrowserMode.java
om/android/internal/telephony/gsm/stk/Menu.java
om/android/internal/telephony/gsm/stk/PresentationType.java
om/android/internal/telephony/gsm/stk/ResponseData.java
om/android/internal/telephony/gsm/stk/ResultCode.java
om/android/internal/telephony/gsm/stk/ResultException.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/StkCmdMessage.java
om/android/internal/telephony/gsm/stk/StkException.java
om/android/internal/telephony/gsm/stk/StkLog.java
om/android/internal/telephony/gsm/stk/StkResponseMessage.java
om/android/internal/telephony/gsm/stk/StkService.java
om/android/internal/telephony/gsm/stk/TextAlignment.java
om/android/internal/telephony/gsm/stk/TextAttribute.java
om/android/internal/telephony/gsm/stk/TextColor.java
om/android/internal/telephony/gsm/stk/TextMessage.java
om/android/internal/telephony/gsm/stk/Tone.java
om/android/internal/telephony/gsm/stk/ToneSettings.java
om/android/internal/telephony/gsm/stk/ValueParser.java
om/android/internal/telephony/gsm/stk/package.html
om/android/internal/telephony/package.html
om/android/internal/telephony/test/ModelInterpreter.java
om/android/internal/telephony/test/SimulatedCommands.java
om/android/internal/telephony/test/SimulatedGsmCallState.java
om/android/internal/telephony/test/SimulatedRadioControl.java
om/android/internal/telephony/test/package.html
076357b8567458d4b6dfdcf839ef751634cd2bfb 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
3dec7d563a2f3e1eb967ce2054a00b6620e3558c 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
15ab3eae2ec3d73b3e8aa60b33ae41445bf83f4b 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
om/android/internal/telephony/WapPushOverSms.java
om/android/internal/telephony/WspTypeDecoder.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
3001a035439d8134a7d70d796376d1dfbff3cdcd 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
ndroid/telephony/TelephonyManager.java
om/android/internal/telephony/gsm/CallTracker.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/TelephonyEventLog.java
f1e484acb594a726fb57ad0ae4cfe902c7f35858 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
om/android/internal/telephony/gsm/stk/StkService.java
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/Service.java
om/android/internal/telephony/gsm/stk/StkService.java
b798689749c64baba81f02e10cf2157c747d6b46 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/ImageDescriptor.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/Service.java
om/android/internal/telephony/gsm/stk/ValueParser.java
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
ndroid/telephony/JapanesePhoneNumberFormatter.java
ndroid/telephony/NeighboringCellInfo.aidl
ndroid/telephony/NeighboringCellInfo.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/gsm/SmsManager.java
ndroid/telephony/gsm/SmsMessage.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/gsm/CallTracker.java
om/android/internal/telephony/gsm/CommandsInterface.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/SimException.java
om/android/internal/telephony/gsm/SimUtils.java
om/android/internal/telephony/gsm/stk/AppInterface.java
om/android/internal/telephony/gsm/stk/BerTlv.java
om/android/internal/telephony/gsm/stk/CommandDetails.java
om/android/internal/telephony/gsm/stk/CommandListener.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/CommandParamsFactory.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/CtlvCommandDetails.java
om/android/internal/telephony/gsm/stk/Duration.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/Input.java
om/android/internal/telephony/gsm/stk/Item.java
om/android/internal/telephony/gsm/stk/Menu.java
om/android/internal/telephony/gsm/stk/ResponseData.java
om/android/internal/telephony/gsm/stk/ResultCode.java
om/android/internal/telephony/gsm/stk/RilMessageDecoder.java
om/android/internal/telephony/gsm/stk/Service.java
om/android/internal/telephony/gsm/stk/StkAppInstaller.java
om/android/internal/telephony/gsm/stk/StkAppStateReceiver.java
om/android/internal/telephony/gsm/stk/StkCmdMessage.java
om/android/internal/telephony/gsm/stk/StkLog.java
om/android/internal/telephony/gsm/stk/StkResponseMessage.java
om/android/internal/telephony/gsm/stk/TextMessage.java
om/android/internal/telephony/gsm/stk/Tone.java
om/android/internal/telephony/gsm/stk/ToneSettings.java
om/android/internal/telephony/gsm/stk/ValueParser.java
om/android/internal/telephony/test/ModelInterpreter.java
om/android/internal/telephony/test/SimulatedCommands.java
om/android/internal/telephony/test/SimulatedGsmCallState.java
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
ndroid/telephony/CellLocation.java
ndroid/telephony/PhoneNumberFormattingTextWatcher.java
ndroid/telephony/PhoneNumberUtils.java
ndroid/telephony/PhoneStateListener.java
ndroid/telephony/ServiceState.aidl
ndroid/telephony/ServiceState.java
ndroid/telephony/TelephonyManager.java
ndroid/telephony/gsm/GsmCellLocation.java
ndroid/telephony/gsm/SmsManager.java
ndroid/telephony/gsm/SmsMessage.java
ndroid/telephony/gsm/package.html
ndroid/telephony/package.html
om/android/internal/telephony/ATParseEx.java
om/android/internal/telephony/ATResponseParser.java
om/android/internal/telephony/Call.java
om/android/internal/telephony/CallStateException.java
om/android/internal/telephony/CallerInfo.java
om/android/internal/telephony/CallerInfoAsyncQuery.java
om/android/internal/telephony/Connection.java
om/android/internal/telephony/DefaultPhoneNotifier.java
om/android/internal/telephony/IPhoneStateListener.aidl
om/android/internal/telephony/IPhoneSubInfo.aidl
om/android/internal/telephony/ITelephony.aidl
om/android/internal/telephony/ITelephonyRegistry.aidl
om/android/internal/telephony/MmiCode.java
om/android/internal/telephony/Phone.java
om/android/internal/telephony/PhoneBase.java
om/android/internal/telephony/PhoneFactory.java
om/android/internal/telephony/PhoneNotifier.java
om/android/internal/telephony/PhoneStateIntentReceiver.java
om/android/internal/telephony/PhoneSubInfo.java
om/android/internal/telephony/SimCard.java
om/android/internal/telephony/TelephonyIntents.java
om/android/internal/telephony/TelephonyProperties.java
om/android/internal/telephony/gsm/AdnRecord.aidl
om/android/internal/telephony/gsm/AdnRecord.java
om/android/internal/telephony/gsm/AdnRecordCache.java
om/android/internal/telephony/gsm/ApnSetting.java
om/android/internal/telephony/gsm/BaseCommands.java
om/android/internal/telephony/gsm/CallFailCause.java
om/android/internal/telephony/gsm/CallForwardInfo.java
om/android/internal/telephony/gsm/CallTracker.java
om/android/internal/telephony/gsm/CommandException.java
om/android/internal/telephony/gsm/CommandsInterface.java
om/android/internal/telephony/gsm/DataConnectionTracker.java
om/android/internal/telephony/gsm/DataLink.java
om/android/internal/telephony/gsm/DataLinkInterface.java
om/android/internal/telephony/gsm/DriverCall.java
om/android/internal/telephony/gsm/EncodeException.java
om/android/internal/telephony/gsm/GSMCall.java
om/android/internal/telephony/gsm/GSMConnection.java
om/android/internal/telephony/gsm/GSMPhone.java
om/android/internal/telephony/gsm/GsmAlphabet.java
om/android/internal/telephony/gsm/GsmMmiCode.java
om/android/internal/telephony/gsm/GsmSimCard.java
om/android/internal/telephony/gsm/ISimPhoneBook.aidl
om/android/internal/telephony/gsm/ISms.aidl
om/android/internal/telephony/gsm/MccTable.java
om/android/internal/telephony/gsm/NetworkInfo.aidl
om/android/internal/telephony/gsm/NetworkInfo.java
om/android/internal/telephony/gsm/PDPContextState.java
om/android/internal/telephony/gsm/PdpConnection.java
om/android/internal/telephony/gsm/PppLink.java
om/android/internal/telephony/gsm/RIL.java
om/android/internal/telephony/gsm/RILConstants.java
om/android/internal/telephony/gsm/SIMFileHandler.java
om/android/internal/telephony/gsm/SIMRecords.java
om/android/internal/telephony/gsm/SMSDispatcher.java
om/android/internal/telephony/gsm/ServiceStateTracker.java
om/android/internal/telephony/gsm/SimConstants.java
om/android/internal/telephony/gsm/SimException.java
om/android/internal/telephony/gsm/SimFileNotFound.java
om/android/internal/telephony/gsm/SimFileTypeMismatch.java
om/android/internal/telephony/gsm/SimIoResult.java
om/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
om/android/internal/telephony/gsm/SimProvider.java
om/android/internal/telephony/gsm/SimSmsInterfaceManager.java
om/android/internal/telephony/gsm/SimTlv.java
om/android/internal/telephony/gsm/SimUtils.java
om/android/internal/telephony/gsm/SmsHeader.java
om/android/internal/telephony/gsm/SmsRawData.aidl
om/android/internal/telephony/gsm/SmsRawData.java
om/android/internal/telephony/gsm/SmsResponse.java
om/android/internal/telephony/gsm/SuppServiceNotification.java
om/android/internal/telephony/gsm/VoiceMailConstants.java
om/android/internal/telephony/gsm/package.html
om/android/internal/telephony/gsm/stk/AppInterface.java
om/android/internal/telephony/gsm/stk/BerTlv.java
om/android/internal/telephony/gsm/stk/CommandListener.java
om/android/internal/telephony/gsm/stk/CommandParams.java
om/android/internal/telephony/gsm/stk/ComprehensionTlv.java
om/android/internal/telephony/gsm/stk/CtlvCommandDetails.java
om/android/internal/telephony/gsm/stk/Duration.java
om/android/internal/telephony/gsm/stk/FontSize.java
om/android/internal/telephony/gsm/stk/IconLoader.java
om/android/internal/telephony/gsm/stk/ImageDescriptor.java
om/android/internal/telephony/gsm/stk/Item.java
om/android/internal/telephony/gsm/stk/LaunchBrowserMode.java
om/android/internal/telephony/gsm/stk/Menu.java
om/android/internal/telephony/gsm/stk/PresentationType.java
om/android/internal/telephony/gsm/stk/ResultCode.java
om/android/internal/telephony/gsm/stk/ResultException.java
om/android/internal/telephony/gsm/stk/Service.java
om/android/internal/telephony/gsm/stk/StkAppInstaller.java
om/android/internal/telephony/gsm/stk/StkAppStateReceiver.java
om/android/internal/telephony/gsm/stk/StkException.java
om/android/internal/telephony/gsm/stk/TextAlignment.java
om/android/internal/telephony/gsm/stk/TextAttribute.java
om/android/internal/telephony/gsm/stk/TextColor.java
om/android/internal/telephony/gsm/stk/Tone.java
om/android/internal/telephony/gsm/stk/package.html
om/android/internal/telephony/package.html
om/android/internal/telephony/test/ModelInterpreter.java
om/android/internal/telephony/test/SimulatedCommands.java
om/android/internal/telephony/test/SimulatedGsmCallState.java
om/android/internal/telephony/test/SimulatedRadioControl.java
om/android/internal/telephony/test/package.html