OSDN Git Service
Ralph Nathan [Thu, 21 Apr 2016 21:43:29 +0000 (21:43 +0000)]
Merge "brillo: Add tests for client library." am:
d68b570d0b am:
2f0f6ba63b
am:
3d3a71a5c9
* commit '
3d3a71a5c961bd3b3bc14aabaaeab88da6bb49c8':
brillo: Add tests for client library.
Change-Id: I78dc92ef786ca26678a4258b52c24707b0225260
Ralph Nathan [Thu, 21 Apr 2016 21:40:48 +0000 (21:40 +0000)]
Merge "brillo: Add tests for client library." am:
d68b570d0b
am:
2f0f6ba63b
* commit '
2f0f6ba63be076e43fe2d5d5eca5eface4486d7f':
brillo: Add tests for client library.
Change-Id: I0fb1dda2bb0bc0fa6a793b34e2b40e39e33d2e5f
Ralph Nathan [Thu, 21 Apr 2016 21:38:30 +0000 (21:38 +0000)]
Merge "brillo: Add tests for client library."
am:
d68b570d0b
* commit '
d68b570d0b246186fd74aaa98f92228843eec3fe':
brillo: Add tests for client library.
Change-Id: Ib0e7b7191fab21e30f2b007aad2d757554928606
Ralph Nathan [Thu, 21 Apr 2016 20:51:10 +0000 (20:51 +0000)]
Merge "brillo: Add tests for client library."
Ralph Nathan [Thu, 14 Apr 2016 21:28:02 +0000 (14:28 -0700)]
brillo: Add tests for client library.
This CL adds unit tests for for the brillo audio client and manager. It
also provides a mock for the brilloaudioservice.
BUG=
27844397
TEST=all unittests pass
Change-Id: Ieab85af69bd39a3d69d8ffc96cefabe5a2ab9df2
Glenn Kasten [Tue, 19 Apr 2016 15:04:36 +0000 (15:04 +0000)]
Document special audio session values am:
45afd61
am:
3361607
* commit '
3361607e8814d718889b2aa37a155f511e94b496':
Change-Id: Icd7ee26285f7bd02caa80154f74092e063f85934
Glenn Kasten [Tue, 19 Apr 2016 15:01:44 +0000 (15:01 +0000)]
Document special audio session values am:
45afd61
am:
7b0c1d5
* commit '
7b0c1d563ec9ad74ebdaf0c5f26310bc5aa38d43':
Document special audio session values
Change-Id: I7d8d4db2ba86b34a5fcbf00e1670ff2342acf32a
Glenn Kasten [Tue, 19 Apr 2016 14:58:40 +0000 (14:58 +0000)]
Document special audio session values
am:
45afd61
* commit '
45afd619058eefebd9100ce50f67a8fa5f9c45ae':
Document special audio session values
Change-Id: I8afd369d42792c11be7c78b883a4a41ce583aa66
Glenn Kasten [Tue, 19 Apr 2016 14:58:40 +0000 (14:58 +0000)]
Document special audio session values
am:
45afd61
* commit '
45afd619058eefebd9100ce50f67a8fa5f9c45ae':
Document special audio session values
Change-Id: I2405ac838971580410aa0a9891eb76dee613ec1e
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
Treehugger Robot [Thu, 14 Apr 2016 19:31:16 +0000 (19:31 +0000)]
Merge "brillo: Remove client library to aps communication." am:
9973061
am:
98c094a
* commit '
98c094acfc4829f93392df26d11b014b3fe1aebe':
brillo: Remove client library to aps communication.
Change-Id: I968ae858065ed784ee4dc02a9b79a65fa0691e6d
Ralph Nathan [Thu, 14 Apr 2016 19:27:58 +0000 (19:27 +0000)]
Merge "brillo: Remove client library to aps communication."
am:
9973061
* commit '
99730613078c8930a073eb5dfbd4dec8348545d6':
brillo: Remove client library to aps communication.
Change-Id: Ib093dbab765ccbb59d53c5af283e16c31f92e21e
Treehugger Robot [Thu, 14 Apr 2016 19:22:03 +0000 (19:22 +0000)]
Merge "brillo: Remove client library to aps communication."
Ralph Nathan [Mon, 11 Apr 2016 20:01:07 +0000 (13:01 -0700)]
brillo: Remove client library to aps communication.
The client library for brilloaudioservice should not communicate with
the audio policy service. It now communicates with the
brilloaudioservice which then calls the audio policy service.
BUG=
27945090,
27945589
TEST=none
Change-Id: Ie9a95f15dee5ac2625910a579ec72fbd27410af4
Zhijun He [Thu, 14 Apr 2016 05:28:29 +0000 (05:28 +0000)]
Merge "Camera: clarify lens shading map" into nyc-dev
am:
4bf96dd
* commit '
4bf96dd47c621b1a40d3601cf5be0fc301f4b01e':
Camera: clarify lens shading map
Change-Id: Idd9790660c5e225fa21387b6fb7a8c200f394d47
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, 13 Apr 2016 23:53:21 +0000 (23:53 +0000)]
Camera: add NDK metadata tag document
am:
94f013b
* commit '
94f013bc07c61d0c06af951f0eb5885baa3a1c47':
Camera: add NDK metadata tag document
Change-Id: Ib53e22a2d4666bb52969c39a624147452e80339d
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
Yin-Chia Yeh [Wed, 13 Apr 2016 20:46:24 +0000 (20:46 +0000)]
Camera: fix expectation of post RAW sensitivity control
am:
84a51a4
* commit '
84a51a47a6a39592c994209783255781a76186a5':
Camera: fix expectation of post RAW sensitivity control
Change-Id: Iaf5a580f6e2f46c88a403107028eb0779e472e85
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
Ralph Nathan [Fri, 8 Apr 2016 21:21:33 +0000 (21:21 +0000)]
Merge "brillo: Add client library for brilloaudioservice." am:
1247f05
am:
075589d
* commit '
075589d8d17d9b407e6dfef2dea5397dc5452b3a':
brillo: Add client library for brilloaudioservice.
Change-Id: I04e7ce7fe44e72792b0e8953fd7c1f79e9d2bada
Ralph Nathan [Fri, 8 Apr 2016 21:12:44 +0000 (21:12 +0000)]
Merge "brillo: Add client library for brilloaudioservice."
am:
1247f05
* commit '
1247f05ba6f45cd6d9045c55745801e6c260c7d4':
brillo: Add client library for brilloaudioservice.
Change-Id: I1e8d1a36cb00389d5cf35a1767ec24f8551746f8
Ralph Nathan [Fri, 8 Apr 2016 20:54:25 +0000 (20:54 +0000)]
Merge "brillo: Add client library for brilloaudioservice."
Chih-hung Hsieh [Fri, 8 Apr 2016 18:16:34 +0000 (18:16 +0000)]
Merge "SPDIF: Fix warnings from static analyser" am:
19e3fee
am:
36be1d4
* commit '
36be1d471297b58b6b5d81ae71429e3170720f69':
SPDIF: Fix warnings from static analyser
Change-Id: I35cacb44c5a8c4ae48c4353aedd89835458875cf
Phil Burk [Fri, 8 Apr 2016 18:07:25 +0000 (18:07 +0000)]
Merge "SPDIF: Fix warnings from static analyser"
am:
19e3fee
* commit '
19e3fee37465d93cd545849355383ae9fb749f7f':
SPDIF: Fix warnings from static analyser
Change-Id: I47d0aedd7efdde88646ca4856cda32dfedd016d7
Chih-hung Hsieh [Fri, 8 Apr 2016 17:46:26 +0000 (17:46 +0000)]
Merge "SPDIF: Fix warnings from static analyser"
Yin-Chia Yeh [Thu, 7 Apr 2016 22:46:05 +0000 (22:46 +0000)]
Merge changes from topics \'cam-ndk-hidden-enum\', \'cam-ndk-enum-dco\', \'cam-ndk-hidden-keys\' into nyc-dev
am:
b1379bd
* commit '
b1379bdb8fe4ddf1e052bff5e76703f70ec4afab':
Camera: hide some enum values in NDK
Camera: codegen NDK metadata enum value documents
Camera: modify metadata visibility attributes
Change-Id: Ife5a241f013a3f4bac5b41fc2b358005c8cb6a7b
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
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>
Phil Burk [Wed, 6 Apr 2016 23:55:33 +0000 (23:55 +0000)]
SPDIF: Fix warnings from static analyser
am:
69250e0
* commit '
69250e041a6ba1e32555db89a05e85b4d0f45006':
SPDIF: Fix warnings from static analyser
Change-Id: I5c6a94afc8fcc146ecb290b8626d5c20790401aa
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>
Ralph Nathan [Tue, 16 Feb 2016 17:48:29 +0000 (09:48 -0800)]
brillo: Add client library for brilloaudioservice.
Add a client library so that developers can talk to the Brillo audio
service. This CL provides support for device enumeration on Brillo.
BUG=
26938282
BUG=
26938132
TEST=unit tests
Change-Id: Id3f99f8511ea550f5691da623a0d3a796f00f9da
Eino-Ville Talvala [Mon, 4 Apr 2016 19:52:46 +0000 (19:52 +0000)]
Merge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
am:
cfb4b10
* commit '
cfb4b10ad5b3b43d56939371b0a9c13824395ac1':
Camera: Allow preview operation of SCENE_MODE_HDR
Change-Id: I204b761a14d266773d1db5e55cf58ac05726407b
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
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
Yin-Chia Yeh [Sat, 2 Apr 2016 01:30:46 +0000 (01:30 +0000)]
Merge "Camera: move path of camera device info" into nyc-dev
am:
01aec95
* commit '
01aec953d62546aa37d9d9e2b3473ad580b0fcbd':
Camera: move path of camera device info
Change-Id: I54f3889301670f94eed85acaa5d6bb5d1ef78e6d
Yin-Chia Yeh [Sat, 2 Apr 2016 01:30:46 +0000 (01:30 +0000)]
Merge "Camera: hide hidden NDK enum values" into nyc-dev
am:
3dcde8e
* commit '
3dcde8e4877aac2b69bd1da3dd71e2ef95f7c030':
Camera: hide hidden NDK enum values
Change-Id: I487900c3233b428427c237eb24dacb1c21cc2b61
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:34:10 +0000 (09:34 -0700)]
resolve merge conflicts of
0af9505 to nyc-dev-plus-aosp
Change-Id: I5701acd035d1918808f6d4a76c033d48d3bffabb
Glenn Kasten [Thu, 31 Mar 2016 16:16:51 +0000 (16:16 +0000)]
Merge "Revert "Revert "Make build warnings be errors""" into nyc-dev
Phil Burk [Wed, 30 Mar 2016 22:20:16 +0000 (22:20 +0000)]
Merge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into nyc-dev
am:
f10faaf
* commit '
f10faaf73935c5aa03a9b85d0560b572edc5655e':
AC3FrameScanner: put bsmod in Pc as per IEC61937
Change-Id: Ifa4b1b40ffd92982015e50a514bf20241f6d7ca6
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:12:27 +0000 (15:12 +0000)]
Merge "Fix build warnings" into nyc-dev
am:
b8cd82f
* commit '
b8cd82f79841ee93c2acb952c2bcc184468040ee':
Fix build warnings
Change-Id: Ia8eb90bf27737681ae8c82dda77d27c16f7307d9
Glenn Kasten [Wed, 30 Mar 2016 15:09:10 +0000 (15:09 +0000)]
Merge "Fix build warnings" into 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:15:26 +0000 (22:15 +0000)]
Merge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
am:
490902b
* commit '
490902b995c86c218579cdc88faf69e80d75fee7':
Use audio_module_handle_t and audio_patch_handle_t consistently
Change-Id: Ibaa8f61644cee6ec0dc9b95c766ddaab5da43649
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
Glenn Kasten [Mon, 28 Mar 2016 23:43:59 +0000 (16:43 -0700)]
resolve merge conflicts of
2e38388 to nyc-dev-plus-aosp
Change-Id: I2afe946bf11c74f13ff6153def15a6db814acb47
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
Glenn Kasten [Mon, 28 Mar 2016 22:18:30 +0000 (15:18 -0700)]
resolve merge conflicts of
a7cad44 to nyc-dev-plus-aosp
Change-Id: I7a2be81755faf45d1aee4d51ced279e16eb2f11a
Glenn Kasten [Mon, 28 Mar 2016 22:10:19 +0000 (22:10 +0000)]
Fix build warnings
am:
45db169
* commit '
45db1699c3b9d1f32d5ddf44fc32b0956cc47863':
Fix build warnings
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
Glenn Kasten [Fri, 25 Mar 2016 22:24:42 +0000 (15:24 -0700)]
resolve merge conflicts of
46e30fa to nyc-dev-plus-aosp
Change-Id: I9101161378720bdb8da689255050e8e803b59948
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 23:13:54 +0000 (23:13 +0000)]
Camera: Update device HAL version in HAL docs to 3.4
am:
0477854
* commit '
0477854868fda8f877e21e1e18474e24c14bb8d7':
Camera: Update device HAL version in HAL docs to 3.4
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
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:35:37 +0000 (20:35 +0000)]
Merge "audioservice: Fix spacing in error message."
am:
2d74403
* commit '
2d744034dd491a94a44a95fe45e8a3a3270e96d4':
audioservice: Fix spacing in error message.
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:27:07 +0000 (20:27 +0000)]
Merge "audioservice: Fix spacing in error message."
Jorge Lucangeli Obes [Fri, 18 Mar 2016 20:20:02 +0000 (13:20 -0700)]
audioservice: Fix spacing in error message.
The current message looks weird:
[WARNING:audio_device_handler.cpp(98)] Kernel does not have wired headset support.
Could not open /sys/class/switch/h2w/state( FILE_ERROR_NOT_FOUND )
Notice the ( is not separated from the end of the filename.
Change to:
Could not open /sys/class/switch/h2w/state (FILE_ERROR_NOT_FOUND).
Which IMHO looks better.
Bug:
27743736
Change-Id: Ide7015b7c67702486955cf8406d6163d24729e63
Andy Hung [Thu, 17 Mar 2016 19:48:07 +0000 (19:48 +0000)]
Merge "Update audio_route to properly handle long values" into nyc-dev
am:
0296a8e
* commit '
0296a8ecbc584c6673b835000dd3eb940bcba37a':
Update audio_route to properly handle long values
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 18:21:28 +0000 (18:21 +0000)]
Merge "Use audio_session_t consistently" into nyc-dev
am:
8371ca2
* commit '
8371ca226d8dbfb8e10ddbe8543b734591fe7c1c':
Use audio_session_t consistently
Glenn Kasten [Thu, 17 Mar 2016 14:22:50 +0000 (14:22 +0000)]
Merge "Use audio_session_t consistently" into nyc-dev
Ashok Mudithanapalli [Mon, 14 Mar 2016 16:14:42 +0000 (16:14 +0000)]
Merge "spdif: add support for type-2 e-ac3 streams"
am:
27602c1895
* commit '
27602c1895fec8ff43c37a45f06eb00e9b441c90':
spdif: add support for type-2 e-ac3 streams
Eric Laurent [Mon, 14 Mar 2016 16:03:13 +0000 (16:03 +0000)]
Merge "spdif: add support for type-2 e-ac3 streams"
Eric Laurent [Fri, 11 Mar 2016 19:03:26 +0000 (19:03 +0000)]
audio: new max audio stream type value for policy use
am:
7b29a90309
* commit '
7b29a903091fb51b30bcc6f3f7a7323d00b2a96d':
audio: new max audio stream type value for policy use
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
Yin-Chia Yeh [Thu, 10 Mar 2016 00:29:35 +0000 (00:29 +0000)]
Camera: add device custom scene mode enum
am:
ff19a6214d
* commit '
ff19a6214d5ac43db1aef0129b78c84d550d55e6':
Camera: add device custom scene mode enum
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 16:43:05 +0000 (08:43 -0800)]
resolve merge conflicts of
4ac5d298be to nyc-dev-plus-aosp
Change-Id: I15a87a79d8336fe1276dc85e5cd65dbca21601ca
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
Apratim Utkarsh [Tue, 8 Mar 2016 07:41:51 +0000 (07:41 +0000)]
Merge "alsa_utils: modify period size calculation" am:
5f52f5c259
am:
1ce72a8349
* commit '
1ce72a834981ff32740bf344f765e45648037671':
alsa_utils: modify period size calculation
Apratim Utkarsh [Mon, 7 Mar 2016 22:45:23 +0000 (22:45 +0000)]
Merge "alsa_utils: modify period size calculation"
am:
5f52f5c259
* commit '
5f52f5c259d0a988ee3e8a773468f829f4426d37':
alsa_utils: modify period size calculation
Glenn Kasten [Mon, 7 Mar 2016 22:31:00 +0000 (22:31 +0000)]
Merge "alsa_utils: modify period size calculation"
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.
To keep default USB audio behavior same increase default period
size to 10ms.
Change-Id: Ia55f4e4501edf824045cd062076e0770833c6540
Yin-Chia Yeh [Mon, 7 Mar 2016 21:42:19 +0000 (21:42 +0000)]
Camera: codegen update
am:
8b867934df
* commit '
8b867934df43494b07c6d51aa6feab17cd64b3d2':
Camera: codegen update
Yin-Chia Yeh [Fri, 4 Mar 2016 21:32:07 +0000 (21:32 +0000)]
Camera: NDK header codegen update
am:
1651747624
* commit '
165174762416099724f03ede34281d9c8275f83a':
Camera: NDK header codegen update
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
Yin-Chia Yeh [Tue, 1 Mar 2016 22:03:49 +0000 (22:03 +0000)]
Merge "Camera: codegen CameraDeviceInfo collection" into nyc-dev
am:
29d6c5cef3
* commit '
29d6c5cef33f79ac93f0e412a6cffb39f54261ba':
Camera: codegen CameraDeviceInfo collection
Glenn Kasten [Tue, 1 Mar 2016 22:03:34 +0000 (22:03 +0000)]
Merge "Add use for audio_unique_id_t" into nyc-dev
am:
65be8056a5
* commit '
65be8056a5dff56376c8f6112c487bb7a0708487':
Add use for audio_unique_id_t
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