• Home
  • History
  • Annotate
  • only in /frameworks/opt/telephony/src/java/com/android/internal/telephony/gsm/
History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/gsm/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f08c4c89622ddcbc4ed9315fe6b399941dad4939 12-Dec-2012 Wink Saville <wink@google.com> Turn auto attach on/off when we attach/detach.

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

Bug: 7491805
Change-Id: If41c2514ebdb9cd2fba88eef692f2c7160c04b0f
smDataConnectionTracker.java
2bc7f2e1da139e183519af01f50940327ca9765e 06-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> Use proper check for spn for operator name display

Change null check to null or empty string check.

bug:7389730
Change-Id: I593429b8668b49978ad38b28062b8b2031464813
IMRecords.java
44be3fc486c049bbfea331b0fc2cff0552326f4b 06-Feb-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Distinguish GSM vs ETWS bc by message id

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

Bug: 7417676
Change-Id: I6aeedcd531a89ded7901db33d89ed45baaabbaa7
msCbHeader.java
708cb897813b5239e1d732d08ee2d04f577d09f1 26-Oct-2012 Junichi Monma <monma@google.com> Allowing to change the poll state even if only PS is avairable on the network.

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

Bug: 3339315
Change-Id: I6c2b508a181afed6dc9356b99ad9ef09f8c7ea4f
smServiceStateTracker.java
a2985af1d00f7db8cb11da3874dc74e0c7ff7088 23-Oct-2012 Wink Saville <wink@google.com> Validate call forwarding indicator status from SIM.

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

Bug: 7387797
Change-Id: Ib35700c927fcc06eb5fb533097cb25a0de13db77
IMRecords.java
20659cc78b898b553a54bb6d9d7728f326b77bd1 16-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Retry connections that are in SCANNING.

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

bug:7353277
Change-Id: Ic1fdd745f52ef33dd94b1d85b0dcc57a00c04d62
smDataConnectionTracker.java
27814a2e735c0221935d46654fb00ff3ec2c45ea 16-Oct-2012 Wink Saville <wink@google.com> When retrying disassociate an ApnContext from a DC only when failed or idle.

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

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

Bug: 6884995
Bug: 7343098
Change-Id: Ia36316151bc5ae9a0ef9b48b1841816198862127
smDataConnectionTracker.java
f7a8133113daddcc48a41e451193afd3fcb35e16 13-Oct-2012 Wink Saville <wink@google.com> Handle no IccRecords in updateSpnDisplay differently.

Rather than doing nothing in GsmServiceStateTracker#updateSpnDisplay
if mIccRecords is null, use a rule of 0 and an empty spn. And then keep the
remaining logic the same.

This allows "Emergency Only Calls" to be displayed in the lock and
notification screens if there is no SIM card.

Bug: 7276760
Change-Id: I0f969c8f5cad204e80c63d2e1a8e896cb7f4c02a
smServiceStateTracker.java
175442fc1d7ed440e4c2a7aaffe38521446dec8c 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Revert "Act on no-prefered-apn-on-connect config option.""

Revert the revert - change is good.

This reverts commit 859e774e4309c24efafb157a894c2f94f8c544f2

Change-Id: Icb71779f30f5fe1ee7ed73c88e547507cbc0c31f
smDataConnectionTracker.java
859e774e4309c24efafb157a894c2f94f8c544f2 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Act on no-prefered-apn-on-connect config option."

breaking jb-mr1-release

This reverts commit 3ff47ff70406e6973226ac966d157a97fa8e9279

Change-Id: I897cc6eecaa0b4a3d248abda0431cd70742ad2df
smDataConnectionTracker.java
3ff47ff70406e6973226ac966d157a97fa8e9279 08-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Act on no-prefered-apn-on-connect config option.

