OSDN Git Service

android-x86/system-media.git
8 years agoCamera: Update lensShadingMap documentation and visibility am: d089ee6902
Eino-Ville Talvala [Fri, 3 Jun 2016 18:09:38 +0000 (18:09 +0000)]
Camera: Update lensShadingMap documentation and visibility am: d089ee6902
am: 235c7c9d82

* commit '235c7c9d82549f945a12e1d79c8da10e69dadbb2':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: I5f1dde2fbd8cdb949e58ad7ea86acf5394c612af

8 years agoCamera: Update lensShadingMap documentation and visibility
Eino-Ville Talvala [Fri, 3 Jun 2016 18:02:01 +0000 (18:02 +0000)]
Camera: Update lensShadingMap documentation and visibility
am: d089ee6902

* commit 'd089ee6902fe06695c119368e05339f6ea2ad402':
  Camera: Update lensShadingMap documentation and visibility

Change-Id: Ie83fd7a2cb1b20e6bf809128eb18f7faea706d1f

8 years agoCamera: Update lensShadingMap documentation and visibility
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

8 years agoMerge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into...
Android Build Merger (Role) [Thu, 2 Jun 2016 18:21:20 +0000 (18:21 +0000)]
Merge "Camera: update NDK metadata tag documents am: c9c2c6849c am: a92f6c639f" into nyc-mr1-dev-plus-aosp

8 years agoCamera: update NDK metadata tag documents am: c9c2c6849c
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:35 +0000 (18:20 +0000)]
Camera: update NDK metadata tag documents am: c9c2c6849c
am: a92f6c639f

* commit 'a92f6c639f06db39fcce5f635433e7bc4f36ff99':
  Camera: update NDK metadata tag documents

Change-Id: I2e7825d8c9e704664b4605ce842f6c68ab820cf1

8 years agoCamera: update NDK metadata tag documents am: c9c2c6849c
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:33 +0000 (18:20 +0000)]
Camera: update NDK metadata tag documents am: c9c2c6849c
am: 68d560edf1

* commit '68d560edf1c81e04ae83caa64614553f477d9583':
  Camera: update NDK metadata tag documents

Change-Id: I97f548a8478208bff8b04b72daf65b2d11b8b61e

8 years agoCamera: update NDK metadata tag documents
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:43 +0000 (18:17 +0000)]
Camera: update NDK metadata tag documents
am: c9c2c6849c

* commit 'c9c2c6849c68ddb458d63b5f864ea76a8448a3d2':
  Camera: update NDK metadata tag documents

Change-Id: I6aea7ab4dc20a26b43ca1df5b513731ecf4ff154

8 years agoCamera: update NDK metadata tag documents
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:42 +0000 (18:17 +0000)]
Camera: update NDK metadata tag documents
am: c9c2c6849c

* commit 'c9c2c6849c68ddb458d63b5f864ea76a8448a3d2':
  Camera: update NDK metadata tag documents

Change-Id: I53ecb5decb20d735076684bc2a6bee23a20e0c8b

