2188 Commits

Author SHA1 Message Date
Robert Greenwalt
09cd10c7e2 am dd466152: Merge "Initialize Hipri correctly." into ics-mr0
* commit 'dd466152dd1b88f7b5bd73c47715eb84b76e6dab':
  Initialize Hipri correctly.
2011-10-18 14:31:47 -07:00
Robert Greenwalt
dd466152dd Merge "Initialize Hipri correctly." into ics-mr0 2011-10-18 14:29:50 -07:00
Wink Saville
7a0390b97c am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0
* commit '07848843b23e10e4728fa779cc79fc38a341cf6b':
  Add DataConnection#isEmergency and use in trySetupData.
2011-10-18 13:38:09 -07:00
Wink Saville
07848843b2 Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0 2011-10-18 13:35:43 -07:00
Jake Hamby
977e8ec810 am f522e095: Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0
* commit 'f522e095e69406a5c6039b406237e9b30781a355':
  Add wrapper method to GsmAlphabet for API compatibility.
2011-10-18 12:24:25 -07:00
Jake Hamby
f522e095e6 Merge "Add wrapper method to GsmAlphabet for API compatibility." into ics-mr0 2011-10-18 12:22:39 -07:00
Robert Greenwalt
a4bc82aca5 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
2011-10-18 11:49:24 -07:00
Robert Greenwalt
9b61778d63 am dba69061: Merge "Send availability info more reliably" into ics-mr0
* commit 'dba69061a6e9c25d968819cee47ab13e5b554b9a':
  Send availability info more reliably
2011-10-18 09:44:22 -07:00
Robert Greenwalt
12e24ae760 Send availability info more reliably
We don't have a monolithic availability state, so the mAvailable variable
must go.

bug:5453318
Change-Id: I82af90907cc7a0173b74d661912f9c28ddc7dcb0
2011-10-18 06:39:59 -07:00
Jake Hamby
d8e147ce79 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
2011-10-18 00:50:40 -07:00
Wink Saville
e025391bf4 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
2011-10-17 12:50:32 -07:00
Jeff Brown
6aa1e80e4f Merge "Use MatrixCursor instead of ArrayListCursor." 2011-10-14 21:06:31 -07:00
Jeff Brown
c755ae3b58 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
2011-10-13 14:24:28 -07:00
Wink Saville
2e6c332962 Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0 2011-10-12 18:13:20 -07:00
John Wang
f838b7c2b8 Merge "Support selectNetworkManually in LTEPhone." into ics-mr0 2011-10-12 15:34:56 -07:00
Wink Saville
63bbd8d32e Set roaming indicator to off if Perferred Roaming List is not loaded.
Bug: 5326176
Change-Id: I5cfef7df5b7ee0bad97425dcbe4c98b6127c2065
2011-10-12 10:51:41 -07:00
Jake Hamby
929ca5e497 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
2011-10-11 19:15:32 -07:00
John Wang
58466cc146 Support selectNetworkManually in LTEPhone.
Support selectNetworkManually() in CDMALTEPhone, similar to what
GSMPhone did.

bug:5420630
Change-Id: I5214a08822aebd4cc46c7a8167982803736e776a
2011-10-11 17:13:00 -07:00
sj0110.kim@samsung.com(sophia kim)
df0c2a94b5 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
2011-10-11 15:29:20 -07:00
Jake Hamby
32319dd852 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
2011-10-10 16:56:58 -07:00
Jake Hamby
bece9cb794 Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone." 2011-10-06 14:05:58 -07:00
Wink Saville
b166bc81ac 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
2011-10-06 10:23:32 -07:00
Jake Hamby
b7945cae5a 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
2011-10-04 17:16:06 -07:00
Flavio Lerda
2613e0064b 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
2011-09-27 13:53:23 +01:00
Wink Saville
972244251a am 2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
* commit '2783e1ce7a9b2c82983223754228c06be6713a0f':
  Remove unused persist.radio.imsregrequired.
2011-09-26 10:27:16 -07:00
Wink Saville
9e2cc044fd Remove unused persist.radio.imsregrequired.
Change-Id: I49a2360260917f3e1034c1106ff139375fa1c9ed
2011-09-26 09:36:28 -07:00
David Brown
e45beeb749 Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers." 2011-09-23 11:25:57 -07:00
Shaopeng Jia
c6027ee464 Temp fix to the problem of incorrectly classifying Brazilian local
numbers as emergency numbers.

