569 Commits

Author SHA1 Message Date
Wink Saville
39cabc69d0 am 2111be3f: am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2
Merge commit '2111be3f9c1059222c08814e81de6ab55be222c0'

* commit '2111be3f9c1059222c08814e81de6ab55be222c0':
  Increase the default wake lock timeout.
2009-11-20 15:30:51 -08:00
Wink Saville
0e57e73575 Increase the default wake lock timeout.
Previously the wake lock time was 5 seconds but there
are operations which take longer such as setting up
and tearing down so increase the default to 30 seconds.
Also provide TelephonyProperty.PROPERTY_WAKE_LOCK_TIMEOUT
so it can be overridden at build time.

Bug: 2268276
Change-Id: I3ae1fb196564c9fd5b9ea3e3b0927be9dd9ef255
2009-11-19 16:26:29 -08:00
Dan Egnor
20fbb79825 resolved conflicts for merge of a351b7f0 to master 2009-11-18 13:43:10 -08:00
Dan Egnor
ded0e6447e Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps.  Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
2009-11-18 12:05:04 -08:00
Jaikumar Ganesh
ec76a23c98 am d96c94aa: am ae29ac17: am 572e0087: Merge change Idfc116fe into eclair
Merge commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03'

* commit 'd96c94aa93b3331213d0ec781d0593bccfb61c03':
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-13 10:51:23 -08:00
Wink Saville
b74ebcabe0 am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2
Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040'

* commit '126fee88d480939d46b8ddd1e3a03cdd193fa040':
  Add code to use Gservices provided values for throtting NITZ updates.
2009-11-12 23:13:17 -08:00
Jaikumar Ganesh
ae29ac179e am 572e0087: Merge change Idfc116fe into eclair
Merge commit '572e0087a86c6781e3334f8a6f901039a407138d' into eclair-mr2

* commit '572e0087a86c6781e3334f8a6f901039a407138d':
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-12 23:06:29 -08:00
Wink Saville
db9f06d9c4 resolved conflicts for merge of 2a1e9641 to eclair-mr2
Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
2009-11-12 22:44:11 -08:00
Android (Google) Code Review
572e0087a8 Merge change Idfc116fe into eclair
* changes:
  Return null if SIM doesn't have the MSISDN Aplha tag.
2009-11-12 16:10:10 -08:00
Jaikumar Ganesh
de1fcd49e7 Return null if SIM doesn't have the MSISDN Aplha tag.
This makes both the GSM and CDMA version compatible.

Bug: 2247067
Dr No: jsh
2009-11-12 13:29:33 -08:00
Wink Saville
7a59f80b4f am dfaec0d9: am f7394fca: am 38210df3: Merge change I326c1f7e into eclair
Merge commit 'dfaec0d987f8f8e8822f554020795bea090e96c1'

* commit 'dfaec0d987f8f8e8822f554020795bea090e96c1':
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 17:38:00 -08:00
Gilles Duboscq
42e7577082 am 929429e0: am a883bb05: am 9d9dda53: Merge change Ia629e0f8 into eclair
Merge commit '929429e01895f1a2f7f1f51184bd07d68974d6f8'

* commit '929429e01895f1a2f7f1f51184bd07d68974d6f8':
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
2009-11-11 17:37:40 -08:00
Wink Saville
f7394fcaed am 38210df3: Merge change I326c1f7e into eclair
Merge commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0' into eclair-mr2

* commit '38210df337a1485bd3d2eb5adc223f443fe1b5b0':
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 17:12:58 -08:00
Gilles Duboscq
a883bb057a am 9d9dda53: Merge change Ia629e0f8 into eclair
Merge commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697' into eclair-mr2

* commit '9d9dda53f894eb776c9cec38bd8c98652a1c0697':
  Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
2009-11-11 17:12:42 -08:00
Wink Saville
ce9b59f0ba Add code to use Gservices provided values for throtting NITZ updates.
bug: 2251845
Change-Id: Ie122606fb852868bb76a9930bb5e6ba906273619
2009-11-11 16:33:50 -08:00
Android (Google) Code Review
38210df337 Merge change I326c1f7e into eclair
* changes:
  Throttle nitz updates as the are too numerous on cdma.
2009-11-11 12:46:22 -08:00
Wink Saville
aeff5fd8eb Throttle nitz updates as the are too numerous on cdma.
bug: 2251845
Change-Id: I326c1f7e28d19b678ea748e36f8286dd1378cecf
2009-11-11 11:55:38 -08:00
Gilles Duboscq
1fa7fae139 Make multipart message follow 3GPP TS 23.040 V9.0.0 (2009-06), section 9.2.3.24.1 :
all the parts should have the same encoding.

