Commit graph

5006 commits

Author SHA1 Message Date
Ivan Lozano
2bf3340e78 Revert "Disable XOM in camera.v4l2."
This reverts commit 7c7c62db25.

Reason for revert: libjpeg-turbo has been updated with XOM compatibility.

Change-Id: If1daae895f9cfe08c03169ed2546c81c51a94117
2019-01-15 22:17:46 +00:00
Pirama Arumuga Nainar
f944bc32e1 Merge "Remove extraneous semicolon"
am: df93a64586

Change-Id: I60173cdb3052080562801b8c4baf33ece4efd9d4
2019-01-15 14:14:28 -08:00
Treehugger Robot
df93a64586 Merge "Remove extraneous semicolon" 2019-01-15 21:55:04 +00:00
Pirama Arumuga Nainar
e0dc13833f Remove extraneous semicolon
Bug: http://b/122481018

Upcoming clang update has a warning, -Wextra-semi-stmt, that warns about
extra semicolons.  Remove extra semi-colon after an 'if' statement.

Test: Build with new Clang.
Change-Id: I05e7c027126b2ed6e61da8e749bbb813b7afd0e3
2019-01-15 10:31:39 -08:00
Ari Hausman-Cohen
662b32fcf2 Merge "camera: add a lock for the request tracker" am: 8c3812f639 am: 421cd310cf
am: 7bac9b0e96

Change-Id: Ie4877dd1169e99fe8e2dcfa64cc9a77de44492ae
2019-01-10 12:19:52 -08:00
Ari Hausman-Cohen
7bac9b0e96 Merge "camera: add a lock for the request tracker" am: 8c3812f639
am: 421cd310cf

Change-Id: Iaab5e9f47eac406ff70c5dd8df1492e68e9c2d02
2019-01-10 11:59:28 -08:00
Ari Hausman-Cohen
421cd310cf Merge "camera: add a lock for the request tracker"
am: 8c3812f639

Change-Id: I3b12af65ca2ba3d20f9e52200c0c4aa15629530a
2019-01-10 11:21:54 -08:00
Ari Hausman-Cohen
8c3812f639 Merge "camera: add a lock for the request tracker" 2019-01-10 19:01:26 +00:00
Sergii Piatakov
f16950bbf2 Merge "camera: remove redundant and unnecessary includes" am: 9dae907ea0 am: 547abc4ae4
am: eb83d293ff

Change-Id: I38c53a926e1cabd67c194714ca52e4f5f0b417e3
2019-01-09 17:22:16 -08:00
Sergii Piatakov
eb83d293ff Merge "camera: remove redundant and unnecessary includes" am: 9dae907ea0
am: 547abc4ae4

Change-Id: I416e1dcf1f93818fc91d71a5899b2adf4124185a
2019-01-09 17:07:51 -08:00
Sergii Piatakov
547abc4ae4 Merge "camera: remove redundant and unnecessary includes"
am: 9dae907ea0

Change-Id: If7993db6028de52868b4126623e1f020a0183faf
2019-01-09 16:54:05 -08:00
Treehugger Robot
9dae907ea0 Merge "camera: remove redundant and unnecessary includes" 2019-01-10 00:39:43 +00:00
Sergii Piatakov
807028ce53 Merge "camera: allow to get size of JPEG after conversion" am: 3664a25aa7 am: 18033cb5d5
am: ddcd9c949f

Change-Id: I00e6cba64605a7669b7fc127bb70cc2b83dda4bc
2019-01-08 17:49:39 -08:00
Sergii Piatakov
ddcd9c949f Merge "camera: allow to get size of JPEG after conversion" am: 3664a25aa7
am: 18033cb5d5

Change-Id: I0cdf28c7a1c8732635f70c86aa79407785765b5d
2019-01-08 17:45:38 -08:00
Sergii Piatakov
18033cb5d5 Merge "camera: allow to get size of JPEG after conversion"
am: 3664a25aa7

Change-Id: I4acc12c67e8f446dcc8ab6e9f585b77bd3ab0d70
2019-01-08 17:39:36 -08:00
Treehugger Robot
3664a25aa7 Merge "camera: allow to get size of JPEG after conversion" 2019-01-09 01:23:12 +00:00
Valerie Hau
69c53431b8 Adding Hdr10+ support
Bug: 118343714
Test: build, boot
Change-Id: Ieacf107cb9f7710ba89156209e7a2ce4c6ae5ba4
2018-12-20 07:57:25 -08:00
Paul McLean
fa3ae3ed74 Adding Audio HAL V5: Direction API
Bug: 119137468
Test: Tesbed App