bug:7306353
Change-Id: Icf1c21cc8997821a7d50d114c8985728d9bdb02e
smDataConnectionTracker.java
7eff443d1f090abdbbd93eef9f265c74890920bc 03-Oct-2012 Dianne Hackborn <hackbod@google.com> Fix issue #7274813: A few sticky broadcasts aren't being sent to all users

Change-Id: Ief63aa4be067618b2431c2c0fcd1d6820a348715
smServiceStateTracker.java
c90b7d250dae1931a603cc052bd90bc34c070f1b 25-Sep-2012 Wink Saville <wink@google.com> Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)

This is already in AOSP and Master, back porting to JB-MR1.

Bug: 6983013
Change-Id: Ibda258e632ecff79f22eebe093df0061ed4cdf4d
smConnection.java
f4bfdd2941bdee6927a5300556a5c1d490bbff33 25-Sep-2012 John Wang <johnwang@google.com> Merge "Handle mmi dialing number ending with #." into jb-mr1-dev
9225578f29e449d30380fcf71defb1ac7e8a59db 25-Sep-2012 John Wang <johnwang@google.com> Handle mmi dialing number ending with #.

According to TS 22.030 6.5.2 "Structure of the MMI", the dialing
number should not ending with #. But it is okay to have # in the
middle of dialing number.

bug:6410387
Change-Id: I1838d7012a132f27a3a879e1d34a9c3b04844def
smMmiCode.java
60e7f68c5f73b06fd5b603c331fc24b9d329de6b 24-Sep-2012 John Wang <johnwang@google.com> Make updateSpnDisplay cover out various scenarios.

Set showPlmn and plmn to correct values in emergency mode,
out of service, and airplane mode.

bug:7134445
Change-Id: Ic95e352dbfad3c6e2b62119ce288ce69dc83b856
smServiceStateTracker.java
f022afffe951c56fd2c1fda40b0e276fd21edb20 13-Sep-2012 John Wang <johnwang@google.com> am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

* commit '29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b':
resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b 13-Sep-2012 John Wang <johnwang@google.com> resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

Change-Id: I2ee98d03fb1e6e3f5c2325d59d54621fa97eb6ff
smServiceStateTracker.java
b840987a39e7149c1364739696977089cd53814d 13-Sep-2012 Wink Saville <wink@google.com> Use Settings.Global instead of Settings.Secure in a few places.

There are more but the PDP_WATCHDOG_POLL_INTERVAL_MS is causing
excessive logging so changing it and others in the DCT as well as
in GsmSST.

The uses in PhoneFactory, SmsUsageMonitor, PhoneBase,
CdmaLteServiceStateTracker, CdmaSubscriptionSourceManager and
CdmaServiceStateTracker need to be looked at also, will fix
those next.

Change-Id: I8c29e7ce5ad6aecc824d3c0d71fa6cfca0eac777
smServiceStateTracker.java
565013a713156a0ddcc46dc3a0077e4c268ce272 08-Sep-2012 Wink Saville <wink@google.com> Merge commit '599f207f' into fix-merge-conflict

* commit '599f207f':
Telephony: Remove CdmaLteUicc objects

Change-Id: I5d63ea7edbcb1e7fe4010bcb3e5c9d6c961827d6
db1b0c54ffa990afeac24cc54d8b1992f1aa3a85 08-Sep-2012 Wink Saville <wink@google.com> am 1d40e34c: Merge "Telephony: Remove CdmaLteUicc objects"

* commit '1d40e34c74e2874114855db681aafba5676ae25c':
Telephony: Remove CdmaLteUicc objects
e287feac673ff68565b766e0e463d105fa9cef9d 10-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Remove CdmaLteUicc objects

-Pass IccCard object to GsmMmiCode
-Create IccCardProxy
-Make IccCard an interface and pass instance of IccCardProxy to
external applications (PhoneApp). IccCardProxy will use internal
UiccCard to map Icc requests to current active application on
UiccCard to maintain backwards compatibility for external
applications
-Add documentation to UiccController

