532 Commits

Author SHA1 Message Date
Wink Saville
7188f94652 Cleanup comments, see bug 2401350.
Change-Id: Ieaeeba44b235038ad9b75a57b37658738532df3f
2010-02-01 16:26:00 -08:00
John Wang
6a31dfa905 am 1ef6fb3b: am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785'

* commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785':
  Handle RIL_UNSOL_RESEND_INCALL_MUTE.
2010-02-01 14:34:50 -08:00
John Wang
1ccc41ed93 Handle RIL_UNSOL_RESEND_INCALL_MUTE.
For bug 2400052.

Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:04:39 -08:00
Neal Nguyen
1a44d5dcab Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.
Most of these are file moves; a couple notable exceptions are the changes due to the move, and fixing up test code:
- database/DatabaseCursorTest.java
- database/DatabaseStatementTest.java
- net/UriTest.java
2010-01-29 13:35:51 -08:00
John Wang
5bb3371823 am 89fec7b1: am 098295a5: Merge "Updated emergency string when locale changes." into eclair
Merge commit '89fec7b155981d6e99eb1e05793f343a5d04aa59'

* commit '89fec7b155981d6e99eb1e05793f343a5d04aa59':
  Updated emergency string when locale changes.
2010-01-28 10:47:27 -08:00
John Wang
70aaacac82 am 64c92f75: am 08cb0024: Handle emergency calls only status in ServiceStateTracker.
Merge commit '64c92f75df7415084aa9f0b304f2a99089b6be9f'

* commit '64c92f75df7415084aa9f0b304f2a99089b6be9f':
  Handle emergency calls only status in ServiceStateTracker.
2010-01-28 10:08:55 -08:00
jsh
ec22b4c468 am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.
Merge commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d'

* commit '3c2d3667aa7ae20c95950270ccfa8932d1d3d32d':
  Fix NPE when importing from USIM.
2010-01-27 18:39:58 -08:00
Neal Nguyen
22e31e5b60 Moving framework core tests closer to their source files.
Phase 2 of test case cleanup; distributing CoreTests files closer to their respective sources under frameworks.
2010-01-27 13:36:38 -08:00
Irfan Sheriff
c30ffda0d8 resolved conflicts for merge of d0514347 to master 2010-01-25 19:10:31 -08:00
John Wang
670db2c696 Updated emergency string when locale changes.
For bug 2352094.
2010-01-22 13:07:58 -08:00
John Wang
08cb002402 Handle emergency calls only status in ServiceStateTracker.
For bug 2352094, handle emergency calls only status and
pass the emergency calls only string via SPN_STRING_UPDATED intent.
2010-01-22 01:03:14 -08:00
jsh
036e21083d Fix NPE when importing from USIM.
Need to check if fileIds is empty.

b/2349232
2010-01-21 16:58:17 -08:00
Wink Saville
ac376f4854 Fix build, GsmServiceStateTracker was using old EventLog API.
Change-Id: Ib202d0ebbbb11c0ccad40445426c0c3704eb30b5
2010-01-21 14:15:05 -08:00
John Wang
88a195b58a am 7319d94f: am 99f2a4bb: Merge "Add Event log for RAT switch." into eclair
Merge commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af'

* commit '7319d94ff1ca898c36d2da8dd0cd8469d91bc5af':
  Add Event log for RAT switch.
2010-01-21 12:47:13 -08:00
Irfan Sheriff
dcc14d6a26 Merge "Use MCC value to always override channel count setting" into eclair 2010-01-21 07:46:49 -08:00
Irfan Sheriff
51e2f71f4a Use MCC value to always override channel count setting
FCC raised the issue of not allowing users to configure
channel counts beyond 11. This change enforces the channel
count based on MCC values.

Bug: 2378844
2010-01-20 17:44:07 -08:00
Robert Greenwalt
15abc90147 Cleanup of process-specific DNS.
Backport of MR2 change 421c72b6.

Removes entries sooner.  A bug.
Doesn't add one for phone process at all.  This was intended to be removed long ago.

bug: 2329900
bug: 2377507
2010-01-19 18:01:36 -08:00
John Wang
b61c1a0f8b Add Event log for RAT switch.
Write event log while the 2G/3G radio access technology switched.
2010-01-13 17:55:57 -08:00
John Wang
f6f56c051c Merge "Hangup calls before powering off radio." 2010-01-13 12:12:49 -08:00
Nicolas Catania
c72509b4d8 Fix the CallerInfo lookup when a phone URL is used.
Typically the CallerInfo is looked up based on a phone number, in which case the '_id' column
contains the contact id.

However when the lookup is based on a phone row, the '_id' column is the row number we queried.
The contact id is stored somewhere else in a 'contact_id' column.

The current fix, checks the mime type of the contactRef URL to find out which column contains
the contact id.
I think the contact DB should be more consistent and always return the contact id AS contact_id even
in the phone number scenario.

Bug:2269240
2010-01-11 15:58:10 -08:00
John Wang
3805c7ca32 Hangup calls before powering off radio.
Bug 2339655. Should hangup the existing voice call (including onhold ones) before powering off radio to ensure the proper sequence at radio protocol level. Otherwise the carrier will treat it as drop calls.
2010-01-11 15:48:47 -08:00
Doug Zongker
edc5189c33 change remaining frameworks/base Gservices to Secure settings
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
2010-01-07 15:00:37 -08:00
Dan Egnor
62136d3e1c Simplify EventLog interface -- remove supported for nested
sequences (which nobody used) and streamline the API, adding
documentation in preparation for inclusion in the SDK.

Gut and deprecate EventLogTags, which unfortunately was put
into the public SDK (an oversight).  Include the functionality
in EventLog proper, in a simpler and easier to use manner.

This change doesn't actually un-@hide anything, but it does
change it to @pending.
2010-01-06 12:30:12 -08:00
Wink Saville
6aa8a21bb4 Fix data connection support on emulator.
Bug: 2353316
Change-Id: I34765c70fc6ef160956d400647565c577141c0bf
2010-01-04 21:54:25 -08:00
Wink Saville
08dca8fa4b Turn off HSM debugging in DataConnection, to verbose.
Change-Id: I101b228e5810884084519bbc5ffd86cb3ab7a54e
2009-12-27 15:38:29 -08:00
Android (Google) Code Review
759a77e502 Merge change I0fa1b245
* changes:
  telephony: Populate the User-to-user signaling info fields.
2009-12-23 16:48:20 -08:00
Android (Google) Code Review
5e26465abb Merge change Ia834022d
* changes:
  Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.
2009-12-22 15:43:15 -08:00
Wink Saville
02722fbd77 Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.
Change-Id: Ia834022d04e65c42d671f63b2fec46804fe8a562
2009-12-22 14:32:07 -08:00
Naveen Kalla
0fa1b24593 telephony: Populate the User-to-user signaling info fields.
Since the RIL interface has been enhanced to support user-user signaling
information, we need to populate the fields for RIL_REQUEST_DIAL and
decode the fields in RIL_Call. Handle the default case when UUS Info is not
present so that the RIL interface change does not break the normal case.
2009-12-22 13:48:23 -08:00
Tom Taylor
f0108cda21 resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
2009-12-22 10:11:55 -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
Tom Taylor
d4a4729c0c Update imports to android-common
Several files were moved to android-common. Update all the references
to import those files from the new location.
2009-12-21 13:59:18 -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