1039 Commits

Author SHA1 Message Date
Marco Nelissen
d8f9a83cab resolved conflicts for merge of d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
2011-06-15 08:58:38 -07:00
Soojung Shin
d027329cd6 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>
2011-06-10 13:48:36 -07:00
Jake Hamby
ae62b7b0bc resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
2011-06-07 16:24:15 -07:00
Jake Hamby
66040bbb08 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
2011-06-06 18:56:20 -07:00
Jake Hamby
0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
2011-06-06 15:33:37 -07:00
Jake Hamby
ab79ee4adc 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
2011-06-01 15:54:20 -07:00
Jean-Baptiste Queru
54ab72e1c3 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.
2011-05-25 09:04:40 -07:00
Jean-Baptiste Queru
038e8f9984 Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 2011-05-25 08:06:17 -07:00
Conley Owens
10b364b4be am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
* commit '4cf0eee755046734568959ac01f207b108e449c0':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-24 15:01:18 -07:00
Conley Owens
4cf0eee755 Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 2011-05-24 14:05:05 -07:00
Soojung Shin
a38fad37c2 am 4e4ad341: SmsMessage: convert + to international dialing prefix
* commit '4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7':
  SmsMessage: convert + to international dialing prefix
2011-05-23 15:11:04 -07:00
Soojung Shin
4e4ad34159 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>
2011-05-23 15:02:32 -07:00
David Sobreira Marques
d778462836 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>
2011-05-20 20:14:56 -03:00
Jake Hamby
18cc814c94 am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread
* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
  Enable support for SMS national language shift tables.
2011-05-05 13:31:03 -07:00
Conley Owens
9355a24af2 Merge "Fixing wrong Japanese phone formatter." 2011-04-29 10:00:06 -07:00
Conley Owens
11d7ec24a5 Merge "Removing unnecessary computation." 2011-04-28 14:57:11 -07:00
Conley Owens
bf4769c7da am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
* commit '17ba30b549a847f3aab854173a9484851f694453':
  Load mnc/mcc configuration value from SIM (KDDI-CDMA)
2011-04-26 15:46:32 -07:00
Masanori Ogino
2037b5a8b2 Load mnc/mcc configuration value from SIM (KDDI-CDMA)
Now support to load mnc/mcc value from IMSI on KDDI-CDMA.

Change-Id: I6f1d137ecf2e3130ca8f1a782dccec13b51f9933
2011-04-12 20:42:49 +09:00
Jake Hamby
b49a73dfc4 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
2011-04-06 14:20:04 -07:00
Brad Fitzpatrick
6f67e7bf83 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.
2011-03-23 12:44:23 -07:00
Magnus Strandberg
b5c72ead01 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
2011-03-22 08:03:58 +01:00
Jozef BABJAK
5a16346395 Removing unnecessary computation.
Change-Id: Id201e56fa60baa64204cd204169d119f7b4db3d7
2011-03-17 09:09:10 +01: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
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
Keiji Ariyama
77359e7af3 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
2011-03-11 03:27:29 +09: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
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
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
Jozef BABJAK
17eb45fff8 Lazy initialization must be synchronized to avoid parallel instances cretation.
Change-Id: I9c6887c714f42534a465c266689dc03ee7298900
2011-03-03 10:22:12 +01: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
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
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
bf87c11590 Merge "WAPPushManager, WAP Push over SMS message handler" 2011-02-23 17:40:43 -08:00
Jozef BABJAK
c007925423 Removing self-assignment statement.
Change-Id: I429235093de4539bde3950075fbdaa4ef5bdeedd
2011-02-22 08:09:01 +01:00
Jozef BABJAK
c28480a1b4 Removing repetitive conditional; it simply does nothing except slowing down things.
Change-Id: I53a176cebae0051a33647317e2f269ebf149f7d2
2011-02-22 07:57:51 +01:00
Jozef BABJAK
4a64ab84d2 Removing repetitive conditional; it simply does nothing except slowing down things.
Change-Id: Ibe76c1ed49bdf66eb57702e5f89363a5132d9617
2011-02-22 07:55:23 +01:00