The primary advantage of UiccController is that we can work with
multiple uicc applications at the same time. And that is a
requirement for modes like Cdma/Lte. The existing code supports
Cdma/Lte only partially and with guessing on modem side. However,
some things modem can guess, while others - it can't.

For instance, when a user tries to edit the fdn list the current
code will pass ef_id for fdn (0x6F3B). But the modem will have no
clue which fdn list the user wants to edit (csim or usim, both
have path 7FFF), and it's impossible for modem to guess correctly
all the time. All the modem can do is try to be consistent and
hope another device is doing same things. Imagine you bring your
card from another Cdma/Lte device to your new Cdma/Lte device:
if this modem uses different fdn file, it won't work as all
existing entries won't be there.

Another example is when the modem's guess is wrong for files like
csim/ef_li (7FFF 6F3A) versus usim/ef_adn (7FFF 6F3A). They have
same ef_ids so Android really should pass aid of the app it wants
to access. Without aids there is no way modem can know for sure
which file Android wants to read! However, in the current code
even Android doesn't know which aid it wants to read file from
since CdmaLteRecords has only 1 aid.

All of these problems cause more and more hacks, both in the modem
and in Android side. UiccController cleans up current code and
provides framework to work with multiple Uicc applications at the
same time.

Change-Id: I60216887b14140bdf833a8ed579ba16cad932bdc
SMPhone.java
smConnection.java
smDataConnectionTracker.java
smMmiCode.java
smServiceStateTracker.java
IMFileHandler.java
IMRecords.java
dec905e7465287f21b191889da07f331890f43c9 05-Sep-2012 Wink Saville <wink@google.com> am b66683d8: am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit 'b66683d899c3e58f84d8369ced23e3c4f6e5fd99':
Telephony: Fixed problem with short operator name
5af6cdd62a9c88371ef5defafa7fd49780cf8ef3 05-Sep-2012 Wink Saville <wink@google.com> am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit '7ac8d8026b997141d106762574478eb9daaf3f38':
Telephony: Fixed problem with short operator name
7ac8d8026b997141d106762574478eb9daaf3f38 05-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Fixed problem with short operator name"
b142fa0d4ec00ebb7df1b6657f56a57f0fbfd7fa 05-Sep-2012 Wink Saville <wink@google.com> am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit 'ad10642b1f79079148211dade13dce276f9dd93f':
Handle the case when TP-PI reserved bits are set
380be4a4fa0290f4b86309b22778839fab8c1b5e 05-Sep-2012 Wink Saville <wink@google.com> am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit '6fe2a8a4ab453dd72daf24798ef1bc460840b136':
Handle the case when TP-PI reserved bits are set
56c949ded0e352444806dd04bbca1895a2c75a9b 04-Sep-2012 Huanze Lan <huanze.lan@sonyericsson.com> Handle the case when TP-PI reserved bits are set

Discard settings according to 3GPP TS 23.040,
9.2.3.27 TP-Parameter-Indicator (TP-PI).

Usually operators will set this byte to 0 to indicate
there is no more data, but a few operators sets a
reserved bit to 1 to indicate there is no more data instead,
so we need to handle this case also.

Change-Id: I58abc2473c79b65795be186182927c603b35305e
msMessage.java
9386a53046f7cb9137b958c8d255306248c881cd 18-Jul-2012 Johan Redestig <johan.redestig@sonymobile.com> Telephony: Fixed problem with short operator name

This patch solves the problem with erroneous service
provider name that is visible in status row. The name
of the service provider is one character short. This
happen when loading the service provider name from
EF_SPN_CPHS or EF_SPN_SHORT_CPHS.

