7499 Commits

Author SHA1 Message Date
Andreas Huber
7b8d058c20 am b32be296: am 4b027f12: Merge change 23165 into eclair
Merge commit 'b32be296d099bb32b3c0ba4140945ed018f14438'

* commit 'b32be296d099bb32b3c0ba4140945ed018f14438':
  Fixes a race condition between entering ERROR state and initial buffer submit.
2009-08-28 13:36:23 -07:00
Wink Saville
1a8fa0c5b6 am 18c91082: am b699013a: Merge change 22940 into eclair
Merge commit '18c9108294eea0a7fe1138fbb8dcc2404677daf4'

* commit '18c9108294eea0a7fe1138fbb8dcc2404677daf4':
  Fix bug 2040024 phone rings only once sometimes.
2009-08-28 13:36:18 -07:00
Mike Lockwood
d0e82cec71 Do not send dock state changed broadcasts until the system has finished booting.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-28 13:36:14 -07:00
Android (Google) Code Review
421f5f7136 Merge change 23169 into eclair
* changes:
  More assert => CHECK
2009-08-28 13:35:25 -07:00
Android (Google) Code Review
e8e4c7e4fa Merge change 23127 into eclair
* changes:
  Fixing bug 2086021. AccessiblityService could sometimes get a null pointer exception if multiple accessibility services are running and there are several events all happening within a short period of time.
2009-08-28 13:34:38 -07:00
Mike Lockwood
7b27db7f00 am 9e6842ca: Merge change 23168 into eclair
Merge commit '9e6842caa8334f78744dee77d476ac6eec5b7540' into eclair-plus-aosp

* commit '9e6842caa8334f78744dee77d476ac6eec5b7540':
  EventHub: Fix file descriptor leak.
2009-08-28 13:32:58 -07:00
Andreas Huber
b32be296d0 am 4b027f12: Merge change 23165 into eclair
Merge commit '4b027f128fea32bfcabee55bf4d994400453c00c' into eclair-plus-aosp

* commit '4b027f128fea32bfcabee55bf4d994400453c00c':
  Fixes a race condition between entering ERROR state and initial buffer submit.
2009-08-28 13:32:54 -07:00
Wink Saville
18c9108294 am b699013a: Merge change 22940 into eclair
Merge commit 'b699013a57b1973694896731f7a05b955e4720c4' into eclair-plus-aosp

* commit 'b699013a57b1973694896731f7a05b955e4720c4':
  Fix bug 2040024 phone rings only once sometimes.
2009-08-28 13:32:49 -07:00
Andreas Huber
e915a8591c More assert => CHECK 2009-08-28 13:32:48 -07:00
Android (Google) Code Review
9e6842caa8 Merge change 23168 into eclair
* changes:
  EventHub: Fix file descriptor leak.
2009-08-28 13:31:28 -07:00
Android (Google) Code Review
4b027f128f Merge change 23165 into eclair
* changes:
  Fixes a race condition between entering ERROR state and initial buffer submit.
2009-08-28 13:30:51 -07:00
Android (Google) Code Review
b699013a57 Merge change 22940 into eclair
* changes:
  Fix bug 2040024 phone rings only once sometimes.
2009-08-28 13:30:18 -07:00
Mike Lockwood
36dad72251 EventHub: Fix file descriptor leak.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-28 13:30:03 -07:00
Andreas Huber
d06e5b877c Fixes a race condition between entering ERROR state and initial buffer submit. 2009-08-28 13:18:14 -07:00
Jason Sams
3b7af1d12a am d76566bd: am 6f2f790b: Merge change 23064 into eclair
Merge commit 'd76566bd950fc3f60edda9a3047dfbc3c489caa7'

* commit 'd76566bd950fc3f60edda9a3047dfbc3c489caa7':
  Implement async data/subData.  Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh.  Update Film to use new builder.
2009-08-28 12:47:12 -07:00
Jason Sams
d76566bd95 am 6f2f790b: Merge change 23064 into eclair
Merge commit '6f2f790b4c55effb3b75f3418e365dc6663e10be' into eclair-plus-aosp

* commit '6f2f790b4c55effb3b75f3418e365dc6663e10be':
  Implement async data/subData.  Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh.  Update Film to use new builder.
2009-08-28 12:46:04 -07:00
Android (Google) Code Review
6f2f790b4c Merge change 23064 into eclair
* changes:
  Implement async data/subData.  Implement TriangleMeshBuilder in SimpleMesh which replaces TriangleMesh.  Update Film to use new builder.
2009-08-28 12:44:40 -07:00
Yong Liu
51b2b33219 MO SMS fail after sending 100 messages
After sending 100 messages, SMSDispatcher always displays dialog to user to
confirm the sending. If the user sends messages too fast then there will be more
than one dialogs waiting for the response, but SMSDisptcher can only handle one.
2009-08-28 11:58:38 -07:00
Charles Chen
85f6fb713f Fixing bug 2086021. AccessiblityService could sometimes get a null pointer
exception if multiple accessibility services are running and there are
several events all happening within a short period of time.
2009-08-28 11:32:23 -07:00
Wink Saville
a3659232ba Fix bug 2040024 phone rings only once sometimes.
The phone only rang once on rings that did't loop. In the GSM phones
the vendor ril sends a RIL_UNSOL_CALL_RING event to cause the phone
to properly play non-looping ring tones. To reproduce select a non-looping
ring tone such as "Digital Phone" and call it from another phone, the
phone will only ring once.