Fixes b/2040561
2009-11-11 10:56:27 -08:00
Robert Greenwalt
665187ee72 am 69da1fe8: am feafc202: am fe225e25: Merge change I70e1f7a6 into eclair
Merge commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d'

* commit '69da1fe8b868437c5b3e6e4fcf07e7dc7793201d':
  Fix the selection of locale from SIM mcc.
2009-11-09 16:30:45 -08:00
Robert Greenwalt
feafc202bb am fe225e25: Merge change I70e1f7a6 into eclair
Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-mr2

* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
  Fix the selection of locale from SIM mcc.
2009-11-09 16:17:30 -08:00
Android (Google) Code Review
fe225e25bd Merge change I70e1f7a6 into eclair
* changes:
  Fix the selection of locale from SIM mcc.
2009-11-09 12:37:22 -08:00
jsh
8031e02bcb am 414628c5: am 9e63ce81: am 092f0341: Merge change I44d4cbec into eclair
Merge commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8'

* commit '414628c55ab0e51c0cc4d7ff34368d76a2e981e8':
  Fix some SMS encode issues.
2009-11-06 00:40:22 -08:00
jsh
9e63ce81c5 am 092f0341: Merge change I44d4cbec into eclair
Merge commit '092f03418a4988e4da706dca27128327b5a5fc55' into eclair-mr2

* commit '092f03418a4988e4da706dca27128327b5a5fc55':
  Fix some SMS encode issues.
2009-11-06 00:23:13 -08:00
Android (Google) Code Review
092f03418a Merge change I44d4cbec into eclair
* changes:
  Fix some SMS encode issues.
2009-11-06 03:07:01 -05:00
jsh
3e5c3a6db4 Fix some SMS encode issues.
1. Spanish SMS 71-160 chars not sent. This was because calculateLength
allowed for single-segment EMS encoding, while encodeUserDataPayload
did not.  For now, change calculateLength to match encodeUserDataPayload
(ie, fallback to UTF16 in this case).  (b/2224849)
2. Unicode value of N w/tilde was incorrect. (b/2224849)
3. Add '\' and '/' to the list of valid separators in CDMA SMS numeric
addresses. (b/2236527)
2009-11-05 23:39:21 -08:00
Wink Saville
7cfee29baf am 47601c74: am e14861ea: am 09263e1b: Merge change Id0267cc0 into eclair
Merge commit '47601c74f1302f70716c81714373687358ce8d8b'

* commit '47601c74f1302f70716c81714373687358ce8d8b':
  Add needsOtaServiceProvisioning and used to not allow
2009-11-05 20:18:31 -08:00
Wink Saville
e14861eaa7 am 09263e1b: Merge change Id0267cc0 into eclair
Merge commit '09263e1bc0f8f783b24b92643d4ccda87966d01f' into eclair-mr2

* commit '09263e1bc0f8f783b24b92643d4ccda87966d01f':
  Add needsOtaServiceProvisioning and used to not allow
2009-11-05 19:10:43 -08:00
Robert Greenwalt
70e1f7a6b7 Fix the selection of locale from SIM mcc.
Two issues - getting config then setting locale by mcc and then setting the config (to set
mcc/mnc) would overwrite the locale set in the middle.  Also, using a "new Configuration()"
instead of asking the ActivityManager.getConfiguration gets different values than the current
ones, and would also overwrite our change.

bug: 2241461
bug: 2239810
2009-11-05 18:19:37 -08:00
Wink Saville
684b802dd9 Add needsOtaServiceProvisioning and used to not allow
data calls until the device is provisioned.

Bug: 2221241
Change-Id: Id0267cc02fdf31e14e66e5acd2ca5cbdc504f507
2009-11-03 17:57:11 -08:00
Daisuke Miyakawa
3e1cf402b9 am 33728557: am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'

* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
  Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
2009-10-29 02:01:22 -07:00
Wink Saville
7badc0cabf am e6028e52: am 02d89898: am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit 'e6028e52c9b66957311d25b6e72a2f683c507a5e'

* commit 'e6028e52c9b66957311d25b6e72a2f683c507a5e':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 23:55:35 -07:00
Jaikumar Ganesh
e8f3542c31 am e1cba3db: am 9fa7048c: am 6158038a: Merge change I2811f162 into eclair
Merge commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4'

* commit 'e1cba3dbad30286c5c3006e0b9c1226ef72ad8e4':
  Add Authentication Type field to the APN settings.
2009-10-28 23:47:13 -07:00
Daisuke Miyakawa
d95a02c2a6 Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
2009-10-29 11:01:07 +09:00
Wink Saville
02d89898c9 am a2058e43: Merge change I11c3cdc7 into eclair
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2

* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
  Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