Change-Id: I54df69b9d46bc90028581d16df72f1fd4757c913
IMRecords.java
25a229f871862521d0b15d9d042b36bd382a4a64 28-Aug-2012 Wink Saville <wink@google.com> am 15e83e03: am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '15e83e031027a1b161c4ee4f046e3cc1bdf0f92b':
Pull up Stats polling and Data Stall Alarm handling to DCT
15e83e031027a1b161c4ee4f046e3cc1bdf0f92b 28-Aug-2012 Wink Saville <wink@google.com> am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '935f0c7abbf49e71478c79ca32eae972fcca574d':
Pull up Stats polling and Data Stall Alarm handling to DCT
935f0c7abbf49e71478c79ca32eae972fcca574d 28-Aug-2012 Wink Saville <wink@google.com> Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"
8739ce83da5d9e8887f7ec414614af3682c12c7a 28-Aug-2012 Wink Saville <wink@google.com> am 162971e5: am 820e9643: Merge "Plug a fd leak."

* commit '162971e54aa22f23b193ae5eb44ba12092fc0303':
Plug a fd leak.
162971e54aa22f23b193ae5eb44ba12092fc0303 28-Aug-2012 Wink Saville <wink@google.com> am 820e9643: Merge "Plug a fd leak."

* commit '820e964351b4d58c69ce40b64928911eb07efeeb':
Plug a fd leak.
820e964351b4d58c69ce40b64928911eb07efeeb 28-Aug-2012 Wink Saville <wink@google.com> Merge "Plug a fd leak."
cebb2cc576c652dd642d7f419532ec04e0f59d7d 31-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Pull up Stats polling and Data Stall Alarm handling to DCT

Code in GsmDataConnectionTracker and CdmaDataConnectionTracker is
very similar for maintaining data activity statistics and detecting
data stalls. So it can be moved up to the parent class.

Change-Id: I3ec63f6bbfe369e0006d3aa6d6b92abf451657f4
smDataConnectionTracker.java
dd8b840a59aafaac5325985fb35fb1db3f7dd9d8 25-Aug-2012 Wink Saville <wink@google.com> am 4b24797a: am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit '4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b':
Telephony: Send disconnect when disposing DCTs
4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b 25-Aug-2012 Wink Saville <wink@google.com> am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit 'fb4c7e43721fe51e2f749c70f36c0f6be18e8580':
Telephony: Send disconnect when disposing DCTs
fb4c7e43721fe51e2f749c70f36c0f6be18e8580 25-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Send disconnect when disposing DCTs"
eca324b92d4cd136f728c14dbb92a1d55674645e 24-Aug-2012 Wink Saville <wink@google.com> am ffcb548f: Empty DC\'s apnList when the DC is free.

* commit 'ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1':
Empty DC's apnList when the DC is free.
ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1 23-Aug-2012 Wink Saville <wink@google.com> Empty DC's apnList when the DC is free.

Not doing this causes DC.apnList's to have multiple entries in the
apnlist which causes DC's to look like its connected to both IMS and
INTERNET. And when selecting CDMA only mode on a Xoom we will not bring
up the connection thus no data connectivity.

A "cherry-pick" from frameworks/base/ b44b13a3f5967a7ce80f7124dc7b9c486f49c275

Bug: 6939338
Change-Id: I49881adb2710d7fe5d88c3aef748618bda7d65f1
smDataConnectionTracker.java
0ef38e23406aeed28e95dbc4e5022822508349e7 20-Aug-2012 Jake Hamby <jhamby@google.com> am 6df4d0f3: am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '6df4d0f3d49769e733045b3efcda9060aaae1bfe':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
2ab323871c8a16e039df1ff916da57df7bd34763 20-Aug-2012 Jake Hamby <jhamby@google.com> am 4eedbd9a: am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit '4eedbd9a3fa0bafb4be05522113a5f6498923b4e':
Telephony: Fix LTE CB Sms for dual-mode devices
6df4d0f3d49769e733045b3efcda9060aaae1bfe 20-Aug-2012 Jake Hamby <jhamby@google.com> am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '026b1a184c918c9e0ddd028073084e443e5ae0fc':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
4eedbd9a3fa0bafb4be05522113a5f6498923b4e 20-Aug-2012 Jake Hamby <jhamby@google.com> am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit 'f0414167059ea8ac7daae752e0ce7bd858df7f92':
Telephony: Fix LTE CB Sms for dual-mode devices
026b1a184c918c9e0ddd028073084e443e5ae0fc 20-Aug-2012 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"
f0414167059ea8ac7daae752e0ce7bd858df7f92 20-Aug-2012 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix LTE CB Sms for dual-mode devices"
0fd49b6b31960a768702d202a066b1088ec489a1 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Fix LTE CB Sms for dual-mode devices

