502 Commits

Author SHA1 Message Date
Wink Saville
02722fbd77 Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.
Change-Id: Ia834022d04e65c42d671f63b2fec46804fe8a562
2009-12-22 14:32:07 -08:00
Android (Google) Code Review
1d2f5c39bb Merge change I76d2295c
* changes:
  SIM toolkit: Phone app crashes while reading SIM card
2009-12-21 16:31:54 -08:00
John Joseph
76d2295c8e SIM toolkit: Phone app crashes while reading SIM card
Incorrect log message results in an IllegalFormatConversionException
when trying to print SIMRecords Object as an integer.
2009-12-21 09:30:50 -08:00
John Joseph
83fd7b0d53 frameworks/base: Handle broadcast sms properly
Broadcast SMS does not have teleservice id field. Add
support to identify broadcast SMS based on message type.
2009-12-21 09:28:54 -08:00
Robert Greenwalt
41c5617813 am 24317443: am 421c72b6: Cleanup of process-specific DNS.
Merge commit '24317443fde973c762afbea1a3f6f2c830dfe3dd'

* commit '24317443fde973c762afbea1a3f6f2c830dfe3dd':
  Cleanup of process-specific DNS.
2009-12-18 14:37:28 -08:00
Robert Greenwalt
421c72b677 Cleanup of process-specific DNS.
Removes entries sooner.  A bug.
Doesn't add one for phone process at all.  This was intended to be removed long ago.

bug: 2329900
2009-12-18 11:57:52 -08:00
Scott Main
1e5710ce6f am 73536dda: am d92cc9a4: Merge change I33eb64c0 into eclair
Merge commit '73536dda20594e4b5e83396d705127a823bfa362'

* commit '73536dda20594e4b5e83396d705127a823bfa362':
  docs: add 2.1 platform notes, win usb driver notes
2009-12-16 11:20:22 -08:00
Scott Main
b149ee8835 docs: add 2.1 platform notes, win usb driver notes
and fix some javadocs for PhonestateListener
2009-12-16 09:50:53 -08:00
Dianne Hackborn
74a76d5e07 am 83652ebf: am 3a3fd2ba: Merge change Iaf1f0918 into eclair-mr2
Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'

* commit '83652ebfe1963bcecdcf24383165904223baca6e':
  Implement API to have new broadcasts replace existing broadcasts.
2009-12-14 16:15:03 -08:00
Dianne Hackborn
1c633fc89b Implement API to have new broadcasts replace existing broadcasts.
Use this in various places where it should serve no purpose to deliver
both broadcasts.  This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
2009-12-14 15:03:35 -08:00
Wink Saville
7a4fb7376b am 595c4092: am 8fb0faf3: Merge change I0a56959e into eclair-mr2
Merge commit '595c40920f31ba7b6674eb341548173e2aaf6ea7'

* commit '595c40920f31ba7b6674eb341548173e2aaf6ea7':
  Implement a HierarchicalStateMachine
2009-12-11 01:40:43 -08:00
Android (Google) Code Review
8fb0faf3cc Merge change I0a56959e into eclair-mr2
* changes:
  Implement a HierarchicalStateMachine
2009-12-10 21:22:19 -08:00
Wink Saville
dd9571f0a5 am 9f4cea68: am a41e0680: Merge change I36785a9d into eclair-mr2
Merge commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727'

* commit '9f4cea6846aa4ac2ec57c97f5da17822eb9b9727':
  Telephony: Make resetting radio on a radio technology change optional
2009-12-10 09:11:44 -08:00
Wink Saville
fc5b4802a5 Implement a HierarchicalStateMachine
A hierarchical state machine is a state machine which processes messages
and can have states arranged hierarchically. Each state in the state
machine may have a single parent state and if a child state is unable to
handle a message it may have the message processed by its parent.

Change-Id: I0a56959ece8f89e4f9122dc8044120b82d517bbb
2009-12-08 21:22:24 -08:00
Wink Saville
d7d6fb3947 Telephony: Make resetting radio on a radio technology change optional
When there is a radio technology change in a multimode modem, resetting
the radio is not necessary always. Reset radio only when a property is
set. Notify applications that data connection is lost and ignore
notifications coming on the old radio technology.

Minor optimizations and bug fixes in CdmaDataConnectionTracker.
- Stop netstat polling when data connection is not active
- check all the elements of the data call list array to figure out if the
data connection is active.

Change-Id: I36785a9d1bf8ee135b574b61e9ba371faa04ffc7
2009-12-08 16:57:58 -08:00
Takaoka G. Tadashi
cc60238165 am 94985152: am d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm
Merge commit '949851525a1aebca0d7d6b9a3465d5e572c8c621'

* commit '949851525a1aebca0d7d6b9a3465d5e572c8c621':
  Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
2009-12-02 20:48:07 -08:00
Takaoka G. Tadashi
bdb9b3042a am 5d2a7b26: am 7d51517c: Merge change I611c15cf into eclair-mr2
Merge commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef'