Three solutions were discussed:

*) Have all ring tones loop; rejected because to more space would be taken
by the silence.

*) Require all vendor RIL's to send RIL_UNSOL_CALL_RING; rejected because
it is inefficient to send a notification from the bottom of the stack.

*) Modify the PhoneApp or the audio layer; rejected because it would be
to big of change.

*) Modify the framework; this is the solution accepted.

The framework was modified to use two now properties to control the
call ring notification.

ro.telephony.multiple_call_ring: a boolean that if true the vendor ril
is assumed to send multiple RIL_UNSOL_CALL_RING messages. If false
only one is assumed and the framework will generate additional events.
(The default if absent is true).

ro.telephony.call_ring_delay: the delay in milli-seconds between
the generated events. (default if absent is 3000)

To minimize code duplication this change does some reorganization
of the PhoneBase class hierarchy and PhoneBase becomes a handler
and implements a default handleMessage method handles events associated
with call ring notification. This handler is overridden by derived
classes, CDMAPhone and GSMPhone which will pass unknown events
to PhoneBase.handleMessage and thus handle call notification for any
derived class.

Change-Id: I5b147b2b69b647d9987052f16ada41c9b66e4bf1
2009-08-28 11:10:09 -07:00
Eric Fischer
53656fe241 am bbad6e4a: am 62e592a6: Merge change 23023 into eclair
Merge commit 'bbad6e4a9b30e780f36980e5beac94738ebcd52c'

* commit 'bbad6e4a9b30e780f36980e5beac94738ebcd52c':
  Armor string format tokens with translation placeholders.
2009-08-28 10:53:26 -07:00
Eric Fischer
bbad6e4a9b am 62e592a6: Merge change 23023 into eclair
Merge commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50' into eclair-plus-aosp

* commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50':
  Armor string format tokens with translation placeholders.
2009-08-28 10:50:49 -07:00
Jean-Michel Trivi
9f02197930 am 263b49db: am 0d430593: Merge change 23108 into eclair
Merge commit '263b49db5bd2a1dd13aa9ac923626a654f5cbda6'

* commit '263b49db5bd2a1dd13aa9ac923626a654f5cbda6':
  Launch synthesis thread at max priority to prevent hicups in playback.
2009-08-28 10:48:33 -07:00
Android (Google) Code Review
62e592a61b Merge change 23023 into eclair
* changes:
  Armor string format tokens with translation placeholders.
2009-08-28 10:48:29 -07:00
Jean-Michel Trivi
263b49db5b am 0d430593: Merge change 23108 into eclair
Merge commit '0d430593ee07b78894eff8b78f559d2591a94287' into eclair-plus-aosp

* commit '0d430593ee07b78894eff8b78f559d2591a94287':
  Launch synthesis thread at max priority to prevent hicups in playback.
2009-08-28 10:46:00 -07:00
Android (Google) Code Review
0d430593ee Merge change 23108 into eclair
* changes:
  Launch synthesis thread at max priority to prevent hicups in playback. Return and log an error when an operation cannot be completed because the speech queue is locked longer than the timeout period. Log cleanup.
2009-08-28 10:43:54 -07:00
Eric Fischer
cfce0aa58b Armor string format tokens with translation placeholders.
Change-Id: I2f1b1f0e9b028a9f66c4543afe5c7bdce486db15
2009-08-28 10:40:03 -07:00
Cary Clark
aca20da4a9 am a3811e1b: am 6d45accc: don\'t layout when setting size from zoom if only height changed
Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c'

* commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c':
  don't layout when setting size from zoom if only height changed
2009-08-28 09:52:31 -07:00
Cary Clark
a3811e1b16 am 6d45accc: don\'t layout when setting size from zoom if only height changed
Merge commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4' into eclair-plus-aosp

* commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4':
  don't layout when setting size from zoom if only height changed
2009-08-28 09:50:19 -07:00
Cary Clark
6d45accc71 don't layout when setting size from zoom if only height changed
(companion change in external/webkit)
Add a boolean parameter to WebViewCore.java nativeSizeSize().
If set, only layout if the width has also changed.
If clear, layout if the height alone has changed.
Layout is clear when called from zoom setup, and set otherwise.
2009-08-28 12:46:10 -04:00
Jean-Michel Trivi
ab6ed2c2b9 Launch synthesis thread at max priority to prevent hicups in playback.
Return and log an error when an operation cannot be completed because
the speech queue is locked longer than the timeout period.
Log cleanup.
2009-08-28 09:25:11 -07:00
Grace Kloba
29f2ca8096 am a297a266: am feb2b311: Merge change 22988 into eclair
Merge commit 'a297a266bdea9f64c6a548661aa4be540c69c676'

