1344 Commits

Author SHA1 Message Date
Robert Greenwalt
66a09d0a17 am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
  Don't accept a user-defined dun-capable connection
2011-03-11 15:17:44 -08:00
Robert Greenwalt
fe99eb7548 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp
Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0
2011-03-11 14:05:14 -08:00
Robert Greenwalt
55b53d3510 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
2011-03-10 11:59:17 -08:00
Ramesh Sudini
4ae87a8b04 Telephony: Rename lte_on_cdma property.
Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I51bab8cf1346ef8d23e425cbb32ae7b4a3d7ce09
2011-03-10 09:09:08 -08:00
Robert Greenwalt
4c89b14db4 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
2011-03-09 16:33:33 -08:00
Ramesh Sudini
a2c2daf02a Telephony: Corrections to LTE and eHRPD constant values.
LTE and EHRPD values are not consistent with ril.h

Change-Id: I93c4912b22c06afe09bdbd58548385d4db5ca11b
2011-03-08 21:35:23 -08:00
Wink Saville
789f8323e8 Add outputting "on" or "off" setRadioPower.
Change-Id: I26087427c2d0feaf09b01e7eefba31962b2361f0
2011-03-08 12:27:09 -08:00
Simon Wilson
73cf2ade30 am 92fb1668: am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
* commit '92fb16685fd8d28b231a02bfa3ef76d3924210ad':
  mms: mms wap push length check before pdu processing.
2011-03-08 08:03:55 -08:00
Simon Wilson
92fb16685f 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.
2011-03-08 07:58:20 -08:00
Wink Saville
a43ae3927b Have createAllDataConnectionList create the RetryManager inside the loop.
Change-Id: Ifd7728f222ba2cac8710f7636c471e441fe2c445
2011-03-07 16:37:10 -08:00
Simon Wilson
10993b2d1e 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.
2011-03-07 15:42:59 -08:00
Soojung Shin
7ac1cb787c mms: mms wap push length check before pdu processing.
Change-Id: Id5b5572bcd2953e496f03142d13bd2d012225e30
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-07 15:37:01 -08:00
Wink Saville
2802dda817 Merge "Remove mRetryMgr and directly use DataConnection retry mgr." 2011-03-07 13:51:11 -08:00
Soojung Shin
3fff651497 am 3fe49d81: am fa680a18: am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
* commit '3fe49d8168ab7344d495ea5ee8ed6b9ef3145495':
  Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-07 11:16:07 -08:00
Soojung Shin
3fe49d8168 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.
2011-03-07 11:10:28 -08:00
Wink Saville
89586a7d0a Remove mRetryMgr and directly use DataConnection retry mgr.
DataConnection now wraps its retry manager instead of exporting it.

Change-Id: I2ec0d2cf2519574fed7915b34451c1061f59cee4
2011-03-07 11:07:09 -08:00
Wink Saville
7c22858b9a 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: I6b2da62714ed598d954f0c68f738ded0f385ade2
2011-03-04 22:54:41 -08:00
Soojung Shin
fa680a18f6 am ff5a0990: Added to check for supporting mms content-disposition, utf8 decoding.
* commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c':
  Added to check for supporting mms content-disposition, utf8 decoding.
2011-03-04 17:16:49 -08:00
Soojung Shin
ff5a09904f Added to check for supporting mms content-disposition, utf8 decoding.
Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-03-04 14:32:31 -08:00
Ramesh Sudini
d87902c52d RIL: Merge Issue. LTE SIM additions.
Change-Id: I2bd07277b7ddaa81d6eae1826bd56b4b5c36b843
2011-03-04 12:20:17 -08:00
Ramesh Sudini
6051e04637 LTE: Fix SST for CDMALTEPhone.
Change-Id: I8061d28355ba9b6c836f899ffd44de0e35f0de37
2011-03-04 12:03:03 -08:00
Lorenzo Colitti
362da50989 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.
2011-03-03 17:07:56 -08:00
Lorenzo Colitti
ba76f2ac2a am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
* commit '6987036fabbd2c0351986efcfd11e714ae75fdf8':
  Make setupDataCall take a protocol parameter.
