1174 Commits

Author SHA1 Message Date
Eric Laurent
bfdece49cf am 355743c7: am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '355743c70d9810fda3e59d718d055f9513fb05b7'

* commit '355743c70d9810fda3e59d718d055f9513fb05b7':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 10:53:01 -08:00
Eric Laurent
99e03a3f94 am 6efdbcc3: am fddfb9ae: Merge change Iad79689a into eclair
Merge commit '6efdbcc3c1afafe2f9401668ce252167600b498f' into eclair-mr2-plus-aosp

* commit '6efdbcc3c1afafe2f9401668ce252167600b498f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-13 09:28:06 -08:00
Eric Laurent
355743c70d am 609acfd2: am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '609acfd2a1067f49e51925776484b070a24d8301' into eclair-mr2-plus-aosp

* commit '609acfd2a1067f49e51925776484b070a24d8301':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-13 09:27:55 -08:00
Eric Laurent
6efdbcc3c1 am fddfb9ae: Merge change Iad79689a into eclair
Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-mr2

* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 23:10:34 -08:00
Eric Laurent
609acfd2a1 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 23:10:18 -08:00
Eric Laurent
4a85d71fb6 am fddfb9ae: Merge change Iad79689a into eclair
Merge commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f' into eclair-plus-aosp

* commit 'fddfb9ae03a2730ac5ce27fa4c47b7d3a0285d0f':
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 22:56:55 -08:00
Android (Google) Code Review
fddfb9ae03 Merge change Iad79689a into eclair
* changes:
  Improvements for issue 2197683:	English IME key-press latency is noticeably higher on passion than sholes
2009-11-12 22:53:28 -08:00
Eric Laurent
e8302a64c7 am 1aa9f3ca: Merge change I923d7d72 into eclair
Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-plus-aosp

* commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54':
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:49:51 -08:00
Android (Google) Code Review
1aa9f3cac3 Merge change I923d7d72 into eclair
* changes:
  Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
2009-11-12 22:45:50 -08:00
Eric Laurent
923d7d721d Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.

Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
2009-11-12 12:09:06 -08:00
Andreas Huber
c20da0b8db am bfdb1e88: am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2
Merge commit 'bfdb1e88ef796969efc906e7648b552078c82aee'

* commit 'bfdb1e88ef796969efc906e7648b552078c82aee':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:47:27 -08:00
Andreas Huber
bfdb1e88ef am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2
Merge commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8' into eclair-mr2-plus-aosp

* commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:43:31 -08:00
Andreas Huber
d0f3228daa resolved conflicts for merge of c66d53f9 to eclair-mr2 2009-11-12 10:32:26 -08:00
Andreas Huber
4719963c86 am c66d53f9: Merge change I880541a8 into eclair
Merge commit 'c66d53f97b1fe635f576642d5720dcd441e34cce' into eclair-plus-aosp

* commit 'c66d53f97b1fe635f576642d5720dcd441e34cce':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:00:02 -08:00
Andreas Huber
c8d7c1492e Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor. 2009-11-12 09:36:10 -08:00
Eric Laurent
059b4be2a5 Improvements for issue 2197683: English IME key-press latency is noticeably higher on passion than sholes
This change goes with a kernel driver change that reduces the audio buffer size from 4800 bytes (~27ms) to 3072 bytes (~17ms).
- The AudioFlinger modifcations in change 0bca68cfff161abbc992fec82dc7c88079dd1a36 have been removed: the short sleep period was counter productive when the AudioTrack is using the call back thread as it causes to many preemptions.
- AudioFlinger mixer thread now detects long standby exit time and in this case anticipates start by writing 0s as soon as a track is enabled even if not ready for mixing.
- AudioTrack::start() is modified to start call back thread before starting the IAudioTrack so that thread startup time is masked by IAudioTrack start and mixer thread wakeup time.
2009-11-11 12:13:27 -08:00
Andreas Huber
7ddad6159c am 555ecc7d: am 6780d8c0: Make MediaPlayerImpl less verbose by default.
Merge commit '555ecc7d8e3f4983517c056f6f5c14a24e082363'

* commit '555ecc7d8e3f4983517c056f6f5c14a24e082363':
  Make MediaPlayerImpl less verbose by default.
2009-11-10 13:58:46 -08:00
Andreas Huber
555ecc7d8e am 6780d8c0: Make MediaPlayerImpl less verbose by default.
Merge commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6' into eclair-mr2-plus-aosp

* commit '6780d8c006c9381919c0ee4de3d2bdc6d7a728d6':
  Make MediaPlayerImpl less verbose by default.
2009-11-10 13:55:12 -08:00
Andreas Huber
6780d8c006 Make MediaPlayerImpl less verbose by default. 2009-11-10 13:47:45 -08:00
Andreas Huber
19d494549b am 00443d66: am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit '00443d661de7d8a06f5126a735d832045a827110'

* commit '00443d661de7d8a06f5126a735d832045a827110':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:38:00 -08:00
Andreas Huber
00443d661d am d533ca61: am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7' into eclair-mr2-plus-aosp

* commit 'd533ca61fa1e6a456f93a790cdb9b4eb5893a5a7':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:33:53 -08:00
Andreas Huber
cad4d807f9 am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-plus-aosp

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:30:08 -08:00
Andreas Huber
d533ca61fa am cfe45c77: Merge change I96c4d4b3 into eclair
Merge commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8' into eclair-mr2

* commit 'cfe45c775ddb5e48bf556aee7422298260eb4fd8':
  Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it.
2009-11-10 12:29:34 -08:00
Andreas Huber
da440f137f Fix for random audio output failures, properly dup() the file descriptor in IMediaPlayer::setDataSource to assume ownership as the caller will otherwise close it. 2009-11-10 12:26:26 -08:00
Gloria Wang
5cfcedc540 am 28b0e311: am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair
Merge commit '28b0e311959baa55e0c6c9762831165dbafb5046'