* commit 'a297a266bdea9f64c6a548661aa4be540c69c676':
  Only add model in the UA for the release build
2009-08-28 09:16:51 -07:00
Grace Kloba
a297a266bd am feb2b311: Merge change 22988 into eclair
Merge commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496' into eclair-plus-aosp

* commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496':
  Only add model in the UA for the release build
2009-08-28 09:14:27 -07:00
Android (Google) Code Review
feb2b311c6 Merge change 22988 into eclair
* changes:
  Only add model in the UA for the release build
2009-08-28 09:12:28 -07:00
Andreas Huber
4facd1ec3c am 6f2f6382: am 01248f0f: Merge change 23103 into eclair
Merge commit '6f2f6382aa4e5d2d1f92b20a22c17ca7fce5dd7d'

* commit '6f2f6382aa4e5d2d1f92b20a22c17ca7fce5dd7d':
  Fixing the build.
2009-08-28 08:46:49 -07:00
Andreas Huber
6f2f6382aa am 01248f0f: Merge change 23103 into eclair
Merge commit '01248f0f18b681b69745ad716deff78a7c9e9adc' into eclair-plus-aosp

* commit '01248f0f18b681b69745ad716deff78a7c9e9adc':
  Fixing the build.
2009-08-28 08:44:39 -07:00
Android (Google) Code Review
01248f0f18 Merge change 23103 into eclair
* changes:
  Fixing the build.
2009-08-28 08:42:33 -07:00
Andreas Huber
a84b0e0c59 Fixing the build. 2009-08-28 08:40:00 -07:00
Daniel Sandler
efa58b70ba am 45c67626: am c035f7c7: Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit '45c67626dc9fd81e18ab650a53dcf8aa706c0958'

* commit '45c67626dc9fd81e18ab650a53dcf8aa706c0958':
  Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
2009-08-28 07:49:44 -07:00
Daniel Sandler
45c67626dc am c035f7c7: Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit 'c035f7c79fda9474002d265175fc52692dbd78fe' into eclair-plus-aosp

* commit 'c035f7c79fda9474002d265175fc52692dbd78fe':
  Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
2009-08-28 07:47:40 -07:00
Daniel Sandler
c035f7c79f Final high-density frameworks artwork drop from designers (dated 25-Aug-2009). 2009-08-28 09:04:53 -04:00
Tammo Spalink
6074e3f4cd am 77bd7a84: am 27d67a15: Merge change 23077 into eclair
Merge commit '77bd7a8475c8445b6b70922161f357cfac854551'

* commit '77bd7a8475c8445b6b70922161f357cfac854551':
  optimize MCC table
2009-08-28 00:49:59 -07:00
Tammo Spalink
77bd7a8475 am 27d67a15: Merge change 23077 into eclair
Merge commit '27d67a1509f9c19308dd7a9ac594526cf6ba51b3' into eclair-plus-aosp

* commit '27d67a1509f9c19308dd7a9ac594526cf6ba51b3':
  optimize MCC table
2009-08-28 00:48:34 -07:00
Android (Google) Code Review
27d67a1509 Merge change 23077 into eclair
* changes:
  optimize MCC table
2009-08-28 00:45:56 -07:00
Mike LeBeau
b4758199dd am 8c0fa1a2: am e9df3cf7: resolved conflicts for merge of 1e348378 to eclair
Merge commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef'

* commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef':
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-28 00:02:41 -07:00
Mike LeBeau
8c0fa1a2e5 am e9df3cf7: resolved conflicts for merge of 1e348378 to eclair
Merge commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2' into eclair-plus-aosp

* commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2':
  Revert "Remove third party support for Quick Search Box (aka global search)."
2009-08-27 23:59:32 -07:00
Mike LeBeau
e9df3cf79c resolved conflicts for merge of 1e348378 to eclair 2009-08-27 23:54:12 -07:00
Tammo Spalink
c18776d5bc optimize MCC table
Replace a table of objects that was created at boot
in a costly manner, with a pre-generated table of
more densely formatted numerical data.

Based on data from runhat on the phone process,
this looks to shrink the memory footprint from about
16kB to less then 2kB.

Addresses http://buganizer/issue?id=874072

Change-Id: I5a7b9d7de4c9b9a0360e8370252582969fbd8d4f
2009-08-28 14:05:04 +08:00
Dianne Hackborn
0754e1fb34 am 554f6cb1: am 49237345: Add platform infrastructure for features.
Merge commit '554f6cb1c7433449257d07d57e3d36cacb48fc70'

* commit '554f6cb1c7433449257d07d57e3d36cacb48fc70':
  Add platform infrastructure for features.
2009-08-27 22:16:13 -07:00
Dianne Hackborn
554f6cb1c7 am 49237345: Add platform infrastructure for features.
Merge commit '49237345d83e62fdb9eb8d50b13ad086636a04fa' into eclair-plus-aosp

* commit '49237345d83e62fdb9eb8d50b13ad086636a04fa':
  Add platform infrastructure for features.
2009-08-27 22:13:35 -07:00