* commit '5d2a7b26d6bb06f71904ecd7c828ae90d79b27ef':
  Add DoCoMo vendor specific OMNA WSP content type number
2009-12-02 20:47:32 -08:00
Wink Saville
16fbdbfb01 am a7493240: am 2f9d8dbe: Merge change I749d6801 into eclair-mr2
Merge commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af'

* commit 'a7493240ab97013458b2dbe16fcd27fb6e85c0af':
  Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
2009-12-02 20:42:09 -08:00
Wink Saville
03fe67da5a am ea200b0c: am 7d2fd650: am cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit 'ea200b0c6f92ebdd116b088cf895b4aa82fe8c2e'

* commit 'ea200b0c6f92ebdd116b088cf895b4aa82fe8c2e':
  Cleanup @hide and @deprecated directives.
2009-12-02 20:32:26 -08:00
Takaoka G. Tadashi
d5b325aaac Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Import CL 146651 from //branches/cupcake_dcm
2009-12-03 11:01:59 +09:00
Android (Google) Code Review
7d51517cec Merge change I611c15cf into eclair-mr2
* changes:
  Add DoCoMo vendor specific OMNA WSP content type number     Import CL 145261 from //branches/cupcake_dcm
2009-12-02 17:56:20 -08:00
Wink Saville
144fdfec24 Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
and minor fixes.

Fix the following
 - When PROPERTY_OPERATOR_NUMERIC is not set, the value is "" when CDMAPhone
is initialized. The constructor tries to extract MCC and MNC from this
property and results in a StringIndexOutOfBounds exception. Check for empty
OperatorNumeric string before trying to extract MCC and MNC
 - Handle RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING response gracefully.

Change-Id: I749d6801bb4794d56e8fd672dec69dfea2b5c756
2009-12-02 15:07:34 -08:00
Wink Saville
7d2fd65015 am cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2

* commit 'cc6ff2bc6011294367d9a8c644f811449e952eb7':
  Cleanup @hide and @deprecated directives.
2009-12-02 11:26:23 -08:00
Wink Saville
cc6ff2bc60 Cleanup @hide and @deprecated directives.
Bug: 2294396
Change-Id: Icb34706a203fb34e52c67b904328e91a7803d4fc
2009-12-02 11:09:52 -08:00
Takaoka G. Tadashi
611c15cfc6 Add DoCoMo vendor specific OMNA WSP content type number
Import CL 145261 from //branches/cupcake_dcm

See http://www.openmobilealliance.org/tech/omna/omna-wsp-content-type.aspx
2009-12-02 14:45:29 +09:00
Bai Tao
76065faf5e am 57928702: am a8c79a8c: am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit '57928702bf4311f875bc3e2cccfdccbffb99a461'

* commit '57928702bf4311f875bc3e2cccfdccbffb99a461':
  Sending UCS2 encoded SMS correctly
2009-12-01 18:52:22 -08:00
Bai Tao
a8c79a8c65 am 90aaaef5: Merge change I0e200c3c into eclair
Merge commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f' into eclair-mr2

* commit '90aaaef5f97ee885cc5898f3e7517ad4e5943d2f':
  Sending UCS2 encoded SMS correctly
2009-12-01 17:16:50 -08:00
Bai Tao
0e200c3cbe Sending UCS2 encoded SMS correctly
http://b/2285139
2009-11-30 11:28:37 -08:00
Naveen Kalla
be02501de7 am 694e8662: am 5f69f726: Merge change I3f4f5f05 into eclair-mr2
Merge commit '694e8662a51bd878cd5630d47adaace471ea6f7c'

* commit '694e8662a51bd878cd5630d47adaace471ea6f7c':
  cdma tones: Fix Call Waiting Tone in the hash map
2009-11-25 09:48:34 -08:00
Android (Google) Code Review
5f69f7260f Merge change I3f4f5f05 into eclair-mr2
* changes:
  cdma tones: Fix Call Waiting Tone in the hash map
2009-11-25 09:39:29 -08:00
Naveen Kalla
deb5a9b997 cdma tones: Fix Call Waiting Tone in the hash map
Change-Id: I3f4f5f050c50f328f95a1660dc61cce37059bddd
2009-11-25 09:31:53 -08:00
Robert Greenwalt
b5dcac06b0 am 12715c36: am 8e2eb583: Merge change I22cf0509 into eclair-mr2
Merge commit '12715c366c69b54b3e5218fd25647980a6502be0'

* commit '12715c366c69b54b3e5218fd25647980a6502be0':
  Add China data to MccTable.
2009-11-24 15:29:34 -08:00
Robert Greenwalt
22cf0509b2 Add China data to MccTable.
We didn't have the wifi channel count data there, so we failed to
attempt connections on channel 13.

bug: 2282285
2009-11-24 14:13:04 -08:00
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