16614 Commits

Author SHA1 Message Date
Charles Chen
f524115e10 am 014085a8: am 4bc95d19: Merge change Iab089078 into eclair-mr2
Merge commit '014085a8727d7e10a4d39cba4a6d27826b66bc00'

* commit '014085a8727d7e10a4d39cba4a6d27826b66bc00':
  Fix for a race condition that can occur if an utterance
2009-12-29 20:11:10 -08:00
Tom Taylor
7ebdcbdb6f Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-12-29 20:11:00 -08:00
Android (Google) Code Review
0ac7f0b8c3 Merge change Idbe64967
* changes:
  Fix a typo.
2009-12-29 13:28:05 -08:00
Owen Lin
202f560f85 Fix a typo.
Change-Id: Idbe649678a7321a6bd9511218788bc4dfb3cbdb4
2009-12-28 15:54:23 +08:00
Eric Laurent
a0b517609d am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'

* commit '68e9014e47f7350b3889e1704dde809b2a926968':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-27 16:33:17 -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
76032b7f16 Merge change I92a824fe
* changes:
  Immediately close the shade when the status bar is disabled.
2009-12-26 20:39:44 -08:00
Android (Google) Code Review
88bb8cb6b0 Merge change I1c875584
* changes:
  Print OpenGL version and extension information.
2009-12-23 19:12:49 -08:00
Jack Palevich
1c875584c5 Print OpenGL version and extension information.
Something happened to the line endings, adding
a blank line after most lines of text. I
repaired the damage, but in the process some
blank lines have been added / removed.
2009-12-24 11:09:56 +08:00
Android (Google) Code Review
121ec7ff33 Merge change I14b9785e
* changes:
  Fix SoundPool restart problem CheckJNI issue.
2009-12-23 17:26:40 -08:00
Dave Sparks
3c56221af7 Fix SoundPool restart problem CheckJNI issue. 2009-12-23 17:22:57 -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
2ce9a19044 Merge change I7d46f612
* changes:
  Disable excessive RS logging.
2009-12-23 14:57:08 -08:00
Jason Sams
7d46f612a2 Disable excessive RS logging. 2009-12-23 14:56:19 -08:00
Android (Google) Code Review
218b8984a4 Merge change I718cd1f3
* changes:
  Element restructuring.  Add support for new basic Element types including the RS objects and vectors(2-4).  In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
2009-12-23 14:55:24 -08:00
Jason Sams
718cd1f322 Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
This will break some apps, checkings for other projects will follow to unbreak them.
2009-12-23 14:35:29 -08:00
Daniel Sandler
af5e9de9fd Immediately close the shade when the status bar is disabled.
This provides a quick fix for http://b/2298803 (if the
in-call UI comes up while the user is holding the
windowshade, the shade sticks in place and the display
becomes unresponsive).

(NB: The shade disappears immediately when the status bar is
disabled. It might be better for the shade to animate
closed; indeed, this seems to be what the code was trying to
do, but an unfortunate interaction of the animation and
touch-handling code is what caused this bug in the first
place.)

Change-Id: I92a824fe385c8d6e51993be1657b492e580f1e7b
2009-12-23 14:47:18 -06:00
Android (Google) Code Review
ea84a5559f Merge change Idfa47b56
* changes:
  Don't crash the system process when a backup transport unregisters
2009-12-23 11:40:14 -08:00
Dave Sparks
1905530bb1 Replace sine with organ for some SoundPool tests. 2009-12-23 09:55:21 -08:00
Dave Sparks
d94466c4c8 Add SoundPool test 2009-12-23 09:47:12 -08:00
Android (Google) Code Review
011a3dfd85 Merge change I9120be33
* changes:
  Add OnLoadCompleteListener to SoundPool.
2009-12-23 09:45:23 -08:00
Dave Sparks
f6e43bf290 Add OnLoadCompleteListener to SoundPool. 2009-12-23 09:11:29 -08:00
Eric Laurent
cf4fc6263c am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a'

* commit 'f31f365a7708c931e955670bc6213fdc8f91a87a':
  Fix issues 2333450 and 2333559:
2009-12-22 23:46:16 -08:00
Eric Laurent
f31f365a77 am eb5ffc23: Merge change Id8e98194 into eclair
Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp

* commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c':
  Fix issues 2333450 and 2333559:
2009-12-22 23:41:59 -08:00
Android (Google) Code Review
eb5ffc239b Merge change Id8e98194 into eclair
* changes:
  Fix issues 2333450 and 2333559:
2009-12-22 23:34:22 -08:00
Jack Palevich
ecc1f6eca2 am 244cc72f: am e3449553: Merge change I49c9a3a3 into eclair
Merge commit '244cc72fdf906799e3ec4cfe5b7cda49d9f08cca'

* commit '244cc72fdf906799e3ec4cfe5b7cda49d9f08cca':
  Fix bug 2325244	screen turns black for a brief period of time
2009-12-22 18:35:26 -08:00
Jack Palevich
244cc72fdf am e3449553: Merge change I49c9a3a3 into eclair
Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp

* commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e':
  Fix bug 2325244	screen turns black for a brief period of time
2009-12-22 18:31:58 -08:00
Android (Google) Code Review
e344955393 Merge change I49c9a3a3 into eclair
* changes:
  Fix bug 2325244	screen turns black for a brief period of time