8 years agoAdd dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Paul McLean [Thu, 2 Jun 2016 16:01:42 +0000 (16:01 +0000)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
am: 21b04ade57

* commit '21b04ade57e5cbf33eff11f3f400f77eed5e2e75':
  Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL

Change-Id: Iced9c23f7a6743c2766d3a18032421d782722b46

8 years agoRevert "Adding dump functions to report state in dumpsys media.audio_flinger"
Paul Mclean [Thu, 2 Jun 2016 15:24:04 +0000 (15:24 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"
am: 2a3925e95a

* commit '2a3925e95a9d4954be789dc4594233d4cc2d251c':
  Revert "Adding dump functions to report state in dumpsys media.audio_flinger"

Change-Id: I85b3764111a005b117ccd569b808124adfe71907

8 years agoAdd dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL
Paul McLean [Wed, 25 May 2016 20:07:00 +0000 (14:07 -0600)]
Add dump() (i.e dumpsys media.audio_flinger) functionality to USB HAL

Bug: 28960293

Change-Id: Ice8a72b77ba00a816d12d2028b4ea5e7fe4bd319

8 years agoRevert "Adding dump functions to report state in dumpsys media.audio_flinger"
Paul Mclean [Thu, 2 Jun 2016 14:48:10 +0000 (14:48 +0000)]
Revert "Adding dump functions to report state in dumpsys media.audio_flinger"

This reverts commit b776eb3998732bc0278cce84c0ecfd1d91d5874f.

Change-Id: I7c0806abe5052afb46ca96d506cc5cadc79ee5fe

8 years agoCamera: update NDK metadata tag documents
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

8 years agoAdding dump functions to report state in dumpsys media.audio_flinger
Paul McLean [Tue, 31 May 2016 19:42:01 +0000 (19:42 +0000)]
Adding dump functions to report state in dumpsys media.audio_flinger
am: b776eb3998

* commit 'b776eb3998732bc0278cce84c0ecfd1d91d5874f':
  Adding dump functions to report state in dumpsys media.audio_flinger

Change-Id: Icb859bf4048ed4a122f6c60ce40c34f0f75b5562

8 years agoAdding dump functions to report state in dumpsys media.audio_flinger
Paul McLean [Wed, 11 May 2016 22:48:57 +0000 (16:48 -0600)]
Adding dump functions to report state in dumpsys media.audio_flinger

Change-Id: Icca1d817d56086f61290fc0a46aacd0c577752df

8 years agoMerge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a am: 7fffdc5b8b
Luis Hector Chavez [Sat, 28 May 2016 00:07:23 +0000 (00:07 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a am: 7fffdc5b8b
am: d792635ff5

* commit 'd792635ff5a59b1b8a1f54e09ecc39a50269b2e2':
  audioservice: Update libchrome APIs to r395517

Change-Id: I5be4cd8dd378d71a759612f7ea453694aeddfc72

8 years agoMerge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a
Luis Hector Chavez [Fri, 27 May 2016 23:55:42 +0000 (23:55 +0000)]
Merge "audioservice: Update libchrome APIs to r395517" am: 9b127ae22a
am: 7fffdc5b8b

* commit '7fffdc5b8bc9f22259e4eb0e95a66262a0facb3b':
  audioservice: Update libchrome APIs to r395517

Change-Id: Id2d7ec727a1dbc0e412b55f26110cd82757bc3b4

8 years agoMerge "audioservice: Update libchrome APIs to r395517"
Luis Hector Chavez [Fri, 27 May 2016 23:53:06 +0000 (23:53 +0000)]
Merge "audioservice: Update libchrome APIs to r395517"
am: 9b127ae22a

* commit '9b127ae22ae21c2255981a55dd3ca538df7eb0e9':
  audioservice: Update libchrome APIs to r395517

Change-Id: I3fb36ba147624b2e875977029ee30b1758b88fbf

8 years agoMerge "audioservice: Update libchrome APIs to r395517"
Treehugger Robot [Fri, 27 May 2016 23:43:02 +0000 (23:43 +0000)]
Merge "audioservice: Update libchrome APIs to r395517"

8 years agoaudioservice: Update libchrome APIs to r395517
Luis Hector Chavez [Sat, 21 May 2016 06:13:13 +0000 (23:13 -0700)]
audioservice: Update libchrome APIs to r395517

The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.

Change-Id: I8b1d18cd044009fd7a5889432296de159dc57edd

8 years agoMerge "__ARM_ARCH__ is always >= 6." am: 236049f1b6 am: 1189f6f678
Elliott Hughes [Wed, 18 May 2016 15:40:09 +0000 (15:40 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am: 236049f1b6 am: 1189f6f678
am: ff4f9af68b

* commit 'ff4f9af68b0c1a770bed813e14444c6f2abeac75':
  __ARM_ARCH__ is always >= 6.

Change-Id: Ia7d9ad174c3ff14c150a13393eaf7b262453d7c5

8 years agoMerge "__ARM_ARCH__ is always >= 6." am: 236049f1b6
Elliott Hughes [Wed, 18 May 2016 15:34:44 +0000 (15:34 +0000)]
Merge "__ARM_ARCH__ is always >= 6." am: 236049f1b6
am: 1189f6f678

* commit '1189f6f6788a5cb97f13c5ae7166dc802343c440':
  __ARM_ARCH__ is always >= 6.

Change-Id: I6bb088ce56819a17b4ffa3c7925ac8ccc229368b

8 years agoMerge "__ARM_ARCH__ is always >= 6."
Elliott Hughes [Wed, 18 May 2016 15:31:07 +0000 (15:31 +0000)]
Merge "__ARM_ARCH__ is always >= 6."
am: 236049f1b6

* commit '236049f1b6a05fa31ccca01c64c6ccc81d61bdb1':
  __ARM_ARCH__ is always >= 6.

Change-Id: Ia8439dbe6fd02f966aa9430e30b07cb6416e4b20

8 years agoMerge "__ARM_ARCH__ is always >= 6."
Elliott Hughes [Wed, 18 May 2016 15:19:40 +0000 (15:19 +0000)]
Merge "__ARM_ARCH__ is always >= 6."

8 years ago__ARM_ARCH__ is always >= 6.
Elliott Hughes [Tue, 17 May 2016 19:38:58 +0000 (12:38 -0700)]
__ARM_ARCH__ is always >= 6.

Bug: http://b/18556103
Change-Id: Ib0945132f4d0c662dd3eebea91e0a781485e86ce

8 years agoMerge "Fix misc-macro-parentheses warnings." am: 73e30a2584 am: 94a926bedb
Chih-Hung Hsieh [Mon, 16 May 2016 18:28:32 +0000 (18:28 +0000)]
Merge "Fix misc-macro-parentheses warnings." am: 73e30a2584 am: 94a926bedb
am: d8deff7455

* commit 'd8deff7455ffa50c249b514c6c65b9c9e6150c36':
  Fix misc-macro-parentheses warnings.

Change-Id: Iae3792004cac72e7bb0c8ed1d352a725207167bd

8 years agoMerge "Fix misc-macro-parentheses warnings." am: 73e30a2584
Chih-hung Hsieh [Mon, 16 May 2016 18:26:16 +0000 (18:26 +0000)]
Merge "Fix misc-macro-parentheses warnings." am: 73e30a2584
am: 94a926bedb

* commit '94a926bedb5cd239bacec0e4ae32f97073600d3c':
  Fix misc-macro-parentheses warnings.

Change-Id: If1524cbe5832eb2be931d8d1e02ce452acd54028

8 years agoMerge "Fix misc-macro-parentheses warnings."
Chih-Hung Hsieh [Mon, 16 May 2016 18:24:00 +0000 (18:24 +0000)]
Merge "Fix misc-macro-parentheses warnings."
am: 73e30a2584

* commit '73e30a2584522a45c00e9c497b4b2dd1eb3a8474':
  Fix misc-macro-parentheses warnings.

Change-Id: Ibf95e3930b36d205c99f631033792124d8f715df

8 years agoMerge "Fix misc-macro-parentheses warnings."
Chih-hung Hsieh [Mon, 16 May 2016 18:20:07 +0000 (18:20 +0000)]
Merge "Fix misc-macro-parentheses warnings."

8 years agoCamera: update ndk metadata tag template am: 1d3e1a7583
Yin-Chia Yeh [Thu, 12 May 2016 19:39:17 +0000 (19:39 +0000)]
Camera: update ndk metadata tag template am: 1d3e1a7583
am: e5f2b859e0

* commit 'e5f2b859e0ef92ec2a485c07b743e376db58b859':

Change-Id: Ifa040987b463cd4d09b85fef0fa9c34d0dc9d7cd

8 years agoCamera: update ndk metadata tag template am: 1d3e1a7583
Yin-Chia Yeh [Thu, 12 May 2016 19:37:08 +0000 (19:37 +0000)]
Camera: update ndk metadata tag template am: 1d3e1a7583
am: c5829034b5

* commit 'c5829034b584d7dfb675c2430b4e8da92e7a9bc0':
  Camera: update ndk metadata tag template

Change-Id: Id9b28e71ca9f18bdb9673ab438698c758d3887b1

8 years agoCamera: update ndk metadata tag template
Yin-Chia Yeh [Thu, 12 May 2016 19:34:32 +0000 (19:34 +0000)]
Camera: update ndk metadata tag template
am: 1d3e1a7583

* commit '1d3e1a75837712a7c8953feabf6af9eec84dd296':
  Camera: update ndk metadata tag template

Change-Id: Id9ce584bc372dba72c025c781a64e1c7679a9fcf

8 years agoCamera: update ndk metadata tag template
Yin-Chia Yeh [Thu, 12 May 2016 19:34:23 +0000 (19:34 +0000)]
Camera: update ndk metadata tag template
am: 1d3e1a7583

* commit '1d3e1a75837712a7c8953feabf6af9eec84dd296':
  Camera: update ndk metadata tag template

Change-Id: I235ad26c99c1d147f74d50eed0c4af7f41cd3f74

8 years agoFix misc-macro-parentheses warnings.
Chih-Hung Hsieh [Wed, 11 May 2016 22:13:31 +0000 (15:13 -0700)]
Fix misc-macro-parentheses warnings.

Add parentheses around macro arguments used beside binary operators.

Bug: 28705665
Change-Id: Idccb673b6ffacb4c25980ac74b60f3d5d6c2b56f

8 years agoCamera: update ndk metadata tag template
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

8 years agoMerge changes Ia78f608c,I14dde521 am: 17b3b82b64 am: 48b84f79e8
Ralph Nathan [Mon, 9 May 2016 19:53:52 +0000 (19:53 +0000)]
Merge changes Ia78f608c,I14dde521 am: 17b3b82b64 am: 48b84f79e8
am: 623f460bbf

* commit '623f460bbfcc453ab6b74029b9d119bc56535635':
  brillo: Add volume control to client library.
  brillo: Add binder interfaces for volume control.

Change-Id: I8d0d76fd11d59c91bd37a2e1f89a647d79cbb725

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 am: 39ed48636e
Dan Albert [Sat, 7 May 2016 00:41:28 +0000 (00:41 +0000)]
Merge "Stop hard coding gtest include path." am: b7b0a8a5b4 am: 39ed48636e
am: dca043749d

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

Change-Id: I5c703f7653539a79d011b8550e5e3bf1b6ba847e

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 am: ea549f4e3f
Yin-Chia Yeh [Thu, 28 Apr 2016 19:37:55 +0000 (19:37 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f am: ea549f4e3f
am: 025821c016

* commit '025821c0167997ae0bad56431d23074eec2c98cf':

Change-Id: Ia84b2ef35ec74c093bf08f3b4bbf252aa168b404

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

* commit 'ca4628566d69073028e2783a16e6cd7ba8ae663d':

Change-Id: I120b496b1f44e8b186a4fa9bd2df1517f93bf4e3

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

* commit '24c17eebaf76818f3f88f9901dbefa59389c0818':

Change-Id: I4bb003ce527d04af77eef222532ed85d944e3741

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

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

Change-Id: I9f9be85d3405f45e19dbceb3ad28cae24d230bc4

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

* commit '26f5780f93ba47886034c68cef5a8c50aa67d6f3':
  Camera: Documentation updates

Change-Id: I52b5ab4b3d9ff2831f469cac9e64911d4686e3b1

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

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

Change-Id: I1e58788f64112558afe462b6a2e46f9531f576c2

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 am: 386195f
Yin-Chia Yeh [Thu, 28 Apr 2016 17:32:31 +0000 (17:32 +0000)]
Camera: update FPS range spec am: 206bf4d am: 386195f
am: ea549f4

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

Change-Id: Ia19cd6c9dd7453a4b7549ccea74bc4f537d1fee3

8 years agoCamera: Documentation updates am: 62cfd97 am: 58b8e6e
Eino-Ville Talvala [Thu, 28 Apr 2016 17:32:31 +0000 (17:32 +0000)]
Camera: Documentation updates am: 62cfd97 am: 58b8e6e
am: bf61f8a

* commit 'bf61f8aaaf2aa15ede35bcfdd67d2db10186f638':
  Camera: Documentation updates

Change-Id: I649a515a4430b65a70f1697c2ea59efe767681cf

8 years agoCamera: update video stabilization API doc. am: 161c29c am: 569abce
Jianing Wei [Thu, 28 Apr 2016 17:32:30 +0000 (17:32 +0000)]
Camera: update video stabilization API doc. am: 161c29c am: 569abce
am: 3c770fa

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

Change-Id: I7bf39b86ac180359de611442f00274216b364281

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 am: ad1304d
Yin-Chia Yeh [Wed, 27 Apr 2016 21:15:28 +0000 (21:15 +0000)]
Camera: fix typo in dynamic black level am: ad1304d
am: 5472087

* commit '547208709573fe2481a3583e8053b2f5bfba28d9':

Change-Id: I5804a7c27ee910e900810ddc3aee282ba7b72087

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

* commit '81fc73d6a6ddc8ec718914966c32a56a6c5c452e':
  Camera: fix typo in dynamic black level

Change-Id: Iabd2dea67b3ab170c5c9511c9bed06af19000a2e

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

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

Change-Id: I2409ae20c619a54000f4d47b8e2442fa2bfac70e

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:14:59 +0000 (15:14 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two)." am: 80a9411 am: 9662b91
am: 1ed8a08

* commit '1ed8a08a1df1b69966648e24d0576de37a39982a':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined (take two).

Change-Id: I1e5d4e31bc72ae193f299afdef3023f089bb9c41

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 am: dc868bb
Dan Albert [Fri, 22 Apr 2016 21:10:29 +0000 (21:10 +0000)]
Merge "Fix 64-bit build failure." am: aff3239 am: dc868bb
am: 4178b27

* commit '4178b2714c76dac0e63894a4d6d0c55f54230c0d':
  Fix 64-bit build failure.

Change-Id: I0bd4ed28e60e82745d7882bd548f8edcff02b3a7

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: a56257c66...
Elliott Hughes [Fri, 22 Apr 2016 18:24:27 +0000 (18:24 +0000)]
Merge "Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."" am: a56257c662 am: c54109c089
am: 046256428f

* commit '046256428f82c8e48444906f8ac8aa5791603e29':
  Revert "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined."

Change-Id: Icbbdfe68e6a74ae57022769d786061713b084a14

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 am: 78b1b7e3b8
Ralph Nathan [Fri, 22 Apr 2016 17:19:13 +0000 (17:19 +0000)]
Merge "brillo: Add support for volume buttons." am: 1a15d351fb am: 78b1b7e3b8
am: a09029e8ba

* commit 'a09029e8ba403abb1ccb8b6247ad593fe18ae428':
  brillo: Add support for volume buttons.

Change-Id: Idad2a3b1c1b2d7e60fbec1aab0155a115553a89f

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 am...
Elliott Hughes [Fri, 22 Apr 2016 15:26:34 +0000 (15:26 +0000)]
Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined." am: 187db58e0e am: ce64f48faf
am: cb13e37042

* commit 'cb13e37042c44f67ee54fbc26ab75d582671d03a':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.

Change-Id: Ibb987e3e1aa7832a3e87ac72708bb95ed447aab0

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 am: 2f0f6ba63b
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

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 am: 45afd61
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