2009-10-28 11:42:07 -07:00
Jaikumar Ganesh
9fa7048ca3 am 6158038a: Merge change I2811f162 into eclair
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2

* commit '6158038a09069bc178970160d4b3667573bfc655':
  Add Authentication Type field to the APN settings.
2009-10-28 10:30:11 -07:00
Wink Saville
ef7b12940c Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
This is the simple fix for bug 2199271 which increases the timeout
for DEACTIVATE thus allowing more time to complete before SETUP_DATA_CALL
is retried. This should fix some occurrences of this bug as the current
time is known to be too short.

Bug: 2199271
Change-Id: I11c3cdc74678399de5f812133c83d687d0ed9937
2009-10-26 15:59:50 -07:00
Android (Google) Code Review
6158038a09 Merge change I2811f162 into eclair
* changes:
  Add Authentication Type field to the APN settings.
2009-10-26 18:14:15 -04:00
Jaikumar Ganesh
2811f1625e Add Authentication Type field to the APN settings.
Use auth type to setup data connection.
This value defaults to -1 (unset) to maintain compatibility.
When the value is -1, the auth type gets set to 0 (if no user is specified)
or 3.
Bug: 181700
2009-10-26 13:11:55 -07:00
Wei Huang
76c8da2211 am 2c726389: am 45db67f2: Merge change I808651dc into eclair-mr2
Merge commit '2c726389fb4a6d3b9b3ab67063527b341079f9c4'

* commit '2c726389fb4a6d3b9b3ab67063527b341079f9c4':
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
2009-10-23 11:49:20 -07:00
Android (Google) Code Review
45db67f2e8 Merge change I808651dc into eclair-mr2
* changes:
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
2009-10-23 14:31:49 -04:00
Wei Huang
fd7b4f1d12 bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
- when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
- update unit test.
2009-10-23 01:17:17 -07:00
Tom Taylor
65d15c8e86 am bee4b10a: am 171ad634: am 6c618c68: Merge change Ie7105dae into eclair
Merge commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae'

* commit 'bee4b10af2e772b2e5c7289b26286a5a33a300ae':
  Handle bad SIM message
2009-10-22 19:05:35 -07:00
Tom Taylor
171ad63488 am 6c618c68: Merge change Ie7105dae into eclair
Merge commit '6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-mr2

* commit '6c618c68f251e42210f7c2f45d69498352da87e0':
  Handle bad SIM message
2009-10-22 15:47:06 -07:00
Android (Google) Code Review
6c618c68f2 Merge change Ie7105dae into eclair
* changes:
  Handle bad SIM message
2009-10-22 18:37:51 -04:00
Tom Taylor
72fac67781 Handle bad SIM message
When trying to view the saved sms messages on my SIM, I ran into a null ref.
With this fix, we don't try and wrap a null message, but just skip it.
This is part one of three fixes for BC-triaged bug 2205782.

Change-Id: Ie7105dae7e3134b98681deabcc14f5db555902f3
2009-10-22 13:42:46 -07:00
jsh
3751dbbe40 am 10d97d27: am f214dd9d: am f14da417: Merge change I3ff560d7 into eclair
Merge commit '10d97d27808abe6b89caae3cee8383bb3514ad08'

* commit '10d97d27808abe6b89caae3cee8383bb3514ad08':
  Send "encoding problem" to the network for general errors during SMS dispatch.
2009-10-22 11:36:42 -07:00
jsh
f214dd9d4f am f14da417: Merge change I3ff560d7 into eclair
Merge commit 'f14da417f3cb1f80a62732238623bb83173255c0' into eclair-mr2

* commit 'f14da417f3cb1f80a62732238623bb83173255c0':
  Send "encoding problem" to the network for general errors during SMS dispatch.
2009-10-22 11:16:35 -07:00
Naveen Kalla
22bf022dc0 am 466c08ae: am 6183a3ed: am 076cb23a: Merge change I13dd02fc into eclair
Merge commit '466c08ae9889208b41a475ee8a8f8c2c6483ea8e'

* commit '466c08ae9889208b41a475ee8a8f8c2c6483ea8e':
  telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
2009-10-22 11:16:13 -07:00
Naveen Kalla
6183a3ed5b am 076cb23a: Merge change I13dd02fc into eclair
Merge commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7' into eclair-mr2

* commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7':
  telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
2009-10-22 10:47:03 -07:00
Robert Greenwalt
e0f01c8ac9 am 2fe12102: am 98a7c454: Merge change I66ff8af6 into eclair-mr2
Merge commit '2fe121025cd8f24a3652728effe86188a9d4b5fa'

* commit '2fe121025cd8f24a3652728effe86188a9d4b5fa':
  Move calc of EriIconIndex/Mode to whenever basis changes
2009-10-21 18:00:04 -07:00