Ignore 3gpp location information when it is not available.
This is required to support dual-mode devices such as CDMA/LTE devices
that require support for both 3GPP and 3GPP2 format messages.

Change-Id: Ie5d6372ef7e8da6893800e05a83ba840b7fd31f6
smSMSDispatcher.java
5ad6947b2d955a4e972d556090922d77aa6a2641 09-Aug-2011 Rekha Kumar <rekhak@codeaurora.org> Telephony: Fix MT SMS with invalid TOA field causing crash issue

Throw FormatException when type of number is incorrect and handle it

Change-Id: I305ea1c9e4fee29c84caefec7d7564d46228851d
smSmsAddress.java
msMessage.java
208f334f85a5e5182a98aefb56066443a2de5261 15-Aug-2012 Wink Saville <wink@google.com> Merge commit 'd9d3f48c' into fix-merge-conflict



* commit 'd9d3f48c':
Telephony: Unregister broadcast receiver

Change-Id: I57a974e92592efa8a662f083dd1bfc613c1a945a
81a055a7b9e3049413a503fa61c09f3f43648d78 15-Aug-2012 Wink Saville <wink@google.com> am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit 'aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76':
Telephony: Always create IccCard
d9d3f48c49050e54b5fbbcd660a1cda940559a70 15-Aug-2012 Wink Saville <wink@google.com> am 4a306f66: Merge "Telephony: Unregister broadcast receiver"

* commit '4a306f66962aabf843ce883a8f96450389db5f7a':
Telephony: Unregister broadcast receiver
aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76 15-Aug-2012 Wink Saville <wink@google.com> am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '91cccaaf575d6faf4e57bcb8a7e78538f28c75cd':
Telephony: Always create IccCard
4a306f66962aabf843ce883a8f96450389db5f7a 15-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Unregister broadcast receiver"
91cccaaf575d6faf4e57bcb8a7e78538f28c75cd 15-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Always create IccCard"
a5fc984c8b0696c187e14bfa75962b6e46c40d02 15-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Unregister broadcast receiver

Telephony code registers a BroadcastReceiver but does not
unregister it. This is causing Broadcast Register Receivers list
to grow large enough to cause situation with excessive JNI refs.

Change-Id: I8d2531849fd2b1282aaf5c20516b043b3bf0a2fa
smServiceStateTracker.java
f92aefb45aa708772779a1ea10622b38f965fab5 13-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Always create IccCard

There is some bug in master branch which is not in AOSP code
that prevents KeyGuard from showing up unless IccCard broadcasts
its status

Force creation of IccCard (even if it really is absent) so that
it broadcasts its state and KeyGuard gets displayed

Fix NullPointerException in case card was removed by checking
return value of phone.getIccCard()

bug: 6983013
Change-Id: I95de1cc8a70a9e3d66d3e5d6059e82626057c5d4
smConnection.java
e0e2ceb1ae025e6dd2adda75c32dba93c6dfeea4 13-Aug-2012 Wink Saville <wink@google.com> Merge commit '616b281b' into merge-conflict-TelephonySignal-Strength-cleanup

* commit '616b281b':
Telephony: Signal Strength cleanup

Change-Id: I3c211a06c480169d90fb5bc2c1774bd509d91f87
616b281b5a644d599bcc6b4bd75545b600eff45e 13-Aug-2012 Wink Saville <wink@google.com> am 15e350db: Merge "Telephony: Signal Strength cleanup"

