OSDN Git Service
Andy Hung [Mon, 23 Jun 2014 16:44:53 +0000 (16:44 +0000)]
Merge "Add test-mixer AudioMixer test program"
Andy Hung [Tue, 17 Jun 2014 22:10:51 +0000 (15:10 -0700)]
Add test-mixer AudioMixer test program
The shell script mixer_to_wav_tests.sh shows how to use
test-mixer.
Change-Id: Ia7f1a368972c9c33fadc96df4cb1fc8b22446c8c
Yin-Chia Yeh [Wed, 18 Jun 2014 17:51:34 +0000 (10:51 -0700)]
Camera2: get stream configs by device verison
Starting from device version 3.2, the following tags:
ANDROID_SCALER_AVAILABLE_FORMATS
ANDROID_SCALER_AVAILABLE_JPEG_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_JPEG_SIZES
ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES
ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_RAW_SIZES
are deprecated and replaced by:
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS
Change-Id: Iadc34af0ea985a16a25759d7a9a3eb4845c486fd
Mark Salyzyn [Fri, 20 Jun 2014 21:59:17 +0000 (21:59 +0000)]
Merge "libeffects: 64-bit compile warnings"
Mark Salyzyn [Fri, 20 Jun 2014 20:29:08 +0000 (13:29 -0700)]
libeffects: 64-bit compile warnings
Change-Id: I210129f5742b046f7ceef48194f039352eff596d
Yin-Chia Yeh [Fri, 20 Jun 2014 21:57:51 +0000 (21:57 +0000)]
Merge "Camera2: Fix lastFrameNumber counter in flush case"
Yin-Chia Yeh [Fri, 13 Jun 2014 21:53:05 +0000 (14:53 -0700)]
Camera2: Fix lastFrameNumber counter in flush case
Decrement the counter for those repeating requests never
sent to device.
Change-Id: I2064e51cb5d509d86dbde4a89e8157de33f574b0
Zhijun He [Fri, 20 Jun 2014 21:50:17 +0000 (21:50 +0000)]
Merge "Camera2/3: Don't release recording buffer when stream is active"
Mark Salyzyn [Wed, 18 Jun 2014 23:33:43 +0000 (16:33 -0700)]
libcameraservice: 64-bit compile warnings
Change-Id: I168332a0d4699f6f5597d4883342aa7af7ed92c6
Mark Salyzyn [Wed, 18 Jun 2014 23:33:15 +0000 (16:33 -0700)]
audiopolicy: 64-bit compile warnings
Change-Id: I71db11499c4b0c434df8144c633d42282f5823c2
Mark Salyzyn [Fri, 20 Jun 2014 21:32:59 +0000 (21:32 +0000)]
Merge "libnbaio: 64-bit compile warnings"
Mark Salyzyn [Fri, 20 Jun 2014 21:07:06 +0000 (21:07 +0000)]
Merge "libmediaplayerservice: 64-bit compile warnings"
Jeff Tinker [Fri, 20 Jun 2014 20:45:14 +0000 (20:45 +0000)]
Merge "Fix Externally reported security issue"
Eino-Ville Talvala [Fri, 20 Jun 2014 19:56:38 +0000 (19:56 +0000)]
am
7f76c502: (-s ours) am
06508824: am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
7f76c50257f131cb26c1c21ede2622cb7ad534bf':
DO NOT MERGE: CameraService: Fix permissions check issues
Eino-Ville Talvala [Fri, 20 Jun 2014 19:48:21 +0000 (19:48 +0000)]
am
06508824: am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
06508824dc699c566bc4ffbd816b2227fba15379':
DO NOT MERGE: CameraService: Fix permissions check issues
Mark Salyzyn [Wed, 18 Jun 2014 23:32:00 +0000 (16:32 -0700)]
libnbaio: 64-bit compile warnings
Change-Id: I9517c32193031dcc7af7b2104e985d66805b84aa
Mark Salyzyn [Wed, 18 Jun 2014 23:31:32 +0000 (16:31 -0700)]
libmediaplayerservice: 64-bit compile warnings
Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
Jeff Tinker [Tue, 17 Jun 2014 23:45:46 +0000 (16:45 -0700)]
Fix Externally reported security issue
bug:
12724697
Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
Igor Murashkin [Fri, 20 Jun 2014 18:49:55 +0000 (18:49 +0000)]
Merge "camera: Let #connectLegacy calls through with unspecified HAL version"
Igor Murashkin [Fri, 20 Jun 2014 18:27:03 +0000 (11:27 -0700)]
camera: Let #connectLegacy calls through with unspecified HAL version
This enables the camera2 shim to open a camera1 device without
turning the error codes into a RuntimeException.
Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
Andy Hung [Fri, 20 Jun 2014 16:22:28 +0000 (16:22 +0000)]
Merge "Extract out test utility functions from resampler_tests"
Mark Salyzyn [Wed, 18 Jun 2014 23:30:56 +0000 (16:30 -0700)]
libmedia: 64-bit compile warnings
Change-Id: I600f062fa7148c01851023c1240c39939e648002
Eino-Ville Talvala [Thu, 19 Jun 2014 23:33:15 +0000 (23:33 +0000)]
am
f0d8468d: DO NOT MERGE: CameraService: Fix permissions check issues
* commit '
f0d8468dcec08e1ac4edf62ec7da5782a0b84d93':
DO NOT MERGE: CameraService: Fix permissions check issues
Zhijun He [Thu, 19 Jun 2014 23:27:56 +0000 (23:27 +0000)]
Merge "cameraservice: Implement HAL1 and higher HAL API coexistence"
Zhijun He [Mon, 16 Jun 2014 23:38:35 +0000 (16:38 -0700)]
cameraservice: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.
Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
Mark Salyzyn [Wed, 18 Jun 2014 23:30:26 +0000 (16:30 -0700)]
screenrecord: 64-bit compile warnings
Change-Id: I708e48e24719b2c4bb023069164aafd4c2ad639b
Eric Laurent [Tue, 10 Jun 2014 00:22:27 +0000 (17:22 -0700)]
AudioTrack: add support for compressed audio
Add support for compressed audio playback by use
of an AudioTrack attached to a direct output thread.
Bug:
9428304.
Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
Andy Hung [Tue, 17 Jun 2014 21:33:39 +0000 (14:33 -0700)]
Extract out test utility functions from resampler_tests
These will be used for mixer tests later.
Change-Id: I22b1c89857058cfb2450afe15e80d6c9306a31f1
Zhijun He [Wed, 18 Jun 2014 18:43:02 +0000 (11:43 -0700)]
Camera2/3: Don't release recording buffer when stream is active
It is dangerous to release all recording buffers when recording stream is
actively sending buffer to encoder. This change only releases all buffers when
recording stream is idle and recording stream is about to start.
Bug:
15667833
Change-Id: Ia4a84cac84a2062c13333467c66698273ffb0e23
Jean-Michel Trivi [Thu, 19 Jun 2014 15:33:55 +0000 (15:33 +0000)]
Merge changes I0fef0584,I322b91fa
* changes:
AudioPolicyManager: return output for audio attributes
AudioTrack construction with audio attributes
Jean-Michel Trivi [Fri, 13 Jun 2014 23:06:54 +0000 (16:06 -0700)]
AudioPolicyManager: return output for audio attributes
In AudioPolicyManager, support querying an output
or playback strategy for audio attributes,
instead of a stream type,
In AudioTrack creation, use the output returned
for the track's attributes.
Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
Jean-Michel Trivi [Wed, 11 Jun 2014 23:55:06 +0000 (16:55 -0700)]
AudioTrack construction with audio attributes
Store audio attributes in AudioTrack class.
When an AudioTrack is "set" with non null audio
attributes, derive a stream type that reflects
the attributes.
When an AudioTrack is "set" without attributes,
and only has a stream type, derive default
audio attributes.
Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
Marco Nelissen [Wed, 18 Jun 2014 14:52:11 +0000 (14:52 +0000)]
Merge "Fail more gracefully on allocation failure"
Marco Nelissen [Fri, 13 Jun 2014 21:13:44 +0000 (14:13 -0700)]
Fail more gracefully on allocation failure
Check allocations when the size is read from a file and might therefore
be invalid.
b/
14388161
Change-Id: Ia08cc0a6107f275a70e793ef3b50c0ce16ceeee0
Igor Murashkin [Tue, 17 Jun 2014 22:55:54 +0000 (22:55 +0000)]
Merge "camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService"
Igor Murashkin [Tue, 17 Jun 2014 19:03:20 +0000 (12:03 -0700)]
camera: Add #getLegacyParameters, #supportsCameraApi to ICameraService
Change-Id: Ic86c8df3d703e7cf89caa856387e2c0a1b977401
Eino-Ville Talvala [Tue, 17 Jun 2014 02:21:12 +0000 (19:21 -0700)]
CameraService: Fix permissions check issues
Bug:
15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Eino-Ville Talvala [Tue, 17 Jun 2014 02:21:12 +0000 (19:21 -0700)]
DO NOT MERGE: CameraService: Fix permissions check issues
Bug:
15677063
Change-Id: I012c111fff90fefd9eb0fef7c9d6034f00c9c6df
Marco Nelissen [Mon, 16 Jun 2014 22:10:47 +0000 (22:10 +0000)]
Merge "Fix logging"
Glenn Kasten [Mon, 16 Jun 2014 21:57:26 +0000 (21:57 +0000)]
am
a3603693: Merge "Fix deadlock" into lmp-preview-dev
* commit '
a3603693fb784d7e1a820ee4629a69730a0bb424':
Fix deadlock
Glenn Kasten [Mon, 16 Jun 2014 21:52:27 +0000 (21:52 +0000)]
Merge "Fix deadlock" into lmp-preview-dev
Glenn Kasten [Mon, 16 Jun 2014 17:25:20 +0000 (10:25 -0700)]
Fix deadlock
Bug:
15591052
Change-Id: I76154e1640646d2ae8fae65e163e1f3ed1be17dc
Ruben Brunk [Mon, 16 Jun 2014 20:41:38 +0000 (20:41 +0000)]
Merge "camera2: Add jpeg sizes to legacy mode static characteristics."
Chong Zhang [Mon, 16 Jun 2014 18:13:39 +0000 (18:13 +0000)]
Merge "support for CEA-608 closed caption"
Marco Nelissen [Tue, 10 Jun 2014 21:24:40 +0000 (14:24 -0700)]
Fix logging
Make the log message specify whether it was an encoder or a decoder
that failed to instantiate.
Change-Id: Ie357775114c8dea722d87381c13affdfb19dcde4
Chong Zhang [Wed, 11 Jun 2014 21:49:23 +0000 (14:49 -0700)]
support for CEA-608 closed caption
Bug:
15470448
Change-Id: Ic6a527f5c35a8ee0a08a5b043336e4d193216083
Chong Zhang [Wed, 11 Jun 2014 21:45:31 +0000 (14:45 -0700)]
refactor getTrackInfo()
(this is in preparation for supporting other cc source)
- split into two methods: getTrackCount() and getTrackInfo()
- move track info parcelling to NuPlayer
- parcel in the mime type of the subtitle format
Bug:
15470448
Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
Eric Laurent [Fri, 13 Jun 2014 01:38:45 +0000 (18:38 -0700)]
force command flush after releasing a reference to shared memory
After releasing a reference to a shared memory interface,
IPCThreadState::self()->flushCommands() must be called to ensure
that the corresponding reference is also cleared immediately in the
remote process. Otherwise the binder implementaiton will not
push the clear systematically causing the memory region not to be freed.
See issues
10711502 and
2801375.
Bug:
14057166.
Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
Elliott Hughes [Fri, 13 Jun 2014 15:38:03 +0000 (15:38 +0000)]
am
6bf02664: am
ccaffa8d: Merge "Use char x[] rather than char x[0]."
* commit '
6bf02664bbe4955d4818fe308b00ce0d97f38c8f':
Use char x[] rather than char x[0].
Elliott Hughes [Fri, 13 Jun 2014 15:34:16 +0000 (15:34 +0000)]
am
ccaffa8d: Merge "Use char x[] rather than char x[0]."
* commit '
ccaffa8df0e201da6bfabb6d616e62904cfb5534':
Use char x[] rather than char x[0].
Narayan Kamath [Fri, 13 Jun 2014 10:32:15 +0000 (10:32 +0000)]
am
ba7a4e11: am
90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"
* commit '
ba7a4e11a66a7044dbbd767983865e1774092dc6':
Remove dependency on Parcel::{read,write}IntPtr
Narayan Kamath [Fri, 13 Jun 2014 10:32:14 +0000 (10:32 +0000)]
am
8b8e5d45: (-s ours) resolved conflicts for merge of
cbd74fcb to klp-modular-dev-plus-aosp
* commit '
8b8e5d45928aed8592d321fe55f560e35a4fece8':
Update OMX messages for 64 bit
Narayan Kamath [Fri, 13 Jun 2014 10:22:28 +0000 (10:22 +0000)]
am
90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"
* commit '
90732a3be5e70156486aca94bde8aa81106329ba':
Remove dependency on Parcel::{read,write}IntPtr
Narayan Kamath [Fri, 13 Jun 2014 10:19:14 +0000 (11:19 +0100)]
resolved conflicts for merge of
cbd74fcb to klp-modular-dev-plus-aosp
Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
Ruben Brunk [Fri, 13 Jun 2014 02:11:45 +0000 (19:11 -0700)]
camera2: Add jpeg sizes to legacy mode static characteristics.
Bug:
15116722
- Adds jpeg size mapping to available output formats.
Change-Id: I73e46dd4309767ba41156d9ba03c4724bf234758
Elliott Hughes [Fri, 13 Jun 2014 15:27:25 +0000 (15:27 +0000)]
Merge "Use char x[] rather than char x[0]."
Elliott Hughes [Fri, 13 Jun 2014 01:17:11 +0000 (18:17 -0700)]
Use char x[] rather than char x[0].
Bug:
15514223
Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f
Chong Zhang [Mon, 16 Jun 2014 18:11:22 +0000 (18:11 +0000)]
Merge "refactor getTrackInfo()"
Bryant Liu [Thu, 12 Jun 2014 14:02:41 +0000 (22:02 +0800)]
frameworks: av: fix bug in the volume management
which can cause volume levels to be applied twice. After applying volume
in the effect chain, the remaining volume needs to be converted back to
floating point before providing to mAudioMixer.
Bug:
15583440
Change-Id: I3c884f95b0fa9ad1b554285b069601c850c54776
Signed-off-by: Glenn Kasten <gkasten@google.com>
Jean-Michel Trivi [Fri, 13 Jun 2014 21:37:58 +0000 (21:37 +0000)]
Merge "AudioSystem: remove unused stream type"
Eric Laurent [Fri, 13 Jun 2014 19:20:41 +0000 (19:20 +0000)]
am
3bcffa13: force command flush after releasing a reference to shared memory
* commit '
3bcffa136909c1fb6e88ee4efd12ccac18360a85':
force command flush after releasing a reference to shared memory
Elliott Hughes [Thu, 12 Jun 2014 00:15:39 +0000 (00:15 +0000)]
am
2a8270e6: am
c323737d: Merge "Offer a type-safe album art interface."
* commit '
2a8270e6944fb3addfcba87f6885aaad196b8b88':
Offer a type-safe album art interface.
Elliott Hughes [Thu, 12 Jun 2014 00:06:25 +0000 (00:06 +0000)]
am
c323737d: Merge "Offer a type-safe album art interface."
* commit '
c323737dd46d724b4c1ec230b283f26ae2a22b4f':
Offer a type-safe album art interface.
Glenn Kasten [Thu, 12 Jun 2014 00:03:41 +0000 (00:03 +0000)]
am
0ac53364: Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into lmp-preview-dev
* commit '
0ac53364b79dc72ee0c09f0efc46a22ab4374dbf':
Fix non-monotonic AudioTrack::getTimestamp after pause
Andy Hung [Thu, 12 Jun 2014 00:03:35 +0000 (00:03 +0000)]
am
421c34ef: Merge "Update resampler to fetch exactly the frames needed" into lmp-preview-dev
* commit '
421c34ef58f89f4cc39737118bb58b762e84e1c9':
Update resampler to fetch exactly the frames needed
Christopher Ferris [Wed, 11 Jun 2014 19:20:18 +0000 (12:20 -0700)]
resolved conflicts for merge of
281b884c to master
Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef
Jean-Michel Trivi [Wed, 11 Jun 2014 17:05:30 +0000 (10:05 -0700)]
AudioSystem: remove unused stream type
The audio stream type is not used in the getSampleRate() and
getFrameCount() methods.
Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
Narayan Kamath [Fri, 13 Jun 2014 08:55:13 +0000 (08:55 +0000)]
Merge "Update OMX messages for 64 bit"
Andy Hung [Fri, 2 May 2014 18:05:04 +0000 (11:05 -0700)]
Update OMX messages for 64 bit
Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.
Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
Elliott Hughes [Wed, 11 Jun 2014 23:59:18 +0000 (23:59 +0000)]
Merge "Offer a type-safe album art interface."
Elliott Hughes [Tue, 10 Jun 2014 23:55:38 +0000 (16:55 -0700)]
Offer a type-safe album art interface.
Bug:
15514223
Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
Christopher Ferris [Tue, 10 Jun 2014 23:46:41 +0000 (23:46 +0000)]
am
8d6d8f54: Merge "Add libcrypto for users of libstagefright."
* commit '
8d6d8f546c1d6c55b79b454c720c03a80c738444':
Add libcrypto for users of libstagefright.
Christopher Ferris [Tue, 10 Jun 2014 23:42:20 +0000 (23:42 +0000)]
Merge "Add libcrypto for users of libstagefright."
Christopher Ferris [Tue, 10 Jun 2014 22:15:04 +0000 (15:15 -0700)]
Add libcrypto for users of libstagefright.
libstagefright_rtsp uses some MD5 functions that used to be in bionic,
but it was removed recently. As an initial fix, I statically linked in
libcrypto_static to the libstagefright_rtsp library. However, I think
it's better to modify the single user of this library to link against
the shared libcrypto library.
Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
Chong Zhang [Wed, 11 Jun 2014 18:26:07 +0000 (18:26 +0000)]
Merge "Log an error when audio/video encoder failed to create"
Mark Salyzyn [Wed, 11 Jun 2014 18:18:54 +0000 (18:18 +0000)]
am
dd80baf5: am
1f15b117: Merge "libcamera_client: 64-bit compile issue"
* commit '
dd80baf5413e3fb5ce5e1282ce9c0badd0b081f1':
libcamera_client: 64-bit compile issue
Chong Zhang [Wed, 11 Jun 2014 17:27:28 +0000 (10:27 -0700)]
Log an error when audio/video encoder failed to create
Change-Id: I493981cddeb9452c533e2917d8c440897d5e6b49
related-to-bug:
15106730
Ruben Brunk [Wed, 11 Jun 2014 17:03:20 +0000 (17:03 +0000)]
am
42092d70: (-s ours) Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev
* commit '
42092d7015b078a09c36de107d924fc8139ccf50':
DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.
Yin-Chia Yeh [Wed, 11 Jun 2014 17:03:13 +0000 (17:03 +0000)]
am
3416f9ac: Merge "Camera2: Add null check to createStream" into lmp-preview-dev
* commit '
3416f9ac471f97e9544ee821a97a101cbdd25b11':
Camera2: Add null check to createStream
Wei Jia [Wed, 11 Jun 2014 17:02:47 +0000 (17:02 +0000)]
am
8756d415: Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev
* commit '
8756d415b6c31ec72caf912910248fa7ab709d25':
Added paused state to NuPlayerDecoder
Marco Nelissen [Wed, 11 Jun 2014 17:02:40 +0000 (17:02 +0000)]
am
d7e8d9a7: Guard against malformed files
* commit '
d7e8d9a7393b5429f8f13a6794b9b04d37390fb5':
Guard against malformed files
Ruben Brunk [Wed, 11 Jun 2014 00:09:41 +0000 (00:09 +0000)]
Merge "DO NOT MERGE: camera2: Disallow connectDevice for all old HALs." into lmp-preview-dev
Glenn Kasten [Wed, 11 Jun 2014 17:10:46 +0000 (17:10 +0000)]
Merge "Fix non-monotonic AudioTrack::getTimestamp after pause" into lmp-preview-dev
Glenn Kasten [Tue, 10 Jun 2014 00:12:32 +0000 (17:12 -0700)]
Fix non-monotonic AudioTrack::getTimestamp after pause
Bug:
15523502
Change-Id: Ifd4aa7fca197bc041c1620fc3f7d953a8902551a
Andy Hung [Wed, 11 Jun 2014 16:59:03 +0000 (16:59 +0000)]
Merge "Update resampler to fetch exactly the frames needed" into lmp-preview-dev
Andy Hung [Tue, 3 Jun 2014 01:54:08 +0000 (18:54 -0700)]
Update resampler to fetch exactly the frames needed
This avoids unnecessary overfetching/releasing, which
could cause problems with the upstream AudioBufferProvider.
A one input sample delay is placed on the stream compared
with the previous implementation.
This change only affects the Dynamic resampler.
Bug:
15548547
Change-Id: Ic7fcff130e0081b4724cfb5a00dc8e8b4a8b1af3
(cherry picked from commit
717007429a50c02d2acc704a8c1ebbe6760a2c22)
Yin-Chia Yeh [Wed, 11 Jun 2014 00:04:28 +0000 (00:04 +0000)]
Merge "Camera2: Add null check to createStream" into lmp-preview-dev
Yin-Chia Yeh [Tue, 10 Jun 2014 23:05:44 +0000 (16:05 -0700)]
Camera2: Add null check to createStream
Prevent a native null dereference crash.
bug:
15332257
Change-Id: I10c4053a0b4f07fbf52c37dd2f2853b501def669
Wei Jia [Tue, 10 Jun 2014 23:07:46 +0000 (23:07 +0000)]
Merge "Added paused state to NuPlayerDecoder" into lmp-preview-dev
Zhijun He [Wed, 11 Jun 2014 22:52:23 +0000 (22:52 +0000)]
Merge "Camera3: Separate the video and preview size filtering"
Jeff Tinker [Wed, 11 Jun 2014 22:42:18 +0000 (22:42 +0000)]
Merge "Remove dependency on Parcel::{read,write}IntPtr"
Christopher Ferris [Wed, 11 Jun 2014 20:49:48 +0000 (20:49 +0000)]
am
ca44dc79: am
8d6d8f54: Merge "Add libcrypto for users of libstagefright."
* commit '
ca44dc79b5a163030ab0963f80aa771871de092d':
Add libcrypto for users of libstagefright.
Eric Laurent [Tue, 10 Jun 2014 22:48:36 +0000 (22:48 +0000)]
Merge "audio policy: use factory to create audio policy manager"
Zhijun He [Wed, 11 Jun 2014 20:38:02 +0000 (20:38 +0000)]
Merge "MediaProfiles: Add 4K video related constants"
Zhijun He [Tue, 10 Jun 2014 15:26:33 +0000 (08:26 -0700)]
MediaProfiles: Add 4K video related constants
Bug:
15287656
Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
Marco Nelissen [Thu, 5 Jun 2014 17:37:26 +0000 (10:37 -0700)]
Guard against malformed files
b/
15433074
Change-Id: I35363def42d38eba49dd5aece566fd345743937e
Narayan Kamath [Fri, 13 Jun 2014 09:26:30 +0000 (09:26 +0000)]
Merge "Remove dependency on Parcel::{read,write}IntPtr"
Jeff Tinker [Mon, 9 Jun 2014 22:51:38 +0000 (15:51 -0700)]
Remove dependency on Parcel::{read,write}IntPtr
bug:
15424960
bug:
15107693
(cherry picked from commit
bcca9e072c1f288a53ce6862936f57dc36488f96)
Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
Jeff Tinker [Mon, 9 Jun 2014 22:51:38 +0000 (15:51 -0700)]
Remove dependency on Parcel::{read,write}IntPtr
bug:
15424960
bug:
15107693
Change-Id: Ic3bf37f591e620985c37f345f9a5544fd20ec4a1
Ruben Brunk [Tue, 10 Jun 2014 19:56:42 +0000 (12:56 -0700)]
DO NOT MERGE: camera2: Disallow connectDevice for all old HALs.
(preview only)
Bug:
15515564
Change-Id: I14ab73b130ee5355d9cc8b3602738022a5a18710