Change-Id: I0dfc773344654f61f2ad9f5e8ed22a96e6b26ad5
2018-12-19 12:00:22 -07:00
Chih-Hung Hsieh
3f0f82b63d Merge "Fix cert-dcl16-c clang-tidy warnings" am: 48d500c9e3 am: 71062f3f98
am: d93a0ebf49

Change-Id: Id249d36d6f6c3be45c9d426365ce69e85a05269b
2018-12-13 14:56:58 -08:00
Chih-Hung Hsieh
d93a0ebf49 Merge "Fix cert-dcl16-c clang-tidy warnings" am: 48d500c9e3
am: 71062f3f98

Change-Id: I3e3c68912ea7dfa52664228b2636a74313fb2442
2018-12-13 13:56:31 -08:00
Chih-Hung Hsieh
71062f3f98 Merge "Fix cert-dcl16-c clang-tidy warnings"
am: 48d500c9e3

Change-Id: Ic61aaa453b1829f1f1da38958767597e27bb4873
2018-12-13 13:44:00 -08:00
Chih-Hung Hsieh
0dfc1ec6cb Merge "Fix performance-for-range-copy warnings" am: a6a462a015 am: 71e5bab1db
am: 922e84c2fd

Change-Id: Idee25a2fa2009e203c1ecd378236fdfb92edd747
2018-12-13 13:14:26 -08:00
Chih-Hung Hsieh
922e84c2fd Merge "Fix performance-for-range-copy warnings" am: a6a462a015
am: 71e5bab1db

Change-Id: If03e884a4b923482e7b9c626bf3388413a26075a
2018-12-13 13:08:56 -08:00
Chih-Hung Hsieh
71e5bab1db Merge "Fix performance-for-range-copy warnings"
am: a6a462a015

Change-Id: I27a0a95b375527ad10fcf2c7bd7dd7e112571db9
2018-12-13 12:59:02 -08:00
Ivan Lozano
3fac49442d Merge "Disable XOM in camera.v4l2." am: 1908ba0732 am: 6ca60bc346
am: c334599dfe

Change-Id: I730f62bfb2f28cf919614af3a5f7e0b8445079b0
2018-12-13 10:40:14 -08:00
Treehugger Robot
48d500c9e3 Merge "Fix cert-dcl16-c clang-tidy warnings" 2018-12-13 00:40:34 +00:00
Treehugger Robot
a6a462a015 Merge "Fix performance-for-range-copy warnings" 2018-12-13 00:08:05 +00:00
Chih-Hung Hsieh
3d68176cfd Fix cert-dcl16-c clang-tidy warnings
Bug: 120614316
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,cert-dcl16-c
Change-Id: I744040edc476bf2bb58413a2a14965c27113a5bd
2018-12-12 22:23:40 +00:00
Chih-Hung Hsieh
6c8e827c61 Fix performance-for-range-copy warnings
Bug: 30413223
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,performance*
Change-Id: I800b659c039c54fd52a927a88904d642604722f7
2018-12-12 14:22:28 -08:00
Ivan Lozano
c334599dfe Merge "Disable XOM in camera.v4l2." am: 1908ba0732
am: 6ca60bc346

Change-Id: I70763a0404c50059e17d6897351fc5b343105c69
2018-12-12 14:09:43 -08:00
Ivan Lozano
6ca60bc346 Merge "Disable XOM in camera.v4l2."
am: 1908ba0732

Change-Id: I59231a87d4e9c16c47e85155cf9722495fe296a3
2018-12-12 13:55:35 -08:00
Treehugger Robot
1908ba0732 Merge "Disable XOM in camera.v4l2." 2018-12-12 21:30:30 +00:00
TreeHugger Robot
8593adfe77 Merge "Camera: Add camera module support for stream combination query" 2018-12-06 12:33:30 +00:00
Brian Duddie
4435ec4bb5 Merge "Add bstack to sensors OWNERS file" am: 0b2aabd6e6 am: 40283a933d
am: 11c3ef4db8

Change-Id: I7d5ed4e11c48deabd10db640cd7059dc8f3a491f
2018-11-30 20:42:28 -08:00
Brian Duddie
11c3ef4db8 Merge "Add bstack to sensors OWNERS file" am: 0b2aabd6e6
am: 40283a933d