* commit '28b0e311959baa55e0c6c9762831165dbafb5046':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:14:46 -08:00
Gloria Wang
28b0e31195 am 9d7e75eb: am bf964e6a: Merge change Ic060d86f into eclair
Merge commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331' into eclair-mr2-plus-aosp

* commit '9d7e75eb0c774e36cbfbe71f37cedec6f1cc5331':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:11:21 -08:00
Gloria Wang
76acb3195f am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-plus-aosp

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:44 -08:00
Gloria Wang
9d7e75eb0c am bf964e6a: Merge change Ic060d86f into eclair
Merge commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e' into eclair-mr2

* commit 'bf964e6a0488c25bfe18d2c041aafe42cf493b9e':
  Check whether test server is up before running tests which use streaming files.
2009-11-10 10:07:10 -08:00
Gloria Wang
c060d86f7d Check whether test server is up before running tests which use streaming files. 2009-11-09 15:51:12 -08:00
Andreas Huber
4f2a1f5679 am 3c452e36: am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2
Merge commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67'

* commit '3c452e366001521b2ea07dcc2bd2aaa51c5ffd67':
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 11:46:27 -08:00
Andreas Huber
3c452e3660 am f28e0c2a: Merge change I9a50fdf4 into eclair-mr2
Merge commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6' into eclair-mr2-plus-aosp

* commit 'f28e0c2ac75bf630a595d442a7ddefcc1f8386f6':
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 11:35:57 -08:00
Android (Google) Code Review
f28e0c2ac7 Merge change I9a50fdf4 into eclair-mr2
* changes:
  Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
2009-11-06 14:25:26 -05:00
Andreas Huber
3f2dfc35df am 5959228b: am be364022: am fde273ba: Merge change Ic997acac into eclair
Merge commit '5959228b6cfcbcbc7d27cc969ff49a330398018f'

* commit '5959228b6cfcbcbc7d27cc969ff49a330398018f':
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 10:28:46 -08:00
Andreas Huber
5959228b6c am be364022: am fde273ba: Merge change Ic997acac into eclair
Merge commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5' into eclair-mr2-plus-aosp

* commit 'be364022fbdaa8eaef986b0ac4dae1c4ac7d64d5':
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 10:17:35 -08:00
Andreas Huber
be364022fb am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 10:07:53 -08:00
Andreas Huber
4b4d1b8980 am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-plus-aosp

* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 10:07:47 -08:00
Andreas Huber
9a50fdf467 Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting. 2009-11-06 08:44:26 -08:00
Android (Google) Code Review
fde273baf6 Merge change Ic997acac into eclair
* changes:
  Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
2009-11-06 11:27:03 -05:00
Wei-Ta Chen
88760cf50e am fa43c063: am d512a3b3: Merge change Ic1d72f56 into eclair-mr2
Merge commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624'

* commit 'fa43c063a3263e9c6c7363d62aff7d93a69b5624':
  Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
2009-11-05 20:18:42 -08:00
James Dong
b09c8ba082 am 421a32fb: am 99588d59: am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '421a32fb31f46860ce77b0e8131178a0af52d087'

* commit '421a32fb31f46860ce77b0e8131178a0af52d087':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 20:18:19 -08:00
Jean-Michel Trivi
76dfdad08f am 5a76b6df: am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db'

* commit '5a76b6dfcb8223cd156a8580fa0fc4ded97983db':
  Fix bug 2242585 to unhide the new audio recording sources.
2009-11-05 20:18:04 -08:00
Wei-Ta Chen
fa43c063a3 am d512a3b3: Merge change Ic1d72f56 into eclair-mr2
Merge commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb' into eclair-mr2-plus-aosp

* commit 'd512a3b3a8d0adb37bd0208181a02c91dc8025fb':
  Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
2009-11-05 20:12:50 -08:00
Android (Google) Code Review
d512a3b3a8 Merge change Ic1d72f56 into eclair-mr2
* changes:
  Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif to from the full image, if both can generate of a thumbnail of same size.
2009-11-05 23:07:33 -05:00
Wei-Ta Chen
c1d72f5697 Make createThumbnailFromEXIF prefer choosing a thumbnail from the exif
to from the full image, if both can generate of a thumbnail of same size.
2009-11-06 11:56:52 +08:00
James Dong
421a32fb31 am 99588d59: am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '99588d590f0965beb899606a79db0889601c7ec0' into eclair-mr2-plus-aosp

* commit '99588d590f0965beb899606a79db0889601c7ec0':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 19:21:38 -08:00
Jean-Michel Trivi
5a76b6dfcb am 571529f8: am d94ed379: Merge change I1dc2ae28 into eclair
Merge commit '571529f82159a3205547a61d1b720b695dc066be' into eclair-mr2-plus-aosp

* commit '571529f82159a3205547a61d1b720b695dc066be':
  Fix bug 2242585 to unhide the new audio recording sources.
2009-11-05 19:21:27 -08:00
James Dong
99588d590f am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-mr2

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 19:09:58 -08:00
Andreas Huber
c997acacd5 Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all). 2009-11-05 16:34:39 -08:00
James Dong
4bcff01e43 am 1e495da1: Merge change I4b03c2cd into eclair
Merge commit '1e495da19f3f0061de38821a4ac733dca833b3eb' into eclair-plus-aosp

* commit '1e495da19f3f0061de38821a4ac733dca833b3eb':
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 16:26:07 -08:00
Android (Google) Code Review
1e495da19f Merge change I4b03c2cd into eclair
* changes:
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
2009-11-05 19:15:56 -05:00