OSDN Git Service

android-x86/system-media.git
8 years agoMerge changes Ia78f608c,I14dde521 am: 17b3b82b64
Ralph Nathan [Mon, 9 May 2016 19:48:25 +0000 (19:48 +0000)]
Merge changes Ia78f608c,I14dde521 am: 17b3b82b64
am: 48b84f79e8

* commit '48b84f79e85dc0c9a293f4fe051177e935890d0c':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: I10e642a8e7c00dbb208deee609e8652b35ce1347

8 years agoMerge changes Ia78f608c,I14dde521
Ralph Nathan [Mon, 9 May 2016 19:43:00 +0000 (19:43 +0000)]
Merge changes Ia78f608c,I14dde521
am: 17b3b82b64

* commit '17b3b82b64aa780d4cae8e4104823307e8a512a4':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: Ia3316a9aa31dde509b9a086f6da0dd527d3a20e4

8 years agoMerge changes Ia78f608c,I14dde521
Ralph Nathan [Mon, 9 May 2016 19:34:51 +0000 (19:34 +0000)]
Merge changes Ia78f608c,I14dde521

* changes:
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

8 years agoMerge "Stop hard coding gtest include path." am: b7b0a8a5b4
Dan Albert [Sat, 7 May 2016 00:36:22 +0000 (00:36 +0000)]
Merge "Stop hard coding gtest include path." am: b7b0a8a5b4
am: 39ed48636e

* commit '39ed48636ed58a0607c0702dd62b2945b7c354c3':
  Stop hard coding gtest include path.

Change-Id: Idd9bdfd838dd09408f9e28fe7167119269c590b0

8 years agoMerge "Stop hard coding gtest include path."
Dan Albert [Sat, 7 May 2016 00:31:34 +0000 (00:31 +0000)]
Merge "Stop hard coding gtest include path."
am: b7b0a8a5b4

* commit 'b7b0a8a5b4fa07655846a167e5f93cb2c2118f30':
  Stop hard coding gtest include path.

Change-Id: I7bbcda326f0d621dc21a216884e64291a63aa9e3

8 years agoMerge "Stop hard coding gtest include path."
Treehugger Robot [Sat, 7 May 2016 00:25:48 +0000 (00:25 +0000)]
Merge "Stop hard coding gtest include path."

8 years agoStop hard coding gtest include path.
Dan Albert [Thu, 3 Mar 2016 21:01:15 +0000 (13:01 -0800)]
Stop hard coding gtest include path.

BUILD_NATIVE_TEST handles gtest includes for you.

Bug: http://b/16574165
Change-Id: Idfb9080612ac69a0e00d8108bb2ff9a0aa8135c4