* commit '15e350dbdedb12c36c4432375e8c58a633b1e492':
Telephony: Signal Strength cleanup
15e350dbdedb12c36c4432375e8c58a633b1e492 13-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Signal Strength cleanup"
59a96dd369b5c275b5e40105d71ed4c76d46f8b1 11-Aug-2012 Wink Saville <wink@google.com> am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into fix-merge-conflict

* commit '193becaf222c8b426f46afad87391ae3e70415c8':
Telephony: Fix npe due to mIccCard not being created
193becaf222c8b426f46afad87391ae3e70415c8 11-Aug-2012 Wink Saville <wink@google.com> Merge commit '33f24931ad25942ed8abb142df2edc2c1811350e' into fix-merge-conflict

* commit '33f24931ad25942ed8abb142df2edc2c1811350e':
Telephony: Fix npe due to mIccCard not being created
54007c8258ed3ea20c1a00c9385cf11129218efb 11-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe due to mIccCard not being created

Change-Id: I668bfb97ea7f047182fdcb92ebfec7cc4e73d2f5
smServiceStateTracker.java
049ab0421f32e6effc5d1277b69bd382cebadb18 09-Aug-2012 Wink Saville <wink@google.com> Merge commit 'e0e2ebb5' into fix-merge-conflict

* commit 'e0e2ebb5':
Telephony: Dynamically instantiate IccCard

Change-Id: I37d65c140033f110bc4990f68adf9489737c9c38
e0e2ebb5a50e580cbe6957dcafb3495a2d0a27f2 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
SMPhone.java
smDataConnectionTracker.java
smMmiCode.java
smServiceStateTracker.java
IMRecords.java
imPhoneBookInterfaceManager.java
bb36adde615d3d85fa0fc23935197c6bc6a799ed 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
SMPhone.java
smDataConnectionTracker.java
smMmiCode.java
smServiceStateTracker.java
IMRecords.java
imPhoneBookInterfaceManager.java
06e85d3327fcdd6b2a8e7b83c9f84f0ae348a12e 04-Aug-2012 Wink Saville <wink@google.com> am 8342d163: am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit '8342d1630c433559835563eded2dacdbf35d9db4':
Add DORMANT state to GSM data link activity
8342d1630c433559835563eded2dacdbf35d9db4 04-Aug-2012 Wink Saville <wink@google.com> am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit 'f8f82e088e109049cb888a75af0686afd118ea85':
Add DORMANT state to GSM data link activity
f8f82e088e109049cb888a75af0686afd118ea85 04-Aug-2012 Wink Saville <wink@google.com> Merge "Add DORMANT state to GSM data link activity"
b3a03455be44a2a0ffbeb757b193d860c1878599 19-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Add DORMANT state to GSM data link activity

GsmDataConnectionTracker sets its activity flag to DORMANT and notifies
LinkActivity when RIL indicates that all its data calls are in
dormant state (i.e. active is set to 1 in UNSOL_DATA_CALL_LIST_CHANGED
message for all data calls)

This indication is needed so that the Android public API getDataActivity()
can return DATA_ACTIVITY_DORMANT when Android applications invoke this
API while the phone is on a WCDMA data call.

Change-Id: I81b9db36375fea4f9fb946ddd5ddf0e1d16cbbab
SMPhone.java
smDataConnectionTracker.java
5b81adc82a53b3064f4baa3acfeabef31586588a 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Signal Strength cleanup

Make signal strength parsing common for all modes

Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
SMPhone.java
smServiceStateTracker.java
c62df086696fc7cb42c51e086ea2aab076cff24b 01-Aug-2012 Ajay Nambi <anambi@codeaurora.org> Telephony: Send disconnect when disposing DCTs

