OSDN Git Service
Eric Laurent [Tue, 2 Apr 2013 15:23:32 +0000 (08:23 -0700)]
am
0fb6aabf: Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev
* commit '
0fb6aabfb5edaa7687372fac1b1b7c329e7629a2':
ToneGenerator: fix overflow in stopTone
Eric Laurent [Mon, 1 Apr 2013 21:15:46 +0000 (21:15 +0000)]
Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev
Mike Lockwood [Mon, 1 Apr 2013 18:28:32 +0000 (11:28 -0700)]
am
ec24fa46: MTP: Implement date created field in GetObjectInfo
* commit '
ec24fa46443634cd29627182c5812ccf43682692':
MTP: Implement date created field in GetObjectInfo
Mike Lockwood [Mon, 1 Apr 2013 17:51:35 +0000 (10:51 -0700)]
MTP: Implement date created field in GetObjectInfo
Bug:
8293874
Change-Id: I6b74fe73362bd4fac34ca8a54e127ae91f82aef9
Lajos Molnar [Mon, 1 Apr 2013 17:32:50 +0000 (10:32 -0700)]
am
f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev
* commit '
f92300875743fca7e264c731a4e2fe9860cd1b10':
stagefright: matroska: don't crash on parsing error
Lajos Molnar [Mon, 1 Apr 2013 17:31:15 +0000 (17:31 +0000)]
Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev
The Android Open Source Project [Fri, 29 Mar 2013 16:48:53 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia951d1acc654210e90b8eb1fd30d154440117127
Andreas Huber [Thu, 28 Mar 2013 20:55:54 +0000 (13:55 -0700)]
am
31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
* commit '
31215f2f341bae9d1f6db6368b2b1539e077d571':
Fix SHUTDOWN after SETUP and before PLAY in wifi display.
Andreas Huber [Thu, 28 Mar 2013 20:54:55 +0000 (20:54 +0000)]
Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
Andreas Huber [Thu, 28 Mar 2013 20:34:10 +0000 (13:34 -0700)]
Fix SHUTDOWN after SETUP and before PLAY in wifi display.
Change-Id: Ieb8ce1ac3130254839975a3677162b64156735bc
related-to-bug:
8499893
Eric Laurent [Thu, 28 Mar 2013 18:58:45 +0000 (11:58 -0700)]
ToneGenerator: fix overflow in stopTone
Fix overflow in tone duration calculation introduced in
commit
681be039.
Bug
6607077
Change-Id: Ie12f13701345c2b2d3be0b3c4d71cbfa2394a29b
Andreas Huber [Thu, 28 Mar 2013 18:23:56 +0000 (11:23 -0700)]
am
d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
* commit '
d0b1fac13ead06231dcc0782d137d117e02d634e':
Make sure resume() and flush() are handled appropriately even if the codec
Andreas Huber [Thu, 28 Mar 2013 18:21:11 +0000 (18:21 +0000)]
Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
Andreas Huber [Thu, 28 Mar 2013 18:16:43 +0000 (11:16 -0700)]
Make sure resume() and flush() are handled appropriately even if the codec
is in Idle->Executing state.
Change-Id: I16a10791fae0e062a19299732c472cc93e4ed971
related-to-bug:
8347958
Marco Nelissen [Thu, 28 Mar 2013 16:18:59 +0000 (09:18 -0700)]
am
5952255a: Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev
* commit '
5952255a0259882cc32ee6e98018ced679303724':
Fix valgrind error in software h264 decoder
Marco Nelissen [Thu, 28 Mar 2013 16:15:14 +0000 (16:15 +0000)]
Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:10:53 +0000 (09:10 -0700)]
am
636a5bd6: Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev
* commit '
636a5bd65bacb86dff10b6393a4776046254aa13':
Camera: Add output side to camera3 HAL device
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:36 +0000 (09:07 -0700)]
am
3a1d8b51: Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev
* commit '
3a1d8b515fcfcf27b4b04bd677429a7ce2db6bcb':
Camera: Add input side to camera3 HAL device
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:35 +0000 (09:07 -0700)]
am
8fc405ff: Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev
* commit '
8fc405fffb69cad88cfd8ee09130220f31ad28e2':
Camera: Add streams to camera3 HAL device
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:16 +0000 (16:07 +0000)]
Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:06:21 +0000 (16:06 +0000)]
Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:06:11 +0000 (16:06 +0000)]
Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev
Marco Nelissen [Thu, 28 Mar 2013 15:57:38 +0000 (08:57 -0700)]
am
d6a6bf3f: Merge "Fix valgrind error." into jb-mr2-dev
* commit '
d6a6bf3f29bfa86a02e33eabf041e6ec136308af':
Fix valgrind error.
Marco Nelissen [Thu, 28 Mar 2013 15:55:38 +0000 (15:55 +0000)]
Merge "Fix valgrind error." into jb-mr2-dev
The Android Automerger [Thu, 28 Mar 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Lajos Molnar [Thu, 28 Mar 2013 02:04:12 +0000 (19:04 -0700)]
stagefright: matroska: don't crash on parsing error
MatroskaExtractor crashed with an assertion if mkvparser::ParseNext()
returned a negative number. Now handle all error values the same
way as the EOF.
Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8433794
Eric Laurent [Thu, 28 Mar 2013 01:19:26 +0000 (18:19 -0700)]
am
681be039: ToneGenerator: fix truncated tones
* commit '
681be0398a06da7e24db4ed934a92af64d1409b1':
ToneGenerator: fix truncated tones
Eric Laurent [Wed, 27 Mar 2013 19:05:40 +0000 (12:05 -0700)]
ToneGenerator: fix truncated tones
The first DTMF tone after a silent period is truncated.
This is because the phone app starts and stops the tone
when the user presses and releases the key.
This combined to the fact that the tones use the low latency path
and that when the output stream exists standby there is a period
of several milliseconds during which no audio is mixed until the
stream is "warmed up".
The result is that much less audio is generated than the actual
key press duration.
The fix consists in storing the tone start time and making sure that
the number of samples generated corresponds at least to the time difference
between the tone start and stop commands.
Bug
6607077
Change-Id: I070d20dd8600c25a9e5d5a60c1d3313b7917b00d
Eric Laurent [Thu, 28 Mar 2013 00:29:53 +0000 (17:29 -0700)]
am
2d595c0e: Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev
* commit '
2d595c0efc0eee9e0c94f4842c6fed07c19163c1':
ToneGenerator: fix stop/destroy concurrency
Eric Laurent [Thu, 28 Mar 2013 00:24:50 +0000 (00:24 +0000)]
Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev
Eino-Ville Talvala [Mon, 11 Mar 2013 21:13:50 +0000 (14:13 -0700)]
Camera: Add output side to camera3 HAL device
- Notifications
- Result queue and processing
Change-Id: Id6b4746708ce6c6dcc7262666b6ac3130fa3d225
Eino-Ville Talvala [Thu, 28 Feb 2013 02:02:26 +0000 (18:02 -0800)]
Camera: Add input side to camera3 HAL device
- Stream creation/deletion
- Request submission
- Request thread loop
- Add get() to CameraMetadata to allow HAL submission while retaining
ownership.
Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
Eino-Ville Talvala [Thu, 7 Mar 2013 00:20:06 +0000 (16:20 -0800)]
Camera: Add streams to camera3 HAL device
- Generic stream interface
- Functional output stream
- Skeleton input/zsl stream
Change-Id: I143794eac1a2217031d62b51912662fc6d1db900
Marco Nelissen [Wed, 27 Mar 2013 23:44:54 +0000 (16:44 -0700)]
Fix valgrind error in software h264 decoder
h264bsdNextMbAddress could read past the end of an allocation, which
could conceivably result in a segfault if the allocation was at the
very end of a page.
Change-Id: Id7a0c5733d66e609f36feb0e15b2d67b9bbc0b4d
Igor Murashkin [Wed, 27 Mar 2013 22:44:57 +0000 (15:44 -0700)]
am
ad065d38: Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
* commit '
ad065d38daace14281801127bd447114b7b4daa5':
Camera: Add hotplug support (for fixed # of cameras)
Igor Murashkin [Wed, 27 Mar 2013 22:43:14 +0000 (22:43 +0000)]
Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
Marco Nelissen [Wed, 27 Mar 2013 20:48:36 +0000 (13:48 -0700)]
Fix valgrind error.
The constructor calls reset(), which in turn calls stop(), which then
accesses mCaptureTimeLapse before it has been initialized.
Change-Id: Ia94ac740b9bd1a0389c72647a5639dd25320d92c
Igor Murashkin [Wed, 27 Mar 2013 18:26:47 +0000 (11:26 -0700)]
am
bdeaccfd: Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev
* commit '
bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5':
ProCamera: Fix memory leak in consumeFrameMetadata
Igor Murashkin [Wed, 27 Mar 2013 18:24:37 +0000 (18:24 +0000)]
Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev
Igor Murashkin [Wed, 27 Mar 2013 18:07:06 +0000 (11:07 -0700)]
ProCamera: Fix memory leak in consumeFrameMetadata
Bug:
8402301
Change-Id: I975990185f45bb8552712271b9ac457af08a170c
The Android Automerger [Wed, 27 Mar 2013 12:55:50 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Wed, 20 Mar 2013 22:56:31 +0000 (15:56 -0700)]
Camera: Add hotplug support (for fixed # of cameras)
* Minor: also change addListener to fire the current status upon subscription
* Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated
Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
Eric Laurent [Tue, 26 Mar 2013 23:37:19 +0000 (16:37 -0700)]
ToneGenerator: fix stop/destroy concurrency
There is a problem if the stopTone() method is called
from two different threads (for instance if the destructor is called
while stopTone() is waiting for the audio callback to finish).
In this case, the second call to stopTone() will not wait for the
condition to be signaled and call clearWaveGens() while the callback
can still be active, thus causing a crash.
There is a similar problem in case of concurrent calls to startTone()
and stopTone().
The fix consists in making sure that stopTone() always waits for call
back completion or timeout and exits before calling clearWaveGens()
if a concurrent start request is detected.
Bug
8163071
Change-Id: I9ddb4390407701dcad5bf83660fd9903f0d72268
Glenn Kasten [Tue, 26 Mar 2013 22:46:20 +0000 (15:46 -0700)]
am
4b6ed7f2: Merge "media.log dump" into jb-mr2-dev
* commit '
4b6ed7f255b696d1555ce71633ea08c961ec51dd':
media.log dump
Glenn Kasten [Tue, 26 Mar 2013 22:43:00 +0000 (22:43 +0000)]
Merge "media.log dump" into jb-mr2-dev
Glenn Kasten [Tue, 26 Mar 2013 22:09:04 +0000 (15:09 -0700)]
media.log dump
Bug:
8446008
Change-Id: Ia47b204f5c4c91b99591eec5420a25a3dc8e7631
Andreas Huber [Tue, 26 Mar 2013 21:59:16 +0000 (14:59 -0700)]
am
4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev
* commit '
4fc3e841358164a661c78f78bc617f5ac879aa35':
Adapt frame rate instead of keeping that constant and tweaking bitrate
Andreas Huber [Tue, 26 Mar 2013 21:57:28 +0000 (21:57 +0000)]
Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev
Andreas Huber [Tue, 26 Mar 2013 20:52:43 +0000 (13:52 -0700)]
Adapt frame rate instead of keeping that constant and tweaking bitrate
Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
Eric Laurent [Tue, 26 Mar 2013 19:40:43 +0000 (12:40 -0700)]
am
6386b50b: ToneGenerator: fix AudioTrack pointer init
* commit '
6386b50b67185a966d43ee761acdfe7add569d10':
ToneGenerator: fix AudioTrack pointer init
Eric Laurent [Tue, 26 Mar 2013 19:25:30 +0000 (12:25 -0700)]
ToneGenerator: fix AudioTrack pointer init
The pointer to AudioTrack should be initialized before
early return from ToneGenerator constructor because
it is tested by the destructor.
Bug
8140963
Change-Id: I9a7dfb60ba162b75dfaa5630ab7fc9485afd0074
The Android Open Source Project [Tue, 26 Mar 2013 17:49:21 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If7f39233ef7f924e88683aa3fbb7d4e99ab30a4c
Andreas Huber [Tue, 26 Mar 2013 17:43:59 +0000 (10:43 -0700)]
am
cd77d4a1: Identify network servers and clients with a OS version related string
* commit '
cd77d4a1d38b7609a03f6826a1ff5fa7c98aa34f':
Identify network servers and clients with a OS version related string
Andreas Huber [Tue, 26 Mar 2013 17:19:24 +0000 (10:19 -0700)]
Identify network servers and clients with a OS version related string
and put the logic to create that string in one location instead of many...
Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
Andreas Huber [Tue, 26 Mar 2013 16:11:09 +0000 (16:11 +0000)]
am
5d014f0f: Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev
* commit '
5d014f0fb4f7f20ed2f35a3c856b2d4e356f0beb':
In "special" mode we now establish a UDP RTCP channel in addition to the
Andreas Huber [Tue, 26 Mar 2013 16:08:49 +0000 (16:08 +0000)]
Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev
The Android Automerger [Tue, 26 Mar 2013 12:55:34 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Eric Laurent [Tue, 26 Mar 2013 00:28:42 +0000 (00:28 +0000)]
am
19c11e1c: Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev
* commit '
19c11e1c854ae3c20bacf66fbb20d53dcdb8d100':
ToneGenerator: optimize silent tone
Eric Laurent [Tue, 26 Mar 2013 00:27:06 +0000 (00:27 +0000)]
Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev
Andreas Huber [Mon, 25 Mar 2013 22:46:52 +0000 (15:46 -0700)]
In "special" mode we now establish a UDP RTCP channel in addition to the
TCP RTP channel and provide feedback on the latency of arriving packets from
the sink back to the source. This information is then used to throttle
video bitrate.
Change-Id: Ic589a3cb65e4893a3ff67de947da6063d32a1c6e
Andreas Huber [Mon, 25 Mar 2013 22:49:10 +0000 (22:49 +0000)]
am
112c72a9: Merge "Get rid of TunnelRenderer" into jb-mr2-dev
* commit '
112c72a9655c0d2fa3a8058e2a6c3bef6adb6232':
Get rid of TunnelRenderer
Andreas Huber [Mon, 25 Mar 2013 22:46:43 +0000 (22:46 +0000)]
Merge "Get rid of TunnelRenderer" into jb-mr2-dev
Eric Laurent [Mon, 25 Mar 2013 21:38:10 +0000 (14:38 -0700)]
ToneGenerator: optimize silent tone
Do not create an AudioTrack and start playback when a silent
tone is requested to ToneGenerator.
Bug
7946399
Change-Id: Ib9282871a56f7a862af7d1504ce3fbd7c18e34e2
Andreas Huber [Mon, 25 Mar 2013 21:15:24 +0000 (14:15 -0700)]
Get rid of TunnelRenderer
Change-Id: I40dc00e2e689d7a6b8717ce524016c2948229807
Andreas Huber [Mon, 25 Mar 2013 20:46:47 +0000 (20:46 +0000)]
am
bd91c0ab: Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev
* commit '
bd91c0abea8b0b43345c705b56d10e61ac7d0876':
Misc debugging support and handling of latency changes.
Andreas Huber [Mon, 25 Mar 2013 20:43:00 +0000 (20:43 +0000)]
Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev
Andreas Huber [Mon, 25 Mar 2013 20:25:39 +0000 (13:25 -0700)]
Misc debugging support and handling of latency changes.
Change-Id: I682944f793690842219cf1adbae5e61e061b6b62
Jeff Tinker [Mon, 25 Mar 2013 20:19:37 +0000 (20:19 +0000)]
am
351f28e2: Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
* commit '
351f28e2e71bef7fab42ec36150b7973fd4ef139':
Load crypto plugins from additional shared libraries
Jeff Tinker [Mon, 25 Mar 2013 20:18:02 +0000 (20:18 +0000)]
Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
Andreas Huber [Mon, 25 Mar 2013 17:38:50 +0000 (17:38 +0000)]
am
09bfd026: Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev
* commit '
09bfd026b9f4fe004cba05e2eaf2dee38913bc7e':
Separate the mode of the RTP and RTCP channels.
Andreas Huber [Mon, 25 Mar 2013 17:37:25 +0000 (17:37 +0000)]
Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev
Andreas Huber [Fri, 22 Mar 2013 16:56:29 +0000 (09:56 -0700)]
Separate the mode of the RTP and RTCP channels.
I now can use a TCP reliable data channel with a UDP back channel.
Change-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb
Andreas Huber [Mon, 25 Mar 2013 17:25:52 +0000 (17:25 +0000)]
am
2850e418: Merge "Ensure that the payload in each TS packet is an even multiple of 16 bytes long" into jb-mr2-dev
* commit '
2850e41813c2bfaf199fefc990d7ec91551a9460':
Ensure that the payload in each TS packet is an even multiple of 16 bytes long
Andreas Huber [Mon, 25 Mar 2013 17:24:23 +0000 (17:24 +0000)]
Merge "Ensure that the payload in each TS packet is an even multiple of 16 bytes long" into jb-mr2-dev
The Android Automerger [Mon, 25 Mar 2013 12:55:53 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Jeff Tinker [Fri, 22 Mar 2013 22:26:39 +0000 (15:26 -0700)]
Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.
Change-Id: I7f6638f29171f91609fc2d944396365568630b56
Igor Murashkin [Fri, 22 Mar 2013 00:47:59 +0000 (00:47 +0000)]
am
a97d15e2: Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
* commit '
a97d15e2e2f0b317a345d3a6f02df80b8988b1f6':
ICameraServiceListener.h: Add STATUS_ENUMERATING enum
Igor Murashkin [Fri, 22 Mar 2013 00:45:55 +0000 (00:45 +0000)]
Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
Igor Murashkin [Mon, 18 Mar 2013 20:36:48 +0000 (13:36 -0700)]
ICameraServiceListener.h: Add STATUS_ENUMERATING enum
Change-Id: I41a9f358f63a19e7b746a9ccf24722001e5e7475
Igor Murashkin [Thu, 21 Mar 2013 21:03:01 +0000 (21:03 +0000)]
am
3f9cc191: Merge changes Ic92924ce,I53107a39 into jb-mr2-dev
* commit '
3f9cc191867e79fccb4b8cca7e2a38e1b2c225b1':
Camera2: getSceneMode should return NULL when there are no supported scene modes
commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
Igor Murashkin [Thu, 21 Mar 2013 20:58:29 +0000 (20:58 +0000)]
Merge changes Ic92924ce,I53107a39 into jb-mr2-dev
* changes:
Camera2: getSceneMode should return NULL when there are no supported scene modes
commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
Andreas Huber [Thu, 21 Mar 2013 18:35:48 +0000 (11:35 -0700)]
Ensure that the payload in each TS packet is an even multiple of 16 bytes long
(except for the final TS packet) as specified by HDCP.
Change-Id: I45d49d347c06f5daae310f196d9a8484be0f3ca0
related-to-bug:
7549145
Igor Murashkin [Thu, 21 Mar 2013 18:19:00 +0000 (11:19 -0700)]
Camera2: getSceneMode should return NULL when there are no supported scene modes
Bug:
8444806
Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546
Ziv Hendel [Thu, 21 Mar 2013 01:25:32 +0000 (03:25 +0200)]
commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL.
This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
Change-Id: I53107a3958d541c25930b81eda638d4b6a394254
Signed-off-by: Igor Murashkin <iam@google.com>
The Android Automerger [Thu, 21 Mar 2013 12:55:24 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
ztenghui [Wed, 20 Mar 2013 17:03:32 +0000 (17:03 +0000)]
am
9e36b5a5: Merge "Add the presentation rotation support" into jb-mr2-dev
* commit '
9e36b5a5c630c303b5007fdeb5c0df83b953adf4':
Add the presentation rotation support
ztenghui [Wed, 20 Mar 2013 17:00:50 +0000 (17:00 +0000)]
Merge "Add the presentation rotation support" into jb-mr2-dev
Jeff Tinker [Wed, 20 Mar 2013 16:53:15 +0000 (16:53 +0000)]
am
de5cdcae: Merge "Implementing MediaDrm APIs" into jb-mr2-dev
* commit '
de5cdcae51d3afd9b14e818087be14288c0c6b8c':
Implementing MediaDrm APIs
Jeff Tinker [Wed, 20 Mar 2013 16:48:54 +0000 (16:48 +0000)]
Merge "Implementing MediaDrm APIs" into jb-mr2-dev
The Android Open Source Project [Wed, 20 Mar 2013 16:32:32 +0000 (09:32 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I4e399f8f0b110b7b46c6cf6a65fdc908acb4f9ce
The Android Automerger [Wed, 20 Mar 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Andreas Huber [Tue, 19 Mar 2013 21:33:18 +0000 (21:33 +0000)]
am
96954c00: Merge "Change ANetworkSession implementation to optionally attach timestamps" into jb-mr2-dev
* commit '
96954c00cc8887f216ba84e126ab4a1100f348b4':
Change ANetworkSession implementation to optionally attach timestamps
Andreas Huber [Tue, 19 Mar 2013 21:33:17 +0000 (21:33 +0000)]
am
106f1628: Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev
* commit '
106f1628b849f733046f1da25e4c8222676288b0':
Allow for streaming of media files (without recompression)
Andreas Huber [Tue, 19 Mar 2013 21:29:51 +0000 (21:29 +0000)]
Merge "Change ANetworkSession implementation to optionally attach timestamps" into jb-mr2-dev
Andreas Huber [Tue, 19 Mar 2013 21:29:39 +0000 (21:29 +0000)]
Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev
Marco Nelissen [Tue, 19 Mar 2013 17:26:34 +0000 (17:26 +0000)]
am
b8a1a843: Merge "Fix valgrind error" into jb-mr2-dev
* commit '
b8a1a843fef294efb59ca404e7b55994036a15e2':
Fix valgrind error
Marco Nelissen [Tue, 19 Mar 2013 17:24:04 +0000 (17:24 +0000)]
Merge "Fix valgrind error" into jb-mr2-dev
Marco Nelissen [Tue, 19 Mar 2013 16:57:29 +0000 (09:57 -0700)]
Fix valgrind error
The volume member of the BundledEffectContext class was not being
initialized, resulting in uninitialized data being used for calculations
and control flow.
Change-Id: I84bf9fd478e5d0479e781323b21c7c03dea958c5
The Android Automerger [Tue, 19 Mar 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Andreas Huber [Mon, 18 Mar 2013 22:11:40 +0000 (15:11 -0700)]
Change ANetworkSession implementation to optionally attach timestamps
to fragments of data to be transferred and to log statistics when data
is finally submitted to the POSIX layer.
Change-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01