OSDN Git Service
android-build-team Robot [Sun, 7 Jan 2018 08:31:43 +0000 (08:31 +0000)]
Snap for
4531101 from
218925a9db3a317136595b9751b4a4297cca0715 to pi-release
Change-Id: Ib53413296d04a5745e35adb63d83b410e3d779ce
Chien-Yu Chen [Wed, 3 Jan 2018 20:04:48 +0000 (12:04 -0800)]
camera: Add device info version
Test: CTS
Bug:
64847201
Change-Id: Ia7b5ca8fc37093afd5a5e29d46d437159bb5c454
android-build-team Robot [Wed, 3 Jan 2018 08:21:32 +0000 (08:21 +0000)]
Snap for
4523885 from
5fb920ec5437f3335b6077a73c9f6421aa0d7894 to pi-release
Change-Id: I7a6533feaa5d9a32a1bbd95ec689615cab967041
Shuzhen Wang [Thu, 28 Dec 2017 21:35:32 +0000 (13:35 -0800)]
Camera: Fix Hidl metadata section generation
- Fix name collision related to metadata section
- Fix fully qualified metadata name for ANDROID_SECTION_COUNT
Test: Run hidl-gen with added new metadata sections
Bug:
71388767
Change-Id: I59bc4494b81b1e7207796f2597cc20516fa64fcd
android-build-team Robot [Sun, 24 Dec 2017 08:34:13 +0000 (08:34 +0000)]
Snap for
4517567 from
094aa577e5d6f3e63c2294bd26a3f18f85f9c65d to pi-release
Change-Id: Id9012dbe14163b8cae35fec405ea87fd05d5e0be
TreeHugger Robot [Fri, 22 Dec 2017 19:18:45 +0000 (19:18 +0000)]
Merge "camera metadata: Add support for session parameter keys"
TreeHugger Robot [Fri, 22 Dec 2017 00:16:57 +0000 (00:16 +0000)]
Merge "Camera: Add support for HAL-versioned enum values"
Eino-Ville Talvala [Thu, 7 Dec 2017 21:06:05 +0000 (13:06 -0800)]
Camera: Add support for HAL-versioned enum values
- Add hal_version to enum value fields as well, and add it to various doc outputs
- Improve HIDL metadata generation to work better with hidl-doc, and properly handle
enum value additions in new hal versions
- Enable HIDL HAL 3.3 output
Test: Builds, hidl-gen/hidl-doc are happy with the HIDL output
Bug:
63629224
Change-Id: I64b31d9e8e6eda41268df0fc95962b52fcce7fee
Ivan Lozano [Wed, 20 Dec 2017 16:06:23 +0000 (16:06 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path." am:
a2c091b0f5 am:
de301d6bbb
am:
d7c33dd402 -s ours
Change-Id: I96f98f96ecc73492fa3ec5fb205a991351d621a3
Ivan Lozano [Wed, 20 Dec 2017 16:04:20 +0000 (16:04 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path." am:
a2c091b0f5
am:
de301d6bbb
Change-Id: I0167f99b21e47d7cf295e531e77deea5515d1eb6
Ivan Lozano [Wed, 20 Dec 2017 16:01:50 +0000 (16:01 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."
am:
a2c091b0f5
Change-Id: I69fd85d18dd0bd7243924ca9949916593e9fdfd7
Ivan Lozano [Wed, 20 Dec 2017 15:55:06 +0000 (15:55 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."
Ivan Lozano [Wed, 6 Dec 2017 21:09:08 +0000 (13:09 -0800)]
Fix integer sanitizer in audio_route_update_path.
Calculating i could sometimes cause an unsigned integer overflow, which
led to runtime errors on integer sanitized builds.
runtime error: unsigned integer overflow: 0 - 1 cannot be represented in
type 'unsigned int'
This refactors the loop to avoid the overflow.
Bug:
30969751
Test: Compiles and device boots.
Change-Id: I468d064eda5213fd773a094412cd669fc23617dc
Merged-In: I468d064eda5213fd773a094412cd669fc23617dc
android-build-team Robot [Wed, 13 Dec 2017 08:34:54 +0000 (08:34 +0000)]
Snap for
4500033 from
25cabed6c9a47c6c05a31daac2bfa5bd916ced5f to pi-release
Change-Id: I8a4dc7eb42628214c6c7515518132ceac6f19839
Ivan Lozano [Wed, 13 Dec 2017 01:06:40 +0000 (01:06 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."
Emilian Peev [Fri, 17 Nov 2017 13:20:12 +0000 (13:20 +0000)]
camera metadata: Add support for session parameter keys
"availableRequestKeys" can be used by Hals to list any
available capture request keys suitable as session wide
parameters.
Bug:
64450664
Test: Camera CTS
Change-Id: Ia05153abf2e2d5cd4e886307f6f147edd8f31160
android-build-team Robot [Mon, 11 Dec 2017 12:15:22 +0000 (12:15 +0000)]
Snap for
4496165 from
676329b96e7519def7ac08cf2c4b53c4a0424994 to pi-release
Change-Id: I1b5901f18e0d0ab10c40beba363a985c3a2a3289
TreeHugger Robot [Sat, 9 Dec 2017 00:10:34 +0000 (00:10 +0000)]
Merge "Camera: Generate HIDL metadata modules"
Andy Hung [Fri, 8 Dec 2017 04:44:29 +0000 (04:44 +0000)]
Merge "Add adjust_selected_channels for audio conversion"
Xin Li [Fri, 8 Dec 2017 04:32:43 +0000 (04:32 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
7f95a5e31f -s ours am:
c4a8bb2083
am:
d7ffb719af -s ours
Change-Id: Iae682061a0d6ac2d20fdb27dc465391bccc2b9fd
Stephen Li [Thu, 7 Dec 2017 23:56:23 +0000 (23:56 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: I117d92163f035ad486609c0e9a7553a1dd57096f
Ivan Lozano [Wed, 6 Dec 2017 21:09:08 +0000 (13:09 -0800)]
Fix integer sanitizer in audio_route_update_path.
Calculating i could sometimes cause an unsigned integer overflow, which
led to runtime errors on integer sanitized builds.
runtime error: unsigned integer overflow: 0 - 1 cannot be represented in
type 'unsigned int'
This refactors the loop to avoid the overflow.
Bug:
30969751
Test: Compiles and device boots.
Change-Id: I468d064eda5213fd773a094412cd669fc23617dc
Xin Li [Thu, 7 Dec 2017 19:32:19 +0000 (19:32 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
7f95a5e31f -s ours
am:
c4a8bb2083
Change-Id: I338fcdc0e925551e95e073956e3dc699a9331f78
Xin Li [Thu, 7 Dec 2017 19:16:30 +0000 (19:16 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
7f95a5e31f -s ours
Change-Id: I829dc0994801fdb027764ef0291e36e349fd7212
Xin Li [Thu, 7 Dec 2017 07:23:57 +0000 (07:23 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
d481b28a58 -s ours
am:
7f1905e2a2
Change-Id: Id20ac9fc2e87bc5a91aa0dcdfffc7c5b003f0249
Xin Li [Thu, 7 Dec 2017 04:51:27 +0000 (04:51 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
d481b28a58 -s ours
Change-Id: I8e2ec84d8e11217b94c2d7bda627be6ba27b3453
Andy Hung [Fri, 1 Dec 2017 21:24:52 +0000 (13:24 -0800)]
Add adjust_selected_channels for audio conversion
Used for multichannel effects.
Test: channels_tests
Bug:
70038539
Change-Id: I9e80d2f0565f3eff8623f01260850c628b18c3a5
Xin Li [Wed, 6 Dec 2017 23:18:27 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:23 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I3bc6715898ae3e9f1b1b98901d419e5101ffbfc4
android-build-team Robot [Wed, 6 Dec 2017 08:21:53 +0000 (08:21 +0000)]
Snap for
4486962 from
b8c6828db40f28b1f130b69dd2a3ddf414acd540 to pi-release
Change-Id: I338c355c55d6fad318f1704df8839b8787930ed8
Eino-Ville Talvala [Fri, 17 Nov 2017 22:48:20 +0000 (14:48 -0800)]
Camera: Generate HIDL metadata modules
- Add HidlMetadata.mako template for creating HIDL types.hal files
- Add necessary helpers and model properties to easily find sections and entries added in a given
HIDL version
- Ensure the HIDL version also shows up in the first entry of each section in the camera_metadata
C headers
- Add HIDL output to metadata-generate (though each new HIDL version needs to have a few lines added)
Bug:
33262893
Test: Verify generated HIDL output manually, build, and HIDL built-in sanity checks.
Add a few test entries and sections with different HIDL versions to see that generated code is right.
Change-Id: I9ee3b0839bab4b3efed415dab4208bacdbad56b1
Chien-Yu Chen [Tue, 28 Nov 2017 00:12:38 +0000 (16:12 -0800)]
camera: Add AF scene change
Test: CTS
Bug:
64847201
Change-Id: Ia467978f57fece776c65c85d390030c02bade081
android-build-team Robot [Thu, 30 Nov 2017 08:49:01 +0000 (08:49 +0000)]
Snap for
4476081 from
0ebba4b4d91663d02bd759bdb65ae528e3e78dc7 to pi-release
Change-Id: I9031a19614d6943cb5dba051fd1f0b8073dc4a42
Andy Hung [Sat, 18 Nov 2017 00:02:19 +0000 (16:02 -0800)]
Update audio primitives for floating point conversion speed
Floats now round-half-up instead of round-half-to-even.
This returns 25% gain in performance for slightly worse rounding.
Also a cosmetic change to convert an if to an add with boolean.
Bug:
69479669
Test: primitives_tests
Change-Id: I15dc17f5732e41594c23831622d0c1642881a711
android-build-team Robot [Tue, 28 Nov 2017 08:34:11 +0000 (08:34 +0000)]
Snap for
4471243 from
62c3d9faa33b2dfc9cc1a6b6c501190005593715 to pi-release
Change-Id: I814eba6e8226d959a462df4b287d262985cf5dc3
Andy Hung [Wed, 22 Nov 2017 00:36:41 +0000 (16:36 -0800)]
Deprecate ditherAndClamp with memcpy_to_i16_from_q4_27
Test: primitives_tests
Bug:
69636805
Change-Id: I012d0cab85ce09125bc5c1eed3cdd9e4c9e4ee25
android-build-team Robot [Wed, 22 Nov 2017 08:22:44 +0000 (08:22 +0000)]
Snap for
4464948 from
32954a16d6db2b81ba27039eff44a19db0097f07 to pi-release
Change-Id: Ie8c6a5623acfca9fe0a78805a2f45d43639e1dc6
Andy Hung [Wed, 22 Nov 2017 01:50:17 +0000 (01:50 +0000)]
Merge "Allow in-place audio primitive operations."
Andy Hung [Tue, 21 Nov 2017 23:41:16 +0000 (23:41 +0000)]
Merge "Update audio primitives to avoid unsigned overflow"
android-build-team Robot [Sun, 19 Nov 2017 08:25:27 +0000 (08:25 +0000)]
Snap for
4459973 from
c8df8b0428ea05835bf6c8fcd4c8c39535abc925 to pi-release
Change-Id: I7e522a344c931002f573a9bccb9aef712c1c7e29
Andy Hung [Fri, 17 Nov 2017 23:54:27 +0000 (15:54 -0800)]
Allow in-place audio primitive operations.
Difference in performance is negligible ~ 2% loss going reverse.
Test: primitives_tests
Bug:
69478507
Change-Id: I39522f45d81956e1108276161ce4a92fc0ab3fba
Andy Hung [Fri, 17 Nov 2017 23:46:55 +0000 (15:46 -0800)]
Update audio primitives to avoid unsigned overflow
Test: Native primitive_tests
Bug:
69478245
Change-Id: I5beeecbb06dfd287cb1953ebb7b2208667c84d37
TreeHugger Robot [Fri, 17 Nov 2017 18:26:34 +0000 (18:26 +0000)]
Merge "audio: Add constant for MSD HAL service name"
Mikhail Naganov [Thu, 16 Nov 2017 17:41:34 +0000 (09:41 -0800)]
audio: Add constant for MSD HAL service name
The constant is used both by the MSD HAL service to register
itself, and by audioserver in order to discover it.
Bug:
63901775
Test: build
Change-Id: I78a513de501dda1bbd6742298af78de485c7b325
TreeHugger Robot [Fri, 17 Nov 2017 01:32:27 +0000 (01:32 +0000)]
Merge "audio: make audio_attributes_t packed"
TreeHugger Robot [Fri, 17 Nov 2017 01:31:08 +0000 (01:31 +0000)]
Merge "Fix audio_config size difference between 32 and 64 bit."
Eric Laurent [Thu, 16 Nov 2017 19:38:34 +0000 (11:38 -0800)]
audio: make audio_attributes_t packed
Make struct audio_attributes packed as it is passed over binder
Test: AudioTrack CTS test
Change-Id: I51b1ef0f035ee078338482514723aaf0fb1de6c2
TreeHugger Robot [Thu, 16 Nov 2017 18:29:43 +0000 (18:29 +0000)]
Merge "Camera: Fix up metadata generation, including HIDL gen"
android-build-team Robot [Thu, 16 Nov 2017 08:23:31 +0000 (08:23 +0000)]
Snap for
4455093 from
4db50570f65ca933fe33b347f53dbd9a90f17ea6 to pi-release
Change-Id: I4dd91e358fdcb597b8791574c37debc2b9f41e6c
Eino-Ville Talvala [Fri, 10 Nov 2017 23:13:04 +0000 (15:13 -0800)]
Camera: Fix up metadata generation, including HIDL gen
- Merge NDK and SDK metadata definitions back together
- Add special linkify handling for SDK/NDK alternate names
- Add ndk/sdk specific notes/details tags
- Use new tags/link format to merge ndk_metadata_properties docs
into metadata_properties
- Rename metadata_properties to metadata_definitions for clarity
- Move SDK reference images to /reference/images/camera2/...
- Add HIDL metadata HAL field to entries, defaulting to 3.2
- Output HAL version into docs.html and camera_metadata_tags.h
Outputting new HIDL module defintions for new metadata versions will
be in a later CL.
Bug:
29102963
Bug:
33262893
Test: Builds, manual inspection of resulting generated files
Change-Id: Ib61111ebf3a068fe62b7a3305b6ab462619c39bb
Kevin Rocard [Wed, 15 Nov 2017 17:09:29 +0000 (09:09 -0800)]
Disable audio primitive benchmark on darwin
The benchmark depends on external/google-benchmark that is disabled on
darwin.
As a result the audio primitive benchmark fails to build on this target
and broke the build.
Test: build sdk_phone_armv7-sdk on the build server
BZ: none, fix broken master
Change-Id: I4f22bf3481749c576e28089480cff8d618a2b7b8
Signed-off-by: Kevin Rocard <krocard@google.com>
android-build-team Robot [Wed, 15 Nov 2017 08:33:39 +0000 (08:33 +0000)]
Snap for
4453288 from
8ad6cea5978252e41f9147d7215a4e415296e0a4 to pi-release
Change-Id: I0852840a5b6704a686c116d0ae8b9f2fbcaf154b
TreeHugger Robot [Wed, 15 Nov 2017 04:51:31 +0000 (04:51 +0000)]
Merge "audio_utils primitives: Add float clamping memcopy"
Kevin Rocard [Fri, 10 Nov 2017 06:12:51 +0000 (22:12 -0800)]
audio_utils primitives: Add float clamping memcopy
For security reason, float buffers provided by application must be
clamped to FLOAT_NOMINAL_RANGE_HEADROOM.
With the new all float pipeline, float are no longer clamped by their
conversion to fixed point.
This patch adds a function to efficiently clamp a buffer during a
memcopy.
Test: adb shell /system/bin/primitives_benchmark
Test: adb shell /data/nativetest/primitives_tests/primitives_tests --gtest_filter=*Clamping*
Bug:
68099072
Change-Id: I030b247ea29cb94c62d1206c31960f45da2446e6
Signed-off-by: Kevin Rocard <krocard@google.com>
Andy Hung [Tue, 14 Nov 2017 22:38:39 +0000 (22:38 +0000)]
Merge "Added float pointer to audio_buffer_s"
android-build-team Robot [Thu, 9 Nov 2017 08:28:59 +0000 (08:28 +0000)]
Snap for
4442369 from
0bccb318aa37ec08a8c8dedf73fab7239f93a953 to pi-release
Change-Id: Ieaa87122964533cd25131f68ca6051ca82e27516
Emilian Peev [Wed, 8 Nov 2017 09:22:47 +0000 (09:22 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995 am:
451248f8cf am:
ad0fcdf98e am:
76107db984
am:
620bb1bd8c
Change-Id: I774b39090ec78b021d33e722f41ac625c8d88256
Emilian Peev [Wed, 8 Nov 2017 09:20:56 +0000 (09:20 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995 am:
451248f8cf am:
ad0fcdf98e
am:
76107db984
Change-Id: Icf366ee9975281f7721338237000c86788033fb3
Emilian Peev [Wed, 8 Nov 2017 09:18:46 +0000 (09:18 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995 am:
451248f8cf
am:
ad0fcdf98e
Change-Id: I39fb59ede8d8d80420d94cdecbf7753fde081b53
Emilian Peev [Wed, 8 Nov 2017 09:17:17 +0000 (09:17 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454 am:
852082d995
am:
451248f8cf
Change-Id: I859f983afd66dedb1b924601cdcd86b0221ae40c
Emilian Peev [Wed, 8 Nov 2017 09:15:17 +0000 (09:15 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba am:
a98aeeb454
am:
852082d995
Change-Id: I86ea2b4fc41e72c15ac826a2b26a44f2eff8d595
Emilian Peev [Wed, 8 Nov 2017 09:13:43 +0000 (09:13 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730 am:
9b1ebd3fba
am:
a98aeeb454
Change-Id: Ic8018da777692c09296dd37e1300273fcd23df15
Emilian Peev [Wed, 8 Nov 2017 09:11:43 +0000 (09:11 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb am:
3fdaebe730
am:
9b1ebd3fba
Change-Id: I7a12ed947dc72e7fdfd36426ca8f849ff6bb0c03
Emilian Peev [Wed, 8 Nov 2017 09:09:44 +0000 (09:09 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066 am:
c5fe6aefeb
am:
3fdaebe730
Change-Id: Ie70ae750d490da65efb0c9374390a0c23efc44f4
Emilian Peev [Wed, 8 Nov 2017 09:07:16 +0000 (09:07 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905 am:
7a854a6066
am:
c5fe6aefeb
Change-Id: Ib84080a0f82b66249c18bad37bb0cac75dcda40f
Emilian Peev [Wed, 8 Nov 2017 09:05:15 +0000 (09:05 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407 am:
e1d6665905
am:
7a854a6066
Change-Id: Ie73f3adb4ea0314d3549ced7aa2be2142499c383
Emilian Peev [Wed, 8 Nov 2017 09:03:10 +0000 (09:03 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6 am:
6dc0f83407
am:
e1d6665905
Change-Id: Iafcf491f2b32917125541a2da4f262d4a745554c
Emilian Peev [Wed, 8 Nov 2017 09:00:42 +0000 (09:00 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf am:
90045db6e6
am:
6dc0f83407
Change-Id: Ib4986884c9fe83017ee67d544ef6ef549c042cfc
Emilian Peev [Wed, 8 Nov 2017 08:58:10 +0000 (08:58 +0000)]
Camera metadata: Check source metadata size am:
489bbd13bf
am:
90045db6e6
Change-Id: Idfc8486d568546bc889cd1456a14ae9861359740
Emilian Peev [Wed, 8 Nov 2017 08:55:39 +0000 (08:55 +0000)]
Camera metadata: Check source metadata size
am:
489bbd13bf
Change-Id: I3664526ef2de813ea2b1c303a53d55246c1b370b
rago [Thu, 2 Nov 2017 22:53:09 +0000 (15:53 -0700)]
Added float pointer to audio_buffer_s
Used for all floating point effect chains
Bug:
63935479
Test: Bufflog dumps, frequency analysis comparison, SoloTester
Change-Id: I70e61e0781e8dce684e8b81b4c8eacee83339277
Emilian Peev [Mon, 6 Nov 2017 10:41:19 +0000 (10:41 +0000)]
Camera metadata: Check source metadata size
Source size passed by client could be smaller than 'camera_metadata_t'.
In this case the cast in 'allocate_copy_camera_metadata_checked()' will
be incorrect and we will try to access invalid heap memory.
Bug:
67782345
Test: Camera CTS
Change-Id: I9582c704f414493978d09ffb603b5e8368cda5ce
android-build-team Robot [Thu, 2 Nov 2017 08:02:51 +0000 (08:02 +0000)]
Snap for
4429796 from
2c95978c66d7e030b53832b6a61bfca51694ab9f to pi-release
Change-Id: Ib5bdd4e52fbe5f349ea0bfd0611d3cb59ebe7db5
Andy Hung [Sat, 28 Oct 2017 03:20:27 +0000 (20:20 -0700)]
Add const qualifiers to alsa device profile.
Test: make
Bug:
68211730
Change-Id: I97e5ca3bded99f7005332b38d9e6aa33a6cc271d
android-build-team Robot [Fri, 13 Oct 2017 08:15:35 +0000 (08:15 +0000)]
Snap for
4393550 from
517332af82f8f3598fe6e7a7f1b095258eb55d35 to pi-release
Change-Id: I9995509a7d78d73b28fb9f0ba7334573db62793a
Dan Albert [Thu, 12 Oct 2017 02:22:07 +0000 (02:22 +0000)]
Merge "Add missing includes." am:
b81a57f4a4 am:
56f00a0b6a am:
76aa001add
am:
639ea04ac2
Change-Id: I87abcfe9d5a2c8d599e3340359668f587d3c0086
Dan Albert [Wed, 11 Oct 2017 22:05:43 +0000 (22:05 +0000)]
Merge "Add missing includes." am:
b81a57f4a4 am:
56f00a0b6a
am:
76aa001add
Change-Id: I9fbfb02407073b97fee0f1c79e4f1a4529fdf7f3
Dan Albert [Wed, 11 Oct 2017 21:39:51 +0000 (21:39 +0000)]
Merge "Add missing includes." am:
b81a57f4a4
am:
56f00a0b6a
Change-Id: I9f75181408cc15daf46dd356a3672697f3c1653a
Dan Albert [Wed, 11 Oct 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Add missing includes."
am:
b81a57f4a4
Change-Id: I2fa4f1963fd201e78970e34da42ecf428493ad81
Treehugger Robot [Wed, 11 Oct 2017 21:21:36 +0000 (21:21 +0000)]
Merge "Add missing includes."
Dan Albert [Wed, 11 Oct 2017 19:26:23 +0000 (12:26 -0700)]
Add missing includes.
Test: mma
Bug: None
Change-Id: I13f84f8eaa82b0d6801987cca83a824077b500da
android-build-team Robot [Fri, 6 Oct 2017 08:08:10 +0000 (08:08 +0000)]
Snap for
4380820 from
f6fbaf8fc22da2f9f8becab2615723bb2480ed87 to pi-release
Change-Id: I22217c78ed2e8d84cf04bf7c0ab79d7d29cc9d61
Emilian Peev [Wed, 4 Oct 2017 17:55:10 +0000 (17:55 +0000)]
Camera: docs: Allow vendor tags inside available tag lists am:
3984754b77
am:
270557046e
Change-Id: Ib7f6e6b52cfefafd9e33d36bc9a3b54bd1ae2b54
Emilian Peev [Wed, 4 Oct 2017 17:46:09 +0000 (17:46 +0000)]
Camera: docs: Allow vendor tags inside available tag lists
am:
3984754b77
Change-Id: Ie87fe8ca705469fd8d95e1adfd7c2e79e4e55403
Emilian Peev [Mon, 25 Sep 2017 08:17:04 +0000 (09:17 +0100)]
Camera: docs: Allow vendor tags inside available tag lists
Allow categorization of vendor tag via:
android.request.availableRequestKeys,
android.request.availableResultKeys,
android.request.availableCharacteristicsKeys
Test: make
Bug:
63817523
Change-Id: I550340b08d4158557a07a8eeeadb0353ebf41e24
android-build-team Robot [Wed, 20 Sep 2017 08:24:18 +0000 (08:24 +0000)]
release-request-
e2e4ef47-6e2d-4fd3-aa91-
845ba8826fbc-for-git_pi-release-
4349279 snap-temp-L58700000104420312
Change-Id: Ifafd12177320bbb4baa406b065eb7e507dbbfcd6
Ralph Nathan [Tue, 19 Sep 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Remove old Brillo code." am:
f1041f736a am:
96e1565ef7 am:
89fefe5bf2
am:
a5d056c706
Change-Id: I8ab56ce61f7a488a09fb54d6ebfe1cfe79071b3e
Ralph Nathan [Tue, 19 Sep 2017 20:42:48 +0000 (20:42 +0000)]
Merge "Remove old Brillo code." am:
f1041f736a am:
96e1565ef7
am:
89fefe5bf2
Change-Id: I03b04424e68878b046d5c63f45b9d4d23a791bb4
Ralph Nathan [Tue, 19 Sep 2017 20:41:18 +0000 (20:41 +0000)]
Merge "Remove old Brillo code." am:
f1041f736a
am:
96e1565ef7
Change-Id: I236f66b41f38bbff099b9bdc977b1314b891b3e9
Ralph Nathan [Tue, 19 Sep 2017 20:38:36 +0000 (20:38 +0000)]
Merge "Remove old Brillo code."
am:
f1041f736a
Change-Id: I5db04a57991871160596c113f4ea49742168e363
Ralph Nathan [Tue, 19 Sep 2017 20:34:07 +0000 (20:34 +0000)]
Merge "Remove old Brillo code."
panshuangquan [Tue, 19 Sep 2017 16:12:22 +0000 (16:12 +0000)]
Merge "audio_route: fix free_path memory leak" am:
4ec2db5f9b am:
5e0cd4e838 am:
a4453fa7f3
am:
1ae48f0bae
Change-Id: Idba00b2714ff2cdf39ccbb5e361b5e3c0c5322da
panshuangquan [Tue, 19 Sep 2017 16:10:23 +0000 (16:10 +0000)]
Merge "audio_route: fix free_path memory leak" am:
4ec2db5f9b am:
5e0cd4e838
am:
a4453fa7f3
Change-Id: Ic7e9b37ffa693c1fc08333aff08287f5f00c717c
panshuangquan [Tue, 19 Sep 2017 16:07:53 +0000 (16:07 +0000)]
Merge "audio_route: fix free_path memory leak" am:
4ec2db5f9b
am:
5e0cd4e838
Change-Id: I89a63d54031c63a1e5addbfd29a4b5f05a5d6738
panshuangquan [Tue, 19 Sep 2017 16:05:23 +0000 (16:05 +0000)]
Merge "audio_route: fix free_path memory leak"
am:
4ec2db5f9b
Change-Id: I90ee4f0129dcebb2dd1c27b22951ef8fce406fe0
Treehugger Robot [Tue, 19 Sep 2017 16:01:03 +0000 (16:01 +0000)]
Merge "audio_route: fix free_path memory leak"
Justin Yun [Mon, 18 Sep 2017 03:25:14 +0000 (03:25 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am:
df9faefc5d am:
e7299d3679 am:
620eb8f5c2 -s ours
am:
b4f694c722 -s ours
Change-Id: Iadcfddb6695c7d096c1cd041cc15b784da962fc1
Justin Yun [Mon, 18 Sep 2017 03:22:45 +0000 (03:22 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am:
df9faefc5d am:
e7299d3679
am:
620eb8f5c2 -s ours
Change-Id: Ia6031aceaa3def053421ecf1d49fa347519f075c
Justin Yun [Mon, 18 Sep 2017 03:19:14 +0000 (03:19 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am:
df9faefc5d
am:
e7299d3679
Change-Id: I81710dfa20aa67786e925063f8f6d1352fa33cfd
Justin Yun [Mon, 18 Sep 2017 03:16:44 +0000 (03:16 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp"
am:
df9faefc5d
Change-Id: Ie6a855659d2e0d1d6a4de1f295c1f9293286418f
OSDN Git Service