8 years agoCamera: update FPS range spec am: 206bf4d am: 386195f
Yin-Chia Yeh [Thu, 28 Apr 2016 19:29:46 +0000 (19:29 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f
am: ea549f4e3f

* commit 'ea549f4e3fa14ed488b64743a7e9cea4b1077c4c':
  Camera: update FPS range spec

Change-Id: I5a8e91a71b8ac4d0ea3370fa5193de3de08d42c1

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e
Eino-Ville Talvala [Thu, 28 Apr 2016 19:29:45 +0000 (19:29 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e
am: bf61f8aaaf

* commit 'bf61f8aaaf2aa15ede35bcfdd67d2db10186f638':
  Camera: Documentation updates

Change-Id: Ideda4b074d10651c88489d2c9957299b0abb94fe

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce
Jianing Wei [Thu, 28 Apr 2016 19:29:44 +0000 (19:29 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce
am: 3c770fa86d

* commit '3c770fa86d938d760f390705088dadb3cb81aada':
  Camera: update video stabilization API doc.

Change-Id: I75328598902aeca837be9a158fcb708f4adc5f2b

8 years agoCamera: update FPS range spec am: 206bf4d
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

8 years agoCamera: Documentation updates am: 62cfd97
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

8 years agoCamera: update video stabilization API doc. am: 161c29c
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

8 years agoCamera: fix typo in dynamic black level
Yin-Chia Yeh [Wed, 27 Apr 2016 21:10:34 +0000 (21:10 +0000)]
Camera: fix typo in dynamic black level
am: ad1304d

* commit 'ad1304d32a8da0bd122bafd5a26f4bd0e6daec5f':
  Camera: fix typo in dynamic black level

Change-Id: I151aae066e09019f24e98e6dd719c9e83ef4fee0

8 years agoCamera: fix typo in dynamic black level
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

8 years agoCamera: update FPS range spec
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

8 years agoCamera: Documentation updates
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

8 years agoCamera: update video stabilization API doc.
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

8 years agoMerge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)." am: 80a9411
Elliott Hughes [Mon, 25 Apr 2016 15:04:42 +0000 (15:04 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)." am: 80a9411
am: 9662b91

* commit '9662b91edf0f1012dd90cce37a08f9d15ed6531e':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).

Change-Id: I539636ac04ea6d3f742b62e1ca24b9ee4533fb26

8 years agoMerge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)."
Elliott Hughes [Mon, 25 Apr 2016 14:59:30 +0000 (14:59 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)."
am: 80a9411

* commit '80a9411784cebe01cf128001a68b1431a1e76b81':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).

Change-Id: I7c1024c2c69629f788475ab0fa348fafb4f68952

8 years agoMerge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)."
Elliott Hughes [Mon, 25 Apr 2016 14:51:17 +0000 (14:51 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)."

8 years agoMerge "Fix 64-bit build failure." am: aff3239
Treehugger Robot [Fri, 22 Apr 2016 21:04:11 +0000 (21:04 +0000)]
Merge "Fix 64-bit build failure." am: aff3239
am: dc868bb

* commit 'dc868bbc88a4b2d9a7b584c05a18b989f2779e38':
  Fix 64-bit build failure.

Change-Id: I94ef98339b4203b46df54c6b9c2bfebd70c71989

8 years agoMerge "Fix 64-bit build failure."
Dan Albert [Fri, 22 Apr 2016 20:53:06 +0000 (20:53 +0000)]
Merge "Fix 64-bit build failure."
am: aff3239

* commit 'aff32398affb154eb5c0cc9d0f84173e1752e9bf':
  Fix 64-bit build failure.

Change-Id: Ic824d6bc63bac513cd8f59cc51b57ded7b51568e

8 years agoMerge "Fix 64-bit build failure."
Treehugger Robot [Fri, 22 Apr 2016 20:47:30 +0000 (20:47 +0000)]
Merge "Fix 64-bit build failure."

8 years agoFix 64-bit build failure.
Dan Albert [Fri, 22 Apr 2016 19:54:06 +0000 (12:54 -0700)]
Fix 64-bit build failure.

This function takes an `unsigned int`, not a `size_t`.

Has been broken for about a day:
https://android-review.googlesource.com/#/c/216103/

TreeHugger didn't catch this because there's no 64-bit checkbuild
TreeHugger target (I'm trying to get this fixed, but there's concern
about additional load). The continuous build hasn't caught this
either because the 64-bit targets in aosp are not checkbuilds (aside
from mips64, which is still broken from the NDK update).

Change-Id: Ia30ebb02f33030ff8ac282f46e859a58b7fd041d

8 years agoHAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).
Elliott Hughes [Fri, 22 Apr 2016 18:33:34 +0000 (11:33 -0700)]
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).

The previous patch was the opposite of what it should have been,
because I mistook #ifndef for #ifdef.

Bug: http://b/28318937
Change-Id: Ic132f426de4dd0f6b7ef2f07cf63e432ec25c187

8 years agoMerge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."" am: a56257c662
Elliott Hughes [Fri, 22 Apr 2016 18:22:04 +0000 (18:22 +0000)]
Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."" am: a56257c662
am: c54109c089

* commit 'c54109c0891cd6fc645d41ffdbbb4c9b6490bf00':
  Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

Change-Id: I8746cdaa400cb9e0d3c9916fa32f4d35fbc9312a

8 years agoMerge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.""
Elliott Hughes [Fri, 22 Apr 2016 18:19:44 +0000 (18:19 +0000)]
Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.""
am: a56257c662

* commit 'a56257c6623240e7dd43b4aac51076890c07013e':
  Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

Change-Id: I7afcf14a914888fa6db154d500fedc3d6aeaac7f

8 years agoMerge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.""
Elliott Hughes [Fri, 22 Apr 2016 17:30:10 +0000 (17:30 +0000)]
Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.""

8 years agoRevert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
Elliott Hughes [Fri, 22 Apr 2016 17:29:55 +0000 (17:29 +0000)]
Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

This reverts commit f815f857b92629fb9dd6e81e201eea983fb0a4ed.

Change-Id: Iac490089fa548189e49626834aff7af155fc3acd

8 years agoMerge "brillo: Add support for volume buttons." am: 1a15d351fb
Ralph Nathan [Fri, 22 Apr 2016 17:16:17 +0000 (17:16 +0000)]
Merge "brillo: Add support for volume buttons." am: 1a15d351fb
am: 78b1b7e3b8

* commit '78b1b7e3b839ac74bb38d63675f6a47be6b37f78':
  brillo: Add support for volume buttons.

Change-Id: I00c9175793dfb9d893a3f5b6627947541200f85f

8 years agoMerge "brillo: Add support for volume buttons."
Ralph Nathan [Fri, 22 Apr 2016 17:13:48 +0000 (17:13 +0000)]
Merge "brillo: Add support for volume buttons."
am: 1a15d351fb

* commit '1a15d351fb83e36669ec740b4ffca65f10f887ff':
  brillo: Add support for volume buttons.

Change-Id: I4d48487698ce0dbe799417e35ea96db8d394861b

8 years agoMerge "brillo: Add support for volume buttons."
Treehugger Robot [Fri, 22 Apr 2016 16:47:49 +0000 (16:47 +0000)]
Merge "brillo: Add support for volume buttons."

8 years agobrillo: Add volume control to client library.
Ralph Nathan [Mon, 18 Apr 2016 23:24:27 +0000 (16:24 -0700)]
brillo: Add volume control to client library.

BUG=28246583
TEST=unittests

Change-Id: Ia78f608c8f01aaae5f284d23e34f673efb300aa3

8 years agobrillo: Add binder interfaces for volume control.
Ralph Nathan [Fri, 15 Apr 2016 00:19:53 +0000 (17:19 -0700)]
brillo: Add binder interfaces for volume control.

Add binder interfaces for volume control to brilloaudioservice so the
client library can communicate to it.

BUG=27976764
TEST=none

Change-Id: I14dde5215ffb3116ea4d5cedc7110dec0c9fb173

8 years agoMerge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined." am: 187db58e0e
Elliott Hughes [Fri, 22 Apr 2016 15:24:17 +0000 (15:24 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined." am: 187db58e0e
am: ce64f48faf

* commit 'ce64f48faf7aa5250a5b8604116f5f52c8459327':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.

Change-Id: I393af6784dfc706ee186fb7a0dd7c40b9ce649d8

8 years agoMerge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
Elliott Hughes [Fri, 22 Apr 2016 15:22:01 +0000 (15:22 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
am: 187db58e0e

* commit '187db58e0e1ddd6cab6abeece53da3620bb55a43':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.

Change-Id: Ia2ef0a66f1aed6ec206ec761da1ae0dce3512499

8 years agoMerge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."
Elliott Hughes [Fri, 22 Apr 2016 15:15:29 +0000 (15:15 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

8 years agoMerge "brillo: Add tests for client library." am: d68b570d0b
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

8 years agoMerge "brillo: Add tests for client library."
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

8 years agoMerge "brillo: Add tests for client library."
Ralph Nathan [Thu, 21 Apr 2016 20:51:10 +0000 (20:51 +0000)]
Merge "brillo: Add tests for client library."

8 years agoHAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.
Elliott Hughes [Thu, 21 Apr 2016 20:39:46 +0000 (13:39 -0700)]
HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.

So let's remove dead code to use a deprecated function that doesn't exist
in LP64.

Bug: http://b/28318937
Change-Id: I6d4c36de1be88569df774144bcfbc4800561926a

8 years agobrillo: Add support for volume buttons.
Ralph Nathan [Mon, 21 Mar 2016 21:10:56 +0000 (14:10 -0700)]
brillo: Add support for volume buttons.

Add a handler to detect volume button presses and notify aps.

BUG=27770812
TEST=unittests

Change-Id: Ia62ef8bbef0c0e2a6852e921828d5d62f4f73454

8 years agobrillo: 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

8 years agoDocument special audio session values
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

8 years agoDocument special audio session values
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

8 years agoMerge "brillo: Remove client library to aps communication." am: 9973061
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

8 years agoMerge "brillo: Remove client library to aps communication."
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

8 years agoMerge "brillo: Remove client library to aps communication."
Treehugger Robot [Thu, 14 Apr 2016 19:22:03 +0000 (19:22 +0000)]
Merge "brillo: Remove client library to aps communication."

8 years agobrillo: 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

8 years agoMerge "Camera: clarify lens shading map" into nyc-dev
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

8 years agoMerge "Camera: clarify lens shading map" into nyc-dev
Zhijun He [Thu, 14 Apr 2016 05:17:45 +0000 (05:17 +0000)]
Merge "Camera: clarify lens shading map" into nyc-dev

8 years agoCamera: add NDK metadata tag document
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

8 years agoCamera: add NDK metadata tag document
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

8 years agoCamera: fix expectation of post RAW sensitivity control
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

8 years agoCamera: clarify lens shading map
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

8 years agoCamera: fix expectation of post RAW sensitivity control
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

8 years agoMerge "brillo: Add client library for brilloaudioservice." am: 1247f05
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

8 years agoMerge "brillo: Add client library for brilloaudioservice."
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

8 years agoMerge "brillo: Add client library for brilloaudioservice."
Ralph Nathan [Fri, 8 Apr 2016 20:54:25 +0000 (20:54 +0000)]
Merge "brillo: Add client library for brilloaudioservice."

8 years agoMerge "SPDIF: Fix warnings from static analyser" am: 19e3fee
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

8 years agoMerge "SPDIF: Fix warnings from static analyser"
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

8 years agoMerge "SPDIF: Fix warnings from static analyser"
Chih-hung Hsieh [Fri, 8 Apr 2016 17:46:26 +0000 (17:46 +0000)]
Merge "SPDIF: Fix warnings from static analyser"

8 years agoMerge changes from topics \'cam-ndk-hidden-enum\', \'cam-ndk-enum-dco\', \'cam-ndk...
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

8 years agoMerge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden...
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

8 years agoCamera: hide some enum values in NDK
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

8 years agoCamera: codegen NDK metadata enum value documents
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

8 years agoCamera: modify metadata visibility attributes
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

8 years agoSPDIF: Fix warnings from static analyser
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>
8 years agoSPDIF: Fix warnings from static analyser
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

8 years agoSPDIF: Fix warnings from static analyser
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>
8 years agobrillo: Add client library for brilloaudioservice.
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

8 years agoMerge "Camera: Allow preview operation of SCENE_MODE_HDR" into nyc-dev
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

8 years agoMerge "Camera: Allow preview operation of SCENE_MODE_HDR" into 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

8 years agoCamera: Allow preview operation of SCENE_MODE_HDR
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

8 years agoMerge "Camera: move path of camera device info" into nyc-dev
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

8 years agoMerge "Camera: hide hidden NDK enum values" into nyc-dev
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

8 years agoMerge "Camera: move path of camera device info" into 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

8 years agoMerge "Camera: hide hidden NDK enum values" 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

8 years agoCamera: move path of camera device info
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

8 years agoCamera: hide hidden NDK enum values
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

8 years agoresolve merge conflicts of 0af9505 to nyc-dev-plus-aosp
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

8 years agoMerge "Revert "Revert "Make build warnings be errors""" into nyc-dev
Glenn Kasten [Thu, 31 Mar 2016 16:16:51 +0000 (16:16 +0000)]
Merge "Revert "Revert "Make build warnings be errors""" into nyc-dev

8 years agoMerge "AC3FrameScanner: put bsmod in Pc as per IEC61937" 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

8 years agoMerge "AC3FrameScanner: put bsmod in Pc as per IEC61937" into 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

8 years agoMerge "Fix build warnings" 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

8 years agoMerge "Fix build warnings" into nyc-dev
Glenn Kasten [Wed, 30 Mar 2016 15:09:10 +0000 (15:09 +0000)]
Merge "Fix build warnings" into nyc-dev

8 years agoFix build warnings
Glenn Kasten [Tue, 29 Mar 2016 23:21:27 +0000 (16:21 -0700)]
Fix build warnings

Change-Id: I13d8d8feab1084a85234da8597cd37102a76a23c

8 years agoRevert "Revert "Make build warnings be errors""
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

8 years agoMerge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
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

8 years agoMerge "Use audio_module_handle_t and audio_patch_handle_t consistently" into nyc-dev
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

8 years agoresolve merge conflicts of 2e38388 to nyc-dev-plus-aosp
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

8 years agoMerge "Revert "Make build warnings be errors"" into 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

8 years agoRevert "Make build warnings be errors"
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

8 years agoresolve merge conflicts of a7cad44 to nyc-dev-plus-aosp
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

8 years agoFix build warnings
Glenn Kasten [Mon, 28 Mar 2016 22:10:19 +0000 (22:10 +0000)]
Fix build warnings
am: 45db169

* commit '45db1699c3b9d1f32d5ddf44fc32b0956cc47863':
  Fix build warnings

8 years agoAC3FrameScanner: put bsmod in Pc as per IEC61937
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>
8 years agoMerge "Make build warnings be errors" into nyc-dev
Glenn Kasten [Mon, 28 Mar 2016 21:45:39 +0000 (21:45 +0000)]
Merge "Make build warnings be errors" into nyc-dev

8 years agoFix build warnings
Glenn Kasten [Thu, 24 Mar 2016 18:43:42 +0000 (11:43 -0700)]
Fix build warnings

Also fix a memory leak

Change-Id: I21e66d7e5bede3ecf1da497dc8b9e20e6f076d54

8 years agoresolve merge conflicts of 46e30fa to nyc-dev-plus-aosp
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