Bug: 5247602
Change-Id: Ib1626ef25ced2e149c526601bfac72de39e3f1b9
2011-09-22 23:22:56 +02:00
Robert Greenwalt
5840639fd1 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
2011-09-22 11:49:01 -07:00
Wink Saville
94097b44b8 am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.
2011-09-22 10:53:40 -07:00
Robert Greenwalt
0e09082559 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
2011-09-21 16:37:34 -07:00
Wink Saville
a71483c7be am c6939697: Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom
* commit 'c69396973b8a496e298a7076842b0e34d193651e':
  Remove isAnyActiveDataConnection and promote isDisconnected.
2011-09-19 15:09:42 -07:00
Wink Saville
c69396973b Merge "Remove isAnyActiveDataConnection and promote isDisconnected." into ics-factoryrom 2011-09-19 15:07:42 -07:00
Wink Saville
3df8b23fd0 am f946c282: Merge "Add PROPERTY_IMS_REG_REQUIRED." into ics-factoryrom
* commit 'f946c282c2fbe851d6157ed34bbacabdff8f76ba':
  Add PROPERTY_IMS_REG_REQUIRED.
2011-09-19 15:02:05 -07:00
Wink Saville
d986c60907 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
2011-09-19 14:35:30 -07:00
Wink Saville
d34ed1660a Add PROPERTY_IMS_REG_REQUIRED.
Bug: 5337311
Change-Id: Ic5f310f485b49b29385bc1427a1f156484896569
2011-09-19 14:27:09 -07:00
David Brown
bb132eba71 Merge "Update code to use location aware isEmergencyNumber." 2011-09-19 12:26:14 -07:00
Wink Saville
ea0d54b44e Have all connections disconnected before turning off radio.
Bug: 5306201
Change-Id: I8a121e5ed951f286b6f3edc70c468e86ccedfbf0
2011-09-16 17:53:50 -07:00
Shaopeng Jia
6b7c3f8a1c Update code to use location aware isEmergencyNumber.
Bug: 5247602
Change-Id: Ieeda4a17464795b3591db754bc991759609f88c2
2011-09-16 20:28:39 +02:00
duckyoung.chai
80c32a37b6 [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>
2011-09-15 11:10:12 -07:00
Robert Greenwalt
11fed2b218 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." 2011-09-14 13:41:10 -07:00
sinikang
723facc20b 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
2011-09-14 08:27:43 -07:00
Kazuhiro Ondo
0042330e3b am 30928eb6: am b1a3f0ca: Fix no data issue after system server crash
* commit '30928eb60395ac7c02ac45fd00a0d781ce364856':
  Fix no data issue after system server crash
2011-09-13 14:25:23 -07:00
Attila Bodis
e112f1c91c Merge "Adding isEmergencyNumber which also takes in a defaultCountryIso." 2011-09-13 14:20:32 -07:00
Jake Hamby
5d39ec4a37 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
2011-09-13 11:58:08 -07:00
Shaopeng Jia
9683f990a2 Adding isEmergencyNumber which also takes in a defaultCountryIso.
Also update CallerInfo and CallerInfoAsyncQuery to use the new method.

Bug: 5247602
Change-Id: I2bbb0806ad2787d53b19bc1e9bdfb0ee8be26980
2011-09-13 16:10:08 +02:00
Kazuhiro Ondo
30928eb603 am b1a3f0ca: Fix no data issue after system server crash
* commit 'b1a3f0ca4b23b882fc1a5e83eaa412c0ed76696f':
  Fix no data issue after system server crash
2011-09-09 15:00:51 -07:00
Kazuhiro Ondo
b1a3f0ca4b 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
2011-09-09 14:39:53 -07:00
Kazuhiro Ondo
52d51c42b6 am eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants
* commit 'eb7763efa52bad67ff828ad895ff172190e86035':
  DO NOT MERGE: Fix leak in SIM ready registrants
2011-09-09 13:55:13 -07:00
Kazuhiro Ondo
eb7763efa5 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
2011-09-09 13:02:09 -07:00