2009-12-22 18:29:29 -08:00
Charles Chen
014085a872 am 4bc95d19: Merge change Iab089078 into eclair-mr2
Merge commit '4bc95d19c9ccf9cfe4c51b1e697db8cc1d86a579' into eclair-mr2-plus-aosp

* commit '4bc95d19c9ccf9cfe4c51b1e697db8cc1d86a579':
  Fix for a race condition that can occur if an utterance
2009-12-22 17:42:25 -08:00
Eric Laurent
68e9014e47 am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp

* commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-22 17:42:17 -08:00
Android (Google) Code Review
4bc95d19c9 Merge change Iab089078 into eclair-mr2
* changes:
  Fix for a race condition that can occur if an utterance is stopped right when it completes.
2009-12-22 17:39:57 -08:00
Android (Google) Code Review
ceedafacdb Merge change I5038c78f
* changes:
  Add missing shared libraries in linker commands.  Currently these libraries are linked implicitly via dependencies of other shared libraries.
2009-12-22 17:12:03 -08:00
Eric Laurent
eb14a783be Fix issues 2333450 and 2333559:
Add new config values to AudioSystem::FOR_DOCK force usage to differenciate car and desk docks.
Use a receiver for the sticky Intent.ACTION_DOCK_EVENT in AudioService to detect the type
of dock and select force usage accordingly.
2009-12-22 16:20:46 -08:00
Christopher Tate
dfa47b56e1 Don't crash the system process when a backup transport unregisters
Bug: 2342503
2009-12-22 16:01:32 -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
Jeff Sharkey
44303922f1 Watch for "bluetooth" in list of toggleable radios.
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of
radios that can be toggled while in airplane mode.  This
change adds logic to BluetoothService to allow enabling
when Settings.System.RADIO_BLUETOOTH appears in that list.

Fixes http://b/2297314
2009-12-22 14:32: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
Doug Kwan
5038c78f13 Add missing shared libraries in linker commands. Currently these libraries are
linked implicitly via dependencies of other shared libraries.
2009-12-22 13:30:25 -08:00
Android (Google) Code Review
233d316553 Merge change Ib9285359
* changes:
  Add bugreport info about network feature use.
2009-12-22 10:51:51 -08:00
Grace Kloba
7853722721 am 49a791a0: am 4350e145: Move the full screen\'s matching embedded view to be fully visible so that the touch will always work.
Merge commit '49a791a08b074aac438f8b6b32ae8c2860717447'

* commit '49a791a08b074aac438f8b6b32ae8c2860717447':
  Move the full screen's matching embedded view to be
2009-12-22 10:15:46 -08:00
Android (Google) Code Review
a8181d5301 Merge change Ia4362cd4
* changes:
  resolved conflicts for merge of ad2fa35d to master
2009-12-22 10:14:00 -08:00
Tom Taylor
f0108cda21 resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
2009-12-22 10:11:55 -08:00
Eric Laurent
484d288868 Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Add a separate system settings entry for bluetooth SCO volume.
2009-12-22 10:10:24 -08:00
Eric Laurent
b9a44165c7 am 0c5cc224: am d20a55af: Merge change Iccfa50fe into eclair
Merge commit '0c5cc224b052654ee38d39effce427a47697481b'

* commit '0c5cc224b052654ee38d39effce427a47697481b':
  Fix issue 2323920: Notification & A2DP audio stutter.
2009-12-22 10:01:39 -08:00
Eric Laurent
0c5cc224b0 am d20a55af: Merge change Iccfa50fe into eclair
Merge commit 'd20a55af8215dff59f61f91ea89dbcbfc08836de' into eclair-plus-aosp

* commit 'd20a55af8215dff59f61f91ea89dbcbfc08836de':
  Fix issue 2323920: Notification & A2DP audio stutter.
2009-12-22 09:57:56 -08:00
Android (Google) Code Review
d20a55af82 Merge change Iccfa50fe into eclair
* changes:
  Fix issue 2323920: Notification & A2DP audio stutter.
2009-12-22 09:50:42 -08:00
Eric Laurent
8ac9f8d1c7 Fix issue 2323920: Notification & A2DP audio stutter.
Modified AudioFlinger duplicating output thread so that audio tracks are not mixed until both outputs (A2DP and hardware) have exited standby mode. This avoids to have one output far ahead of the other and audio frames dropped because the compensation mechanism cannot keep up.
Also calculate the maximum wait time in OutputTrack::write() based the on smallest frame count of all output threads instead of the frame count of the thread the OutputTrack is connected to. This avoids starving the thread with the smallest frame count by waiting too long on the other thread.
Since the frame count was reduced on hardware output to reduce latency the difference between A2DP and hardware outputs frame counts had become problematic.
Also increased the number of overflow buffers to cope with bigger timing differences among outputs.
2009-12-22 09:06:46 -08:00
Android (Google) Code Review
fddd8f96f3 Merge change I70f91838
* changes:
  keystore: Add paddings before checksumming.
2009-12-22 01:39:14 -08:00
Chia-chi Yeh
fa4ae74ef7 keystore: Add paddings before checksumming.
Also fix a file descriptor leak when file system is nearly full.

Bug: 2339184
2009-12-22 17:26:42 +08:00