2011-03-03 17:07:50 -08:00
Ramesh Sudini
8c6dc01701 ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Bug: 3479209
Change-Id: I30e9d2683f3484d70bd3be21f8369788f34ec106
2011-03-03 14:32:58 -08:00
Wink Saville
eca208fae6 DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82.

Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
2011-03-03 09:53:52 -08:00
Robert Greenwalt
6812b2d84f Merge "Clean up LTE code change" 2011-03-03 08:33:54 -08:00
Robert Greenwalt
8c6452dd3c Clean up LTE code change
Promoting RestrictedState so fewer callsites need be technology specific.
Promoting ServiceState change registration code.
bug:3487388

Change-Id: I8764c3e86a376bbf16935668424b7edb699b21d5
2011-03-02 17:03:13 -08:00
Robert Greenwalt
7e48e76cab Merge "Start using NetworkUtils.numericToInetAddress." 2011-03-02 12:10:51 -08:00
Robert Greenwalt
e590373ea7 Start using NetworkUtils.numericToInetAddress.
Generates InetAddresses without risking an accidental dns lookup.  For use with supposedly
numeric-only ip address strings.

Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
2011-03-02 11:37:32 -08:00
Lorenzo Colitti
3c4e929cfd 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
2011-02-28 11:17:05 -08:00
Lorenzo Colitti
93faa3239e 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
2011-02-28 11:16:57 -08:00
Xavier Ducrohet
7719436342 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.
2011-02-28 10:15:48 -08:00
Xavier Ducrohet
b732b7b5e8 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.
2011-02-28 10:10:38 -08:00
Xavier Ducrohet
ce57a7f353 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.
2011-02-28 09:51:38 -08:00
Xavier Ducrohet
6504490cde 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.
2011-02-28 09:16:38 -08:00
Samyeoul Choi
4b7c6fa2c0 am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '350799b72c3180e04ec91469509f6079c932b971':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:55:35 -08:00
Samyeoul Choi
350799b72c am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '6c5d9a0622ed33be8549f8d4dcdf597b0dc499cf':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:51:51 -08:00
Samyeoul Choi
6c5d9a0622 am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint
* commit '092238916fd5d10090c0bcad33644778a1f366e7':
  Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint
2011-02-25 12:08:08 -08:00
Samyeoul Choi
092238916f 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
2011-02-25 11:28:43 -08:00
Wink Saville
2b8bcfe5b7 LTE Changes for Telephony including Multiple PDN support and IPV6 support
Added init for CDMAPhone.java

Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
2011-02-24 18:23:36 -08:00
Wink Saville
df3c4b45c8 am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only.
* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
  Do not start RILReceiver if wifi-only.
2011-02-24 10:52:53 -08:00
Wink Saville
ee38808dcc am 0dc8618d: Do not start RILReceiver if wifi-only.
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
2011-02-24 10:50:31 -08:00
Wink Saville
0dc8618dc7 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
2011-02-23 18:11:45 -08:00
Wink Saville
bf87c11590 Merge "WAPPushManager, WAP Push over SMS message handler" 2011-02-23 17:40:43 -08:00
Wink Saville
4360d7c678 Add queryFacilityLockForApp and setFacilityLockForApp for v6 ril.h.
Change-Id: Ib802e77fb03567c619e911e5f975be3077947e05
2011-02-22 16:37:24 -08:00
Wink Saville
5284090631 Changes for ril.h version 6.
Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
2011-02-18 12:40:47 -08:00
noda
7640caaf91 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
2011-02-18 00:31:24 +09:00
John Wang
fc2bb2fbc7 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.
2011-02-15 12:43:00 -08:00
John Wang
d0789ec995 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.
2011-02-15 12:40:49 -08:00
John Wang
3901402600 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.
2011-02-15 12:38:38 -08:00