OSDN Git Service
rago [Tue, 23 Aug 2016 18:09:52 +0000 (11:09 -0700)]
Fix potential overflow in Visualizer effect
Bug:
30229821
Change-Id: Ia07041a5a149d7d3e120aa6ea0345fb86da37c9b
(cherry picked from commit
b61dd321d08b21a5629044eca7f96e2ecd348e5f)
(cherry picked from commit
7bbd5008747431d42e2f8cfbc0ddcb8465cdb4a5)
(cherry picked from commit
a6274f03b4dfe1c3a22af51e3a17ea56a314e747)
Linux Build Service Account [Wed, 12 Oct 2016 09:35:05 +0000 (03:35 -0600)]
Promotion of android-framework.lnx.2.0-00013.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1065990 I6405fe608567a4f4113674050f826f305ecae030 Camera: Prevent data size overflow
1065989 Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2 Camera metadata: Check for inconsistent data count
Change-Id: I090300125111c9c4cba77a41b78ac3ca74f0550b
CRs-Fixed:
1065990,
1065989
Eino-Ville Talvala [Tue, 16 Aug 2016 22:48:05 +0000 (15:48 -0700)]
Camera metadata: Check for inconsistent data count
Resolve merge conflict for nyc-release
Also check for overflow of data/entry count on append.
Bug:
30591838
Change-Id: Ibf4c3c6e236cdb28234f3125055d95ef0a2416a2
(cherry picked from commit
e9e44f797742f52996ebf307740dad58c28fd9b5)
(cherry picked from commit
8188864cf88914e222d60cdded7fbc51fd48fddc)
Chien-Yu Chen [Fri, 12 Aug 2016 22:40:16 +0000 (15:40 -0700)]
Camera: Prevent data size overflow
Add a function to check overflow when calculating metadata
data size.
Bug:
30741779
Change-Id: I6405fe608567a4f4113674050f826f305ecae030
(cherry picked from commit
8e7a2b4d13bff03973dbad2bfb88a04296140433)
(cherry picked from commit
a0cbcf8be808d0204ce4f42ba23452bf6134ad16)
Naresh Tanniru [Tue, 17 May 2016 16:02:45 +0000 (21:32 +0530)]
audio: Add support for encoder configuration
- Add SBC , APTX encoders
- Add support for SBC, AAC, APTX encoder
configuration
Change-Id: If126c6764cfd7a2e46cb7784ad899681de581b56
Ashish Jain [Fri, 27 May 2016 09:00:49 +0000 (14:30 +0530)]
audio_utils: Support more format conversions
Support conversion from 32 bit PCM to 24 bit packed pcm.
Support conversion from 8_24 bit to 24 bit packed pcm.
Change-Id: I328ef6ed865f73e49be50ffa1b4e07e865df0339
Preetam Singh Ranawat [Thu, 12 May 2016 10:39:47 +0000 (16:09 +0530)]
audio: add DSD format to enum list.
-add DSD as a new format type to the format enum list and
make it a valid audio format.
Change-Id: I40819512d9e09f5e7fdc3506f9f3516a1b037663
Yamit Mehta [Sat, 11 Jul 2015 17:58:27 +0000 (23:28 +0530)]
audio: Add Audio Proxy device
Add audio proxy device for WFD and Visualiser.
Change-Id: Ie35a43943b12e92172da564126d2719629c47829
Mingming Yin [Thu, 6 Aug 2015 21:18:34 +0000 (14:18 -0700)]
audio: add support for extended audio features
- Add extended enums for audio stream, audio
source, audio format, audio channel, audio
device, and audio flags
- This all squashes all other changes to this file.
audio : Add PCM offload formats
Change-Id: Ib4229440dc362905753ef8e6444cbf0940fca885
audio: Add support for AAC ADTS offload
Change-Id: I496faf9fb7b7742b674da52ef6f45494f5e3de88
audio: add support for direct pcm
Change-Id: Ie39c2f666e9d4ec1e1c20fdc648d8c04f0f2edce
Change-Id: I5b05eade71ab12b5e08e2f186d40e787a2af024a
The Android Automerger [Wed, 8 Jun 2016 07:04:02 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Tue, 7 Jun 2016 22:30:06 +0000 (22:30 +0000)]
Merge "Camera: document expected timestamp source" into nyc-dev
Yin-Chia Yeh [Mon, 6 Jun 2016 21:25:11 +0000 (14:25 -0700)]
Camera: document expected timestamp source
Bug:
29120073
Change-Id: Ia7aef33aaa0b05499e134f261b60d6a9969865e2
The Android Automerger [Sun, 5 Jun 2016 07:06:04 +0000 (00:06 -0700)]
merge in nyc-release history after reset to nyc-dev
Eino-Ville Talvala [Thu, 2 Jun 2016 21:15:56 +0000 (14:15 -0700)]
Camera: Update lensShadingMap documentation and visibility
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to
camera device-processed data.
Remove the Java lens shading map key from the NDK, since it's a
duplicate of the underlying native key already in NDK.
Also fix a few other wording issues in the lens shading documentation.
Bug:
18175853
Change-Id: I227707671914eb17b0a0dd14655ea732aae2a6b7
Yin-Chia Yeh [Wed, 25 May 2016 08:29:55 +0000 (01:29 -0700)]
Camera: update NDK metadata tag documents
- Create a separate ndk_metadata_properties.xml to convert java
API specific documents to NDK specific.
- Replace link to public SDK by NDK counterparts or hyperlink
to public SDK website.
- Disable markdown->html rendering on tables because doxygen
supports markdown syntax and does not support thead/tbody tag.
- Add descriptions to rectangle keys to specify their data
representation is (left, top, width, height)
Bug:
27102995
Change-Id: I6b6da019dde66f28fce72937f05bd984638ec2ba
The Android Automerger [Sun, 15 May 2016 00:04:53 +0000 (00:04 +0000)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Tue, 10 May 2016 22:03:21 +0000 (15:03 -0700)]
Camera: update ndk metadata tag template
to add doxygen tags.
Bug:
27102995
Change-Id: Id73b43124e1df84c408189b472082f8ef3d6873f
Yin-Chia Yeh [Thu, 28 Apr 2016 17:30:07 +0000 (17:30 +0000)]
Camera: update FPS range spec am:
206bf4d
am:
386195f
* commit '
386195f42bc2ca44ae20fd0c5444036790f72acd':
Camera: update FPS range spec
Change-Id: I4d709e12091a364fc9877a7172c31057872841c3
Eino-Ville Talvala [Thu, 28 Apr 2016 17:30:07 +0000 (17:30 +0000)]
Camera: Documentation updates am:
62cfd97
am:
58b8e6e
* commit '
58b8e6e943da4e24daf3745a1b567cc99e241895':
Camera: Documentation updates
Change-Id: I1fa2d5f1d74ce703ab9d2bc10448acc10fb1998f
Jianing Wei [Thu, 28 Apr 2016 17:30:06 +0000 (17:30 +0000)]
Camera: update video stabilization API doc. am:
161c29c
am:
569abce
* commit '
569abcec45795c141c4883ac1939d44ee511d539':
Camera: update video stabilization API doc.
Change-Id: I72ecf216ead1017c525065bdc0d78955afc587da
The Android Automerger [Thu, 28 Apr 2016 07:04:06 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Tue, 26 Apr 2016 21:01:50 +0000 (14:01 -0700)]
Camera: fix typo in dynamic black level
Dynamic black level should be a capture result key.
Bug:
28276885
Change-Id: Ic70b64204251d046bc3ad17048b6a9c17ee9a174
Yin-Chia Yeh [Tue, 26 Apr 2016 14:46:04 +0000 (14:46 +0000)]
Camera: update FPS range spec
am:
206bf4d
* commit '
206bf4de57f9d85cfacbb8d919fd6960d3573be7':
Camera: update FPS range spec
Change-Id: I35dbe59718ce37ae39ca5a98a7c96443697f5592
Eino-Ville Talvala [Tue, 26 Apr 2016 14:46:04 +0000 (14:46 +0000)]
Camera: Documentation updates
am:
62cfd97
* commit '
62cfd97078f527b67a401ca4e5a97d33a16eacb5':
Camera: Documentation updates
Change-Id: Ica0dba21eafd0a71cb1fc2210243911e26e9a67b
Jianing Wei [Tue, 26 Apr 2016 14:46:03 +0000 (14:46 +0000)]
Camera: update video stabilization API doc.
am:
161c29c
* commit '
161c29c09f9c24f21d75f7e809b664b7a4cd39a3':
Camera: update video stabilization API doc.
Change-Id: Ib21db0fe442a450c937b13597fb21fda6e67f0b1
The Android Automerger [Wed, 20 Apr 2016 07:05:36 +0000 (00:05 -0700)]
merge in nyc-release history after reset to nyc-dev
Glenn Kasten [Mon, 18 Apr 2016 16:11:57 +0000 (09:11 -0700)]
Document special audio session values
don't need to have use == AUDIO_UNIQUE_ID_USE_SESSION
Bug:
28119934
Change-Id: I5b52616cc6ed53dfbaab422138112132fdae6bf1
The Android Automerger [Thu, 14 Apr 2016 07:04:32 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Zhijun He [Thu, 14 Apr 2016 05:17:45 +0000 (05:17 +0000)]
Merge "Camera: clarify lens shading map" into nyc-dev
Yin-Chia Yeh [Wed, 6 Apr 2016 22:59:39 +0000 (15:59 -0700)]
Camera: add NDK metadata tag document
Bug:
27102995
Change-Id: Ieffc5825259614ffd5b46af013a043300d5214b1
Zhijun He [Wed, 13 Apr 2016 06:08:17 +0000 (23:08 -0700)]
Camera: clarify lens shading map
Lens shading correction should be full correction that
corrects both color shading and vignetting.
Bug:
18175853
Change-Id: Ia552345b2bd78b1b2eed2472096ebae80680d70b
Yin-Chia Yeh [Mon, 11 Apr 2016 23:37:49 +0000 (16:37 -0700)]
Camera: fix expectation of post RAW sensitivity control
1. Make postRawSensitivityBoost always available when RAW output
is supported.
2. Fix one typo
3. Fix one codegen error in response to new visibility definition
Bug:
27950762
Change-Id: Ic023317cf915bec8cb5f4c0a4870287e1e7e51b5
The Android Automerger [Mon, 11 Apr 2016 23:00:55 +0000 (16:00 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 21:47:54 +0000 (14:47 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 19:01:54 +0000 (12:01 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 18:44:18 +0000 (11:44 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 10 Apr 2016 07:05:31 +0000 (00:05 -0700)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Thu, 7 Apr 2016 22:33:36 +0000 (22:33 +0000)]
Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden-keys' into nyc-dev
* changes:
Camera: hide some enum values in NDK
Camera: codegen NDK metadata enum value documents
Camera: modify metadata visibility attributes
Yin-Chia Yeh [Wed, 6 Apr 2016 18:58:41 +0000 (11:58 -0700)]
Camera: hide some enum values in NDK
Bug:
27102995
Change-Id: Ibcca0576f5e88c2e7a904c0d0699640c69005048
Yin-Chia Yeh [Mon, 4 Apr 2016 22:31:29 +0000 (15:31 -0700)]
Camera: codegen NDK metadata enum value documents
Bug:
27102995
Change-Id: I5fc2bbde479d28bae53b7459b5c78cfe8cf6fa80
Yin-Chia Yeh [Sat, 2 Apr 2016 23:30:30 +0000 (16:30 -0700)]
Camera: modify metadata visibility attributes
So we can better describe whether a key should present in java or
native API.
Here are all possbile visibility values:
public = visible in both Java/NDK public API
ndk_public = visible in NDK API, @hide in java API
(mostly source of synthethic keys)
java_public = visible in public java API, not present in NDK
(mostly synthetic keys or features not supported
in NDK)
hidden = @hide in java API, not visible in NDK
system = not defined in any API.
Bug:
27102995
Change-Id: Ib5163b0aba62126dfe3d72ec62a24136ce206b17
The Android Automerger [Thu, 7 Apr 2016 07:04:43 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Phil Burk [Wed, 6 Apr 2016 21:54:46 +0000 (14:54 -0700)]
SPDIF: Fix warnings from static analyser
Bug:
27230467
Change-Id: I89013d8b6696c6491db655ff2e1a3ceee9ffa3c8
Signed-off-by: Phil Burk <philburk@google.com>
The Android Automerger [Tue, 5 Apr 2016 07:04:05 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Eino-Ville Talvala [Mon, 4 Apr 2016 19:38:51 +0000 (19:38 +0000)]
Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
The Android Automerger [Mon, 4 Apr 2016 19:15:48 +0000 (12:15 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 4 Apr 2016 18:59:47 +0000 (11:59 -0700)]
merge in nyc-release history after reset to nyc-dev
Eino-Ville Talvala [Mon, 4 Apr 2016 17:47:43 +0000 (10:47 -0700)]
Camera: Allow preview operation of SCENE_MODE_HDR
Some devices support HDR output for preview in addition to still
capture, so explicitly allow for that in the documentation of
SCENE_MODE_HDR.
Bug:
27313038
Change-Id: I76f3883b918bd3d81c8c03e0cee5d3dc7986bb25
The Android Automerger [Sun, 3 Apr 2016 07:05:06 +0000 (00:05 -0700)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:53:26 +0000 (00:53 +0000)]
Merge "Camera: move path of camera device info" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:52:42 +0000 (00:52 +0000)]
Merge "Camera: hide hidden NDK enum values" into nyc-dev
Yin-Chia Yeh [Sat, 2 Apr 2016 00:37:47 +0000 (17:37 -0700)]
Camera: move path of camera device info
CameraDeviceInfo.java is now in cts-device-info.
Bug:
27967489
Change-Id: I30451146f127d8388215977bda9f2d05ff1fd555
Yin-Chia Yeh [Thu, 31 Mar 2016 18:04:30 +0000 (11:04 -0700)]
Camera: hide hidden NDK enum values
Bug:
27102995
Change-Id: I840d93ea3d81a7cb387e5d096995a30fa0f8f238
Glenn Kasten [Thu, 31 Mar 2016 16:16:51 +0000 (16:16 +0000)]
Merge "Revert "Revert "Make build warnings be errors""" into nyc-dev
The Android Automerger [Thu, 31 Mar 2016 07:04:41 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Phil Burk [Wed, 30 Mar 2016 22:11:29 +0000 (22:11 +0000)]
Merge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into nyc-dev
Glenn Kasten [Wed, 30 Mar 2016 15:09:10 +0000 (15:09 +0000)]
Merge "Fix build warnings" into nyc-dev
The Android Automerger [Wed, 30 Mar 2016 07:04:47 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Glenn Kasten [Tue, 29 Mar 2016 23:21:27 +0000 (16:21 -0700)]
Fix build warnings
Change-Id: I13d8d8feab1084a85234da8597cd37102a76a23c
Glenn Kasten [Tue, 29 Mar 2016 22:26:54 +0000 (22:26 +0000)]
Revert "Revert "Make build warnings be errors""
This reverts commit
ce89418df1e8c1e8e25067d5a2eb8e1b260e28d9.
Change-Id: I0a372cfdfa03344dfff50bce9eb32227238e9c94
Glenn Kasten [Tue, 29 Mar 2016 22:02:44 +0000 (22:02 +0000)]
Merge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
The Android Automerger [Tue, 29 Mar 2016 07:04:53 +0000 (00:04 -0700)]
merge in nyc-release history after reset to nyc-dev
Glenn Kasten [Mon, 28 Mar 2016 22:52:09 +0000 (22:52 +0000)]
Merge "Revert "Make build warnings be errors"" into nyc-dev
Glenn Kasten [Mon, 28 Mar 2016 22:51:42 +0000 (22:51 +0000)]
Revert "Make build warnings be errors"
This reverts commit
2a34a2fc06a96ca23baa2f81a1490d6407a37637.
Change-Id: Ia7be57b1ca60e14f40f0104b8b71c84ed6465440
Phil Burk [Mon, 28 Mar 2016 22:02:17 +0000 (15:02 -0700)]
AC3FrameScanner: put bsmod in Pc as per IEC61937
Needed for HDMI pass-through.
This detail was missing from earlier streams.
Bug:
22037731
Change-Id: I2df47c4dea779e20104b937164d4b312a1694059
Signed-off-by: Phil Burk <philburk@google.com>
Glenn Kasten [Mon, 28 Mar 2016 21:45:39 +0000 (21:45 +0000)]
Merge "Make build warnings be errors" into nyc-dev
Glenn Kasten [Thu, 24 Mar 2016 18:43:42 +0000 (11:43 -0700)]
Fix build warnings
Also fix a memory leak
Change-Id: I21e66d7e5bede3ecf1da497dc8b9e20e6f076d54
The Android Automerger [Sun, 27 Mar 2016 07:05:49 +0000 (00:05 -0700)]
merge in nyc-release history after reset to nyc-dev
Glenn Kasten [Fri, 25 Mar 2016 21:48:04 +0000 (21:48 +0000)]
Merge "Fix build warnings" into nyc-dev
Eino-Ville Talvala [Thu, 24 Mar 2016 21:38:29 +0000 (14:38 -0700)]
Camera: Update device HAL version in HAL docs to 3.4
Bug:
26070606
Change-Id: Ied60b60772ae1cbc3e6e923ef50f9c50e8e8b74b
Glenn Kasten [Thu, 24 Mar 2016 18:51:39 +0000 (11:51 -0700)]
Fix build warnings
Change-Id: Ifed20ea1c34426d837208b5654c180d6c359c6ec
Glenn Kasten [Thu, 24 Mar 2016 18:44:31 +0000 (11:44 -0700)]
Make build warnings be errors
Change-Id: Ib8dc0b9fdecb414b46ca2db63809ce1ae1ea736e
Glenn Kasten [Thu, 10 Mar 2016 20:42:47 +0000 (12:42 -0800)]
Use audio_module_handle_t and audio_patch_handle_t consistently
Bug:
27814144
Change-Id: I54b7a73ec318779fd3addb060998f4d94141152d
The Android Automerger [Sun, 20 Mar 2016 07:03:52 +0000 (00:03 -0700)]
merge in nyc-release history after reset to nyc-dev
Andy Hung [Thu, 17 Mar 2016 19:41:47 +0000 (19:41 +0000)]
Merge "Update audio_route to properly handle long values" into nyc-dev
Andy Hung [Mon, 7 Mar 2016 22:57:15 +0000 (14:57 -0800)]
Update audio_route to properly handle long values
Required for 64 bit audioserver.
Bug:
27479136
Change-Id: Ic6f2d047648898fcbac43f325020d331f349c718
Glenn Kasten [Thu, 17 Mar 2016 14:22:50 +0000 (14:22 +0000)]
Merge "Use audio_session_t consistently" into nyc-dev
Eric Laurent [Fri, 11 Mar 2016 17:59:48 +0000 (09:59 -0800)]
audio: new max audio stream type value for policy use
Added AUDIO_STREAM_FOR_POLICY_CNT value to audio_stream_type_t enum.
All stream types above are ignored by audio policy for volume control
and don't have a matching strategy.
Currently only AUDIO_STREAM_PATCH is in this category.
Bug:
27586382
Change-Id: I6df84d843d3afe4a30788b8f01b32fddffb22ee1
Eric Laurent [Fri, 11 Mar 2016 17:59:48 +0000 (09:59 -0800)]
audio: new max audio stream type value for policy use
Added AUDIO_STREAM_FOR_POLICY_CNT value to audio_stream_type_t enum.
All stream types above are ignored by audio policy for volume control
and don't have a matching strategy.
Currently only AUDIO_STREAM_PATCH is in this category.
Bug:
27586382
Change-Id: I6df84d843d3afe4a30788b8f01b32fddffb22ee1
Glenn Kasten [Thu, 10 Mar 2016 17:57:27 +0000 (09:57 -0800)]
Use audio_session_t consistently
Bug:
27562099
Change-Id: Ic3d1578e16188be1c5075bab092493dd30db003e
The Android Automerger [Thu, 10 Mar 2016 08:02:36 +0000 (00:02 -0800)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Wed, 9 Mar 2016 22:44:14 +0000 (14:44 -0800)]
Camera: add device custom scene mode enum
Bug:
26687007
Change-Id: I8873b9caf27ccdb7b9ea3c36c106ab6628472b49
Glenn Kasten [Wed, 9 Mar 2016 15:49:41 +0000 (15:49 +0000)]
Merge "alsa_utils: modify period size calculation" into nyc-dev
Apratim Utkarsh [Tue, 22 Dec 2015 10:47:07 +0000 (16:17 +0530)]
alsa_utils: modify period size calculation
Retrieve period duration from system property.
Also remove multiplier "2" used in min period size calculation.
Change default period size for USB audio to 5ms.
Bug:
27530068
Change-Id: Ia55f4e4501edf824045cd062076e0770833c6540
The Android Automerger [Tue, 8 Mar 2016 08:02:58 +0000 (00:02 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 6 Mar 2016 08:03:05 +0000 (00:03 -0800)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Thu, 3 Mar 2016 23:38:33 +0000 (15:38 -0800)]
Camera: codegen update
Add unordered_set of system tags for quick lookup.
Bug:
27102995
Change-Id: I4812f37e7f0a1a65040b227c4dba9b3fec63021d
Yin-Chia Yeh [Wed, 2 Mar 2016 23:52:03 +0000 (15:52 -0800)]
Camera: NDK header codegen update
1. Hide system keys entirely
2. Hide metadta section if all keys are system key
Bug:
27102995
Change-Id: I80f4d71437951b6bbb8849e977b588d81b04bdff
The Android Automerger [Wed, 2 Mar 2016 08:03:19 +0000 (00:03 -0800)]
merge in nyc-release history after reset to nyc-dev
Yin-Chia Yeh [Tue, 1 Mar 2016 21:02:08 +0000 (21:02 +0000)]
Merge "Camera: codegen CameraDeviceInfo collection" into nyc-dev
Glenn Kasten [Tue, 1 Mar 2016 19:10:48 +0000 (19:10 +0000)]
Merge "Add use for audio_unique_id_t" into nyc-dev
Glenn Kasten [Fri, 26 Feb 2016 19:20:29 +0000 (11:20 -0800)]
Add use for audio_unique_id_t
Bug:
25641253
Bug:
21019153
Change-Id: I4f78dec54c77c6376f9af7e24aef8aee2e88080a
The Android Automerger [Tue, 1 Mar 2016 08:03:08 +0000 (00:03 -0800)]
merge in nyc-release history after reset to nyc-dev
Phil Burk [Tue, 1 Mar 2016 00:06:19 +0000 (00:06 +0000)]
Merge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev
Yin-Chia Yeh [Wed, 24 Feb 2016 03:18:15 +0000 (19:18 -0800)]
Camera: codegen CameraDeviceInfo collection
Bug:
25983832
Change-Id: Ib84816a0e46c9d03bfb30474b6cbe5161290f015
The Android Automerger [Sun, 28 Feb 2016 08:03:22 +0000 (00:03 -0800)]
merge in nyc-release history after reset to nyc-dev
Phil Burk [Thu, 25 Feb 2016 00:57:38 +0000 (16:57 -0800)]
audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT
Bug:
26373761
Change-Id: I30cf43f2998370687b876fe0aea9f93c4b22d8ef
Signed-off-by: Phil Burk <philburk@google.com>
Eric Laurent [Thu, 25 Feb 2016 19:28:59 +0000 (19:28 +0000)]
Merge "audio: add device for audio bus" into nyc-dev
The Android Automerger [Thu, 25 Feb 2016 08:02:32 +0000 (00:02 -0800)]
merge in nyc-release history after reset to nyc-dev
Ryan Haining [Thu, 25 Feb 2016 01:29:46 +0000 (01:29 +0000)]
Merge "Eliminates gcc warnings from -Wparentheses" into nyc-dev
OSDN Git Service
