1313 Commits

Author SHA1 Message Date
Brad Fitzpatrick
b8c5fe004d 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.
2011-03-15 12:05:37 -07:00
Brad Fitzpatrick
36ca1d3a69 am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."
* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
  Removing self-assignment statement.
2011-03-15 12:05:33 -07:00
Brad Fitzpatrick
d927e27428 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.
2011-03-15 11:43:08 -07:00
Brad Fitzpatrick
6f80f395b7 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.
2011-03-15 11:43:03 -07:00
Brad Fitzpatrick
a74887e87c 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.
2011-03-15 11:37:32 -07:00
Brad Fitzpatrick
9ac9b28576 am b98c8fca: Merge "Removing self-assignment statement."
* commit 'b98c8fca954718cb61d6513e623a78f1b0bd0edb':
  Removing self-assignment statement.
2011-03-15 11:37:29 -07:00
Brad Fitzpatrick
b7d573e901 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.
2011-03-15 11:33:32 -07:00
Brad Fitzpatrick
c86ea5e260 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.
2011-03-15 11:33:28 -07:00
Brad Fitzpatrick
56c4c442c0 Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
b98c8fca95 Merge "Removing self-assignment statement." 2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
7972e38280 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
38c6e31c88 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:12:15 -07:00
Robert Greenwalt
eea577e0c4 Remove redundant network types.
ServiceStateTracker can use the ServiceState values.
bug:4083436

Change-Id: I5b5b72392d9d48adc55731c44417d622930c4bec
2011-03-15 10:44:01 -07:00
Ramesh Sudini
e62dee25e5 Do not merge: Telephony: Rename lte_on_cdma property.
Fix Issue: 3479211. Dont use Mot property in Android Framework.

Change-Id: I1c13af5d00bf8c246ee6ecbedd1d1977a75c7142
2011-03-14 13:44:30 -07:00
Ramesh Sudini
f57276154a Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
2011-03-14 13:44:30 -07:00
Wink Saville
f90c260904 Do not merge: Add outputting "on" or "off" setRadioPower.
Change-Id: I0865f17e63f4b9867a8d33e7e147613010683a27
2011-03-14 13:44:30 -07:00
Wink Saville
124e28728b Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.
Change-Id: I131c8323737b0b5122a5087c77d8c6102d74b138
2011-03-14 13:44:30 -07:00
Wink Saville
321b730a9d Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.
DataConnection now wraps its retry manager instead of exporting it.

Change-Id: Ibda6a235430b8ec51d1518c2956de71f964e3f39
2011-03-14 13:44:30 -07:00
Wink Saville
9d7d5b4435 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
2011-03-14 12:39:02 -07:00
Ramesh Sudini
df6542d5ca Do not merge: RIL: Merge Issue. LTE SIM additions.
Change-Id: Ide70b523d376e1c3f2979051c083365346bf41f6
2011-03-14 12:39:02 -07:00
Ramesh Sudini
074f83515f Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.
Bug: 3479209
Change-Id: I08b30c4868a12342221b6428eca8ffbb08f2b22a
2011-03-14 12:39:01 -07:00
Ramesh Sudini
75acebd02d Do not merge: LTE: Fix SST for CDMALTEPhone.
Change-Id: I4dc3d3bb4dba968694a5856624448b7ba1e35601
2011-03-14 12:38:56 -07:00
Robert Greenwalt
88d852969a 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
2011-03-14 12:25:12 -07:00
Wink Saville
9d7d62801d 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
2011-03-14 12:25:04 -07: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
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
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
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
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
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
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
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
Jozef BABJAK
17eb45fff8 Lazy initialization must be synchronized to avoid parallel instances cretation.
Change-Id: I9c6887c714f42534a465c266689dc03ee7298900
2011-03-03 10:22:12 +01: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