Change-Id: Ic64a353c3d7c95ea42863ff4274d90686a10e4a2
2018-11-30 20:33:02 -08:00
Brian Duddie
40283a933d Merge "Add bstack to sensors OWNERS file"
am: 0b2aabd6e6

Change-Id: Ic2b27927a8ec0d2c47373feff3fda92cfaefdf94
2018-11-30 20:29:00 -08:00
Treehugger Robot
0b2aabd6e6 Merge "Add bstack to sensors OWNERS file" 2018-12-01 04:12:31 +00:00
Brian Duddie
7b007c989f Add bstack to sensors OWNERS file
Test: n/a
Change-Id: I25ae89abe1dfe1552e92cccf0354a269959c0c13
2018-11-30 13:33:20 -08:00
Peiyong Lin
f09421f093 [hwcomposer2] Introduced DisplayCapability.
Previously, capability like SkipClientColorTransform is a global capability of
device. However, the hardware is not necessarily able to apply for all
displays, for example external display. Thus, in this patch, we introduce
DisplayCapability for per display capability query.

BUG: 69911676
Test: Build, flash and boot
Change-Id: Id34c83acacb94ebfe27077122e4581522aca9d03
2018-11-30 09:33:40 -08:00
Ivan Lozano
7c7c62db25 Disable XOM in camera.v4l2.
Disable execute-only memory layouts in camera.v4l2.

This relies on libjpeg_static_ndk, which contains some data mixed into
code and thus requires a readable .text.

Bug: 77958880
Test: Built the library, checked the program headers with readelf.

Change-Id: I5646b8c5e9a0ad151663df29f019b5a84db4b15c
2018-11-29 14:37:38 -08:00
Michael Dooley
73194310d8 Merge "Converting sound trigger v2.2 getModelState to be asynchronous" 2018-11-12 19:27:39 +00:00
Emilian Peev
8ca3c60f5c Camera: Add camera module support for stream combination query
Add necessary API to support stream combination query.
This will be used in case Hal supports the new 2.5 module
API.

Bug: 111593096
Test: Camera VTS
Change-Id: I916dcbd585e07be16f2f07da0076fb68039d6a00
2018-11-09 14:14:03 +00:00
mike dooley
737f4ce99d Converting sound trigger v2.2 getModelState to be asynchronous
Test: built android with checkbuild flag

Change-Id: I8e927125dcedbc4b98ceb2886806225b2851c082
Bug-Id: 70206501
2018-11-08 08:11:02 +01:00
Kevin DuBois
2d8649c1dc Merge "graphics: Add display color sampling interface." 2018-11-07 17:39:04 +00:00
Kevin DuBois
1345887f62 graphics: Add display color sampling interface.
Add a graphics.composer@2.3 interface that will expose
color sampling hardware present on some devices to the
framework. Adds:
  getDisplayedContentSamplingAttributes
  setDisplayedContentSamplingEnabled
  getDisplayedContentSample

Test: boot up pixel3
Test: VtsHalGraphicsComposerV2_3TargetTest on revved Pixel3 hwcomposer
Bug: 116028976
Change-Id: Iab92d2d173f9ae8723f87b75c5e47db8f72baff4
2018-11-01 12:46:39 -07:00
Ari Hausman-Cohen
efc1372b00 Merge "camera: initialize smart pointer before usage" am: 8f89886dad am: b893b0cedb
am: c8083cac38

Change-Id: I11bdbcdb80fa772d17c9088f43c01581d00e7851
2018-10-31 11:59:00 -07:00
Ari Hausman-Cohen
c8083cac38 Merge "camera: initialize smart pointer before usage" am: 8f89886dad
am: b893b0cedb

Change-Id: I607b8e2eb92c535c2b4e212e33a89583cd71cddd
2018-10-31 11:55:04 -07:00
Ari Hausman-Cohen
b893b0cedb Merge "camera: initialize smart pointer before usage"
am: 8f89886dad

Change-Id: If69640739b66bb2d195d40eb54d776c34f6e350b
2018-10-31 11:48:54 -07:00
Ari Hausman-Cohen
8f89886dad Merge "camera: initialize smart pointer before usage" 2018-10-31 18:34:16 +00:00
Bill Yi
9037a95581 [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 92111e7392 -s ours am: 86ec433acd -s ours
am: c8cf32ad34  -s ours

Change-Id: I7ab2ff5cfeb07821441cd5d9d8b8aec99def7948
2018-10-24 19:21:50 -07:00