Send disconnect when disposing DCTs. This is invoked multiple times
during Inter-RAT (IRAT) handovers and sending disconnect to lower layers
keeps things in-sync and avoid race conditions as seen in field tests.

Change-Id: I7c0c32a0448934981f0ebbeb9ee2702b87f9b5d9
smDataConnectionTracker.java
64159c6230faabfee86bbb9597a04d202034882b 26-Jul-2012 Wink Saville <wink@google.com> am f71db0a5: am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit 'f71db0a58eeec26998288ed65b0516ca1043c66a':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
3c93767bab0040818e0f530c0d0102654a87e0c0 25-Jul-2012 Wink Saville <wink@google.com> Merge "Revise CellInfo API's"
08bf1a57eb310c99b9994ef23b944441ae33aa2b 25-Jul-2012 Wink Saville <wink@google.com> am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '801aa9f327730327132aafbae7e0c55bb6e7ea71':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
7c491bb3d140e2579c2c01edca94305701664db5 25-Jul-2012 Rekha Kumar <rekhak@codeaurora.org> Fix PhoneApp crash while decoding operatorNumeric to find mcc

Handle StringIndexOutOfBoundsException when mcc is found using
substring operation.

Bug: 6872958
Change-Id: I9e89a791e6efb3f9daacc33ac3aef05d9218af41
smServiceStateTracker.java
ef1d4bff9bbf7d967dbcace73f08910e14e367d0 17-Jul-2012 Wink Saville <wink@google.com> Revise CellInfo API's

Change-Id: I35bc22caf4a6a2255f2ce122690823f8d602b359
SMPhone.java
smServiceStateTracker.java
a63bf4237dfc3c9b81f7d5eff57c5500b8b8215d 18-Jul-2012 Johan Redestig <johan.redestig@sonymobile.com> Plug a fd leak.

Change-Id: Ia7189e67e8a03eceaa81e13cac98f20a82a44276
oiceMailConstants.java
62b20cd5b7ce5d7809ff1fe2b5796b2e605165e5 18-Jul-2012 Robert Greenwalt <rgreenwalt@google.com> Fix our interpretation of apn setting's bearer.

Between ICS and JB we changed it to use TelephonyManager's network type
enumeration. This changes it back to represent the RIL's radio
technology. The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I25f3e30b08ebcdf99bb70a41e01e3fbf38bf2de7
smDataConnectionTracker.java
c38bb60d867c5d61d90b7179a9ed2b2d1848124f 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common - DO NOT MERGE

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
allFailCause.java
SMPhone.java
smCall.java
smCallTracker.java
smConnection.java
smDataConnection.java
smDataConnectionTracker.java
smMmiCode.java
smSMSDispatcher.java
smServiceStateTracker.java
smSmsAddress.java
smSmsCbMessage.java
IMFileHandler.java
IMRecords.java
imPhoneBookInterfaceManager.java
imSmsInterfaceManager.java
imTlv.java
msBroadcastConfigInfo.java
msCbConstants.java
msCbHeader.java
msMessage.java
pnOverride.java
uppServiceNotification.java
simDataDownloadHandler.java
simPhoneBookManager.java
simServiceTable.java
oiceMailConstants.java
ackage.html
0825495a331bb44df395a0cdb79fab85e68db5d5 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
allFailCause.java
SMPhone.java
smCall.java
smCallTracker.java
smConnection.java
smDataConnection.java
smDataConnectionTracker.java
smMmiCode.java
smSMSDispatcher.java
smServiceStateTracker.java
smSmsAddress.java
smSmsCbMessage.java
IMFileHandler.java
IMRecords.java
imPhoneBookInterfaceManager.java
imSmsInterfaceManager.java
imTlv.java
msBroadcastConfigInfo.java
msCbConstants.java
msCbHeader.java
msMessage.java
pnOverride.java
uppServiceNotification.java
simDataDownloadHandler.java
simPhoneBookManager.java
simServiceTable.java
oiceMailConstants.java
ackage.html