OSDN Git Service
The Android Open Source Project [Tue, 6 Dec 2011 17:02:57 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
The Android Automerger [Tue, 6 Dec 2011 04:36:01 +0000 (20:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:25:37 +0000 (17:25 -0800)]
am
5433e25f: am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
5433e25f6ce013860ff2a074ad8d1158cc39ab91':
audioflinger: fix audio skipping over A2DP
Eric Laurent [Tue, 6 Dec 2011 01:22:58 +0000 (17:22 -0800)]
am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
Andreas Huber [Mon, 5 Dec 2011 21:30:52 +0000 (13:30 -0800)]
resolved conflicts for merge of
07bacabe to master
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
Andreas Huber [Mon, 5 Dec 2011 20:03:41 +0000 (12:03 -0800)]
am
f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit '
f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
Andreas Huber [Mon, 5 Dec 2011 19:34:43 +0000 (11:34 -0800)]
Properly identify how much metadata we need to cache in order to instantiate
the extractor without blocking (and therefore be able to abort).
Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug:
5666532
Eric Laurent [Mon, 5 Dec 2011 17:47:19 +0000 (09:47 -0800)]
audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.
Modified activeSleepTimeUs() to take A2DP case into account.
Issue
5682206.
Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
The Android Open Source Project [Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
Mike Lockwood [Sat, 3 Dec 2011 01:57:19 +0000 (17:57 -0800)]
am
9f3f3c2f: (-s ours) am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Sat, 3 Dec 2011 01:57:17 +0000 (17:57 -0800)]
am
7bbc3c4b: (-s ours) am
7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '
7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
The Android Automerger [Sat, 3 Dec 2011 00:21:23 +0000 (16:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:22:17 +0000 (13:22 -0800)]
am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Fri, 2 Dec 2011 21:22:15 +0000 (13:22 -0800)]
am
7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '
7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
Mike Lockwood [Thu, 1 Dec 2011 21:58:41 +0000 (16:58 -0500)]
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Bug:
5527220
Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Thu, 1 Dec 2011 23:36:06 +0000 (18:36 -0500)]
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K
Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Fri, 2 Dec 2011 16:17:33 +0000 (08:17 -0800)]
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage"
Mike Lockwood [Fri, 2 Dec 2011 16:10:03 +0000 (08:10 -0800)]
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"
Mike Lockwood [Thu, 1 Dec 2011 21:58:41 +0000 (16:58 -0500)]
MTP: Add support for restricting PTP to only certain subdirectories of the storage
Bug:
5527220
Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b
Signed-off-by: Mike Lockwood <lockwood@google.com>
The Android Open Source Project [Fri, 2 Dec 2011 15:53:10 +0000 (07:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1c603308272f9b00174c3f9046171e069ffee566
The Android Automerger [Fri, 2 Dec 2011 00:45:56 +0000 (16:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Mike Lockwood [Thu, 1 Dec 2011 23:36:06 +0000 (18:36 -0500)]
MTP: Don't attempt to read more than 16K at a time from the MTP driver
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K
Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5
Signed-off-by: Mike Lockwood <lockwood@google.com>
Andreas Huber [Thu, 1 Dec 2011 18:22:19 +0000 (10:22 -0800)]
am
10526a0b: am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
10526a0bfe070ac4d1e550a81ed68be35d261b16':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Andreas Huber [Thu, 1 Dec 2011 18:20:09 +0000 (10:20 -0800)]
am
2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '
2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Andreas Huber [Thu, 1 Dec 2011 18:02:37 +0000 (10:02 -0800)]
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug:
5696324
The Android Open Source Project [Wed, 30 Nov 2011 20:55:39 +0000 (12:55 -0800)]
Reconcile with ics-mr1-release
Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401
Jamie Gennis [Wed, 30 Nov 2011 18:50:49 +0000 (10:50 -0800)]
am
c040e1e7: am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
c040e1e77923d81050f2d3dbdac5d07e01be72f6':
SurfaceMediaSource: use the vid enc usage bit
Andreas Huber [Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)]
resolved conflicts for merge of
3d630e86 to master
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
The Android Automerger [Wed, 30 Nov 2011 14:46:17 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Wu-cheng Li [Wed, 30 Nov 2011 02:45:06 +0000 (18:45 -0800)]
Merge "Add camera focus move callback."
James Dong [Wed, 30 Nov 2011 01:59:29 +0000 (17:59 -0800)]
Fix the broken build
Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
Jamie Gennis [Wed, 30 Nov 2011 01:26:32 +0000 (17:26 -0800)]
am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Andreas Huber [Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)]
am
52607c53: am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
52607c5364446df6ac5b2f55cb50e146e6023a4f':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Wed, 30 Nov 2011 00:33:02 +0000 (16:33 -0800)]
am
074133b2: am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
074133b260f8d12e484e93b9aa5a33a4983b7349':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 23:14:44 +0000 (15:14 -0800)]
resolved conflicts for merge of
998a929a to master
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
Andreas Huber [Tue, 29 Nov 2011 22:12:21 +0000 (14:12 -0800)]
am
564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
* commit '
564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
Andreas Huber [Tue, 29 Nov 2011 22:12:20 +0000 (14:12 -0800)]
am
d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
* commit '
d12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
Andreas Huber [Tue, 29 Nov 2011 22:12:18 +0000 (14:12 -0800)]
am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 22:10:09 +0000 (14:10 -0800)]
am
405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '
405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 19:57:35 +0000 (11:57 -0800)]
Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug:
5553055
Wu-cheng Li [Mon, 14 Nov 2011 12:30:14 +0000 (20:30 +0800)]
Add camera focus move callback.
bug:
5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
Andreas Huber [Mon, 28 Nov 2011 20:36:11 +0000 (12:36 -0800)]
Finer granularity discontinuity support.
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.
Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug:
5553055
Andreas Huber [Tue, 29 Nov 2011 00:27:35 +0000 (16:27 -0800)]
Make sure we can properly shutdown even if
a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused
if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.
To avoid this we briefly resume the renderer just before shutting down.
Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug:
5655016
Mathias Agopian [Fri, 18 Nov 2011 01:48:35 +0000 (17:48 -0800)]
split ComposerService out of SurfaceComposerClient.h
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
Glenn Kasten [Mon, 28 Nov 2011 22:54:28 +0000 (14:54 -0800)]
Merge "Make AudioTrack a RefBase so wrappers not needed"
The Android Automerger [Mon, 28 Nov 2011 20:22:27 +0000 (12:22 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Mon, 28 Nov 2011 18:54:12 +0000 (10:54 -0800)]
If an error occurs that prevents us from reallocating buffers during a format change
we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.
Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug:
5655016
Eric Laurent [Wed, 23 Nov 2011 20:35:01 +0000 (12:35 -0800)]
am
f6422f5f: am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:32:53 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 02:50:29 +0000 (18:50 -0800)]
audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.
Issue
5553055.
Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
James Dong [Wed, 23 Nov 2011 01:36:45 +0000 (17:36 -0800)]
Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
The Android Open Source Project [Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
The Android Automerger [Tue, 22 Nov 2011 19:56:20 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Tue, 22 Nov 2011 16:43:28 +0000 (08:43 -0800)]
am
31626b30: am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
31626b3075335f4cf579342e99436bb45870cf55':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:41:04 +0000 (08:41 -0800)]
am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
cb6fbc89c25298643ab342b4a228e772b0e56978':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
Insun Kang [Tue, 22 Nov 2011 11:59:31 +0000 (20:59 +0900)]
Fix a subtitle bug: multiple blank lines in SubRip(srt) file.
TimedTextParser should handle multiple blank lines between subtitles
in SRT format.
Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
James Dong [Tue, 22 Nov 2011 05:08:55 +0000 (21:08 -0800)]
am
d0a25456: am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
d0a254566f5f0be5607b4d64839a575c888c94f6':
Fix log spamming during time lapse video recording
James Dong [Tue, 22 Nov 2011 04:29:59 +0000 (20:29 -0800)]
am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
Jamie Gennis [Tue, 22 Nov 2011 00:51:47 +0000 (16:51 -0800)]
SurfaceMediaSource: use the vid enc usage bit
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.
Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
James Dong [Sun, 20 Nov 2011 17:45:44 +0000 (09:45 -0800)]
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug:
5626569
The Android Open Source Project [Fri, 18 Nov 2011 23:42:32 +0000 (15:42 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
Marco Nelissen [Fri, 18 Nov 2011 23:35:00 +0000 (15:35 -0800)]
Marco Nelissen [Fri, 18 Nov 2011 23:10:54 +0000 (15:10 -0800)]
am
7ff7821a: am
d4b22ab4: status_t != bool
* commit '
7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Andreas Huber [Fri, 18 Nov 2011 20:22:59 +0000 (12:22 -0800)]
Report a runtime error instead of asserting on malformed avc configuration data.
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug:
5641069
Glenn Kasten [Thu, 17 Nov 2011 22:08:31 +0000 (14:08 -0800)]
Merge "Bug
5522189 re-enable ARM opts but disable inline"
Glenn Kasten [Thu, 17 Nov 2011 21:27:22 +0000 (13:27 -0800)]
Bug
5522189 re-enable ARM opts but disable inline
PIE did not work together with inlining. This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.
Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
Andreas Huber [Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)]
am
624efe45: am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Andreas Huber [Thu, 17 Nov 2011 17:07:36 +0000 (09:07 -0800)]
am
c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '
c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
Glenn Kasten [Thu, 17 Nov 2011 15:14:41 +0000 (07:14 -0800)]
Merge "MidiFile uses C++ Thread not createThreadEtc"
Glenn Kasten [Thu, 17 Nov 2011 15:14:29 +0000 (07:14 -0800)]
Merge "JetPlayer uses C++ Thread not createThreadEtc"
The Android Automerger [Thu, 17 Nov 2011 14:46:36 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]
Glenn Kasten [Fri, 24 Jun 2011 00:11:35 +0000 (17:11 -0700)]
MidiFile uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
Glenn Kasten [Thu, 23 Jun 2011 23:43:24 +0000 (16:43 -0700)]
JetPlayer uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
Glenn Kasten [Wed, 22 Jun 2011 23:15:25 +0000 (16:15 -0700)]
Bug
4903178 Restore priority and cgroup on stop
On AudioTrack and AudioRecord stop or failed start, restore the priority
and cgroup of the caller to their previous values, rather than forcing
to NORMAL. Dependent on new thread APIs.
Also fixes bug where priority was set to AUDIO but cgroup not set.
Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
Andreas Huber [Wed, 16 Nov 2011 18:46:05 +0000 (10:46 -0800)]
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
or they are lost for good.
Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug:
5544907
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
The Android Automerger [Wed, 16 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Tue, 15 Nov 2011 21:55:13 +0000 (13:55 -0800)]
Make AudioTrack a RefBase so wrappers not needed
Change-Id: I2305abe586ac41251af04a194bc818c110a1b293
Hong Teng [Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)]
am
716747f7: am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
716747f7cb29b45e41c2870f12d39095f4ed80c8':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:45:29 +0000 (09:45 -0800)]
am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:46:10 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Hong Teng [Thu, 10 Nov 2011 22:54:26 +0000 (14:54 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
Eric Laurent [Mon, 14 Nov 2011 16:41:40 +0000 (08:41 -0800)]
am
25924f8f: am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:39:33 +0000 (08:39 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
The Android Automerger [Sun, 13 Nov 2011 14:46:51 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1