OSDN Git Service

android-x86/system-media.git
6 years agoMerge "Add missing free after read device info" am: 384bd00de2
Elliott Hughes [Fri, 2 Mar 2018 16:49:29 +0000 (16:49 +0000)]
Merge "Add missing free after read device info" am: 384bd00de2
am: e1087bb8ef

Change-Id: Id673086ab7e8b66c1009dcba7803a971546fc711

6 years agoMerge "Add missing free after read device info"
Elliott Hughes [Fri, 2 Mar 2018 16:42:45 +0000 (16:42 +0000)]
Merge "Add missing free after read device info"
am: 384bd00de2

Change-Id: I3a3fc3fa6020af36353670bd5f2709031e2e2e01

6 years agoMerge "Add missing free after read device info"
Elliott Hughes [Fri, 2 Mar 2018 16:36:33 +0000 (16:36 +0000)]
Merge "Add missing free after read device info"

6 years agoAdd missing free after read device info
liuchao [Thu, 1 Mar 2018 08:58:29 +0000 (16:58 +0800)]
Add missing free after read device info

alsa_hw_params is not freed before get out
of function profile_read_device_info,calloc
from pcm_params_get in pcm.c

Test: code compilation
Change-Id: Icb1163d3dc213939243d26f57f8d22ca4edb1159

6 years agoMerge "Fix integer sanitizer in audio_route_update_path." am: a2c091b0f5
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

6 years agoMerge "Fix integer sanitizer in audio_route_update_path."
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

6 years agoMerge "Fix integer sanitizer in audio_route_update_path."
Ivan Lozano [Wed, 20 Dec 2017 15:55:06 +0000 (15:55 +0000)]
Merge "Fix integer sanitizer in audio_route_update_path."

6 years agoFix 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

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master" am: 7f95a5e31f -s ours
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

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
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

6 years agoDO NOT MERGE: Merge Oreo MR1 into master am: d481b28a58 -s ours
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

6 years agoDO NOT MERGE: Merge Oreo MR1 into master
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

6 years agoMerge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 23:18:27 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"

6 years agoDO 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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83...
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6 am: 6dc0f83407
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf am: 90045db6e6
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

6 years agoCamera metadata: Check source metadata size am: 489bbd13bf
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

6 years agoCamera metadata: Check source metadata size
Emilian Peev [Wed, 8 Nov 2017 08:55:39 +0000 (08:55 +0000)]
Camera metadata: Check source metadata size
am: 489bbd13bf

Change-Id: I3664526ef2de813ea2b1c303a53d55246c1b370b

6 years agoCamera metadata: Check source metadata size
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

6 years agoMerge "Add missing includes." am: b81a57f4a4 am: 56f00a0b6a
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

6 years agoMerge "Add missing includes." am: b81a57f4a4
Dan Albert [Wed, 11 Oct 2017 21:39:51 +0000 (21:39 +0000)]
Merge "Add missing includes." am: b81a57f4a4
am: 56f00a0b6a

Change-Id: I9f75181408cc15daf46dd356a3672697f3c1653a

6 years agoMerge "Add missing includes."
Dan Albert [Wed, 11 Oct 2017 21:30:58 +0000 (21:30 +0000)]
Merge "Add missing includes."
am: b81a57f4a4

Change-Id: I2fa4f1963fd201e78970e34da42ecf428493ad81

6 years agoMerge "Add missing includes."
Treehugger Robot [Wed, 11 Oct 2017 21:21:36 +0000 (21:21 +0000)]
Merge "Add missing includes."

6 years agoAdd 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

6 years agoCamera: docs: Allow vendor tags inside available tag lists
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

6 years agoCamera: docs: Allow vendor tags inside available tag lists
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

6 years agoMerge "Remove old Brillo code." am: f1041f736a am: 96e1565ef7
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

6 years agoMerge "Remove old Brillo code." am: f1041f736a
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

6 years agoMerge "Remove old Brillo code."
Ralph Nathan [Tue, 19 Sep 2017 20:38:36 +0000 (20:38 +0000)]
Merge "Remove old Brillo code."
am: f1041f736a

Change-Id: I5db04a57991871160596c113f4ea49742168e363

6 years agoMerge "Remove old Brillo code."
Ralph Nathan [Tue, 19 Sep 2017 20:34:07 +0000 (20:34 +0000)]
Merge "Remove old Brillo code."

6 years agoMerge "audio_route: fix free_path memory leak" am: 4ec2db5f9b am: 5e0cd4e838
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

6 years agoMerge "audio_route: fix free_path memory leak" am: 4ec2db5f9b
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

6 years agoMerge "audio_route: fix free_path memory leak"
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

6 years agoMerge "audio_route: fix free_path memory leak"
Treehugger Robot [Tue, 19 Sep 2017 16:01:03 +0000 (16:01 +0000)]
Merge "audio_route: fix free_path memory leak"

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp" am: df9faefc5d am: e7299d3679
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

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp" am: df9faefc5d
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

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp"
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

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp"
Treehugger Robot [Mon, 18 Sep 2017 03:12:46 +0000 (03:12 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp"

6 years agoMark the module as VNDK or VNDK-SP in Android.bp
Justin Yun [Mon, 24 Jul 2017 06:19:45 +0000 (15:19 +0900)]
Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Merged-In: Ia88348f4904dfc6ffb9ad139cac986b4b9438ff7
Change-Id: Ia88348f4904dfc6ffb9ad139cac986b4b9438ff7
(cherry picked from commit 951503a34e8b7479280df58ebdd607a53898cd72)

6 years agoMerge "system/media build with BOARD_VNDK_VERSION" am: cbb4d8f8dd am: a383206dfb
Tri Vo [Fri, 15 Sep 2017 07:05:28 +0000 (07:05 +0000)]
Merge "system/media build with BOARD_VNDK_VERSION" am: cbb4d8f8dd am: a383206dfb
am: 3914814003  -s ours

Change-Id: I61946f7fb30f414cc2550938230cfc1ba834892d

6 years agoMerge "system/media build with BOARD_VNDK_VERSION" am: cbb4d8f8dd
Tri Vo [Fri, 15 Sep 2017 07:02:58 +0000 (07:02 +0000)]
Merge "system/media build with BOARD_VNDK_VERSION" am: cbb4d8f8dd
am: a383206dfb

Change-Id: I397c65915d76c9b2c0ebbec0e46f3394d5fa756e

6 years agoMerge "system/media build with BOARD_VNDK_VERSION"
Tri Vo [Fri, 15 Sep 2017 07:00:59 +0000 (07:00 +0000)]
Merge "system/media build with BOARD_VNDK_VERSION"
am: cbb4d8f8dd

Change-Id: I1200ca2f56589c530d9bb1435c8517a3e23a5ccd

6 years agoMerge "system/media build with BOARD_VNDK_VERSION"
Treehugger Robot [Fri, 15 Sep 2017 06:55:41 +0000 (06:55 +0000)]
Merge "system/media build with BOARD_VNDK_VERSION"

6 years agosystem/media build with BOARD_VNDK_VERSION
Tri Vo [Tue, 27 Jun 2017 16:54:36 +0000 (09:54 -0700)]
system/media build with BOARD_VNDK_VERSION

Bug: 37342627
Test: cd system/media && mma -j64 -k BOARD_VNDK_VERSION=current
Merged-In: I7f99fbe685a960f0506398cdb21a7d86d1d8d4a1
Change-Id: I7f99fbe685a960f0506398cdb21a7d86d1d8d4a1
(cherry picked from commit a6bddef1a2549c0b05b1fdb4a3bee4b06224f70b)

6 years agoaudio_route: fix free_path memory leak
panshuangquan [Fri, 1 Sep 2017 06:26:19 +0000 (14:26 +0800)]
audio_route: fix free_path memory leak

1.free all the setting of the path
2.also fix a crash if the xml have the same path name

Bug: https://issuetracker.google.com/issues/65270255
Test: manual
Change-Id: I40e1297e4aebdcd815596c93db14b8126f172689
Signed-off-by: panshuangquan <panshuangquan@xiaomi.com>
6 years agoRemove old Brillo code.
Ralph Nathan [Fri, 25 Aug 2017 19:35:56 +0000 (12:35 -0700)]
Remove old Brillo code.

This code is no longer being used.

Bug: none
Test: none

Change-Id: Icb59f65cd28b271f8baf972c10546a716fb27881

6 years agoMerge "C++14 is the default now." am: 780c6311c5 am: 45b91a1f15
Elliott Hughes [Thu, 24 Aug 2017 15:55:55 +0000 (15:55 +0000)]
Merge "C++14 is the default now." am: 780c6311c5 am: 45b91a1f15
am: 04ce4f9603

Change-Id: Idca3c08167f2f4b9d29802d4d0e4e48081daeca8

6 years agoMerge "C++14 is the default now." am: 780c6311c5
Elliott Hughes [Thu, 24 Aug 2017 15:51:24 +0000 (15:51 +0000)]
Merge "C++14 is the default now." am: 780c6311c5
am: 45b91a1f15

Change-Id: I158d8414b34394892907dc48a2186a3d44335a37

6 years agoMerge "C++14 is the default now."
Elliott Hughes [Thu, 24 Aug 2017 15:47:12 +0000 (15:47 +0000)]
Merge "C++14 is the default now."
am: 780c6311c5

Change-Id: Icdebfede104aced643ab6218ef12e3c530b1908c

6 years agoMerge "C++14 is the default now."
Elliott Hughes [Thu, 24 Aug 2017 15:40:54 +0000 (15:40 +0000)]
Merge "C++14 is the default now."

6 years agoC++14 is the default now.
Elliott Hughes [Sat, 12 Aug 2017 05:59:49 +0000 (22:59 -0700)]
C++14 is the default now.

Bug: http://b/32019064
Test: builds
Change-Id: I75b37a65d9ba6a7fc6586948f2e9544cede377a8

6 years agoCamera: update NDK docs am: f850d6ea72 am: 2b57c9ada1
Yin-Chia Yeh [Wed, 9 Aug 2017 01:57:53 +0000 (01:57 +0000)]
Camera: update NDK docs am: f850d6ea72 am: 2b57c9ada1
am: 8737ef4222

Change-Id: Icaa2b399b827e9852463598ad7889188de2a452c

6 years agoMerge "Camera: update NDK docs am: f850d6ea72 am: de176c492a" into oc-dr1-dev-plus...
Yin-Chia Yeh [Wed, 9 Aug 2017 01:56:24 +0000 (01:56 +0000)]
Merge "Camera: update NDK docs am: f850d6ea72 am: de176c492a" into oc-dr1-dev-plus-aosp
am: 91792563c9

Change-Id: Ie0a8946de31055a3fdd8a1d39429fd6dd33f7d32

6 years agoCamera: update NDK docs am: f850d6ea72 am: 2b57c9ada1
Yin-Chia Yeh [Wed, 9 Aug 2017 01:55:56 +0000 (01:55 +0000)]
Camera: update NDK docs am: f850d6ea72 am: 2b57c9ada1
am: 0e7356fcc9

Change-Id: I484ce38ed8f0a8e0eb76db21d2b013eeb24d24dd

6 years agoMerge "Camera: update NDK docs am: f850d6ea72 am: de176c492a" into oc-dr1-dev-plus...
Android Build Merger (Role) [Wed, 9 Aug 2017 01:50:33 +0000 (01:50 +0000)]
Merge "Camera: update NDK docs am: f850d6ea72 am: de176c492a" into oc-dr1-dev-plus-aosp

6 years agoCamera: update NDK docs am: f850d6ea72
Yin-Chia Yeh [Wed, 9 Aug 2017 01:50:01 +0000 (01:50 +0000)]
Camera: update NDK docs am: f850d6ea72
am: 2b57c9ada1

Change-Id: I55c140d2b647a210759d83af8f060b43ee3ef0a3

6 years agoCamera: update NDK docs am: f850d6ea72
Yin-Chia Yeh [Wed, 9 Aug 2017 01:50:01 +0000 (01:50 +0000)]
Camera: update NDK docs am: f850d6ea72
am: 2b57c9ada1

Change-Id: I0c6c9ac846278c0330c80b3f91fddbf5d210e471

6 years agoCamera: update NDK docs am: f850d6ea72
Yin-Chia Yeh [Wed, 9 Aug 2017 01:50:01 +0000 (01:50 +0000)]
Camera: update NDK docs am: f850d6ea72
am: de176c492a

Change-Id: If8fd505e514431908be8818829e4323cb3bb636b

6 years agoCamera: update NDK docs
Yin-Chia Yeh [Wed, 9 Aug 2017 01:45:03 +0000 (01:45 +0000)]
Camera: update NDK docs
am: f850d6ea72

Change-Id: I8790351bd0732a3c0b3e2a5525feb9a74ab3bd93

6 years agoCamera: update NDK docs
Yin-Chia Yeh [Wed, 9 Aug 2017 01:45:03 +0000 (01:45 +0000)]
Camera: update NDK docs
am: f850d6ea72

Change-Id: I18375c0b3b0ace6da868d76de8aefe1ec3b7adfa

6 years agoCamera: update NDK docs
Yin-Chia Yeh [Fri, 4 Aug 2017 01:07:45 +0000 (18:07 -0700)]
Camera: update NDK docs

Add type information to the doc paragraph.

Bug: 64304111
Test: build (doc only change)
Change-Id: Ifc3b8068d308ad2571ad66ddf5850b1cdc4163d6

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
Justin Yun [Thu, 3 Aug 2017 09:56:33 +0000 (09:56 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
am: 79afc4e4fa

Change-Id: Ifadf371219410692aaa5839ad452fa74acaccf79

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 09:47:45 +0000 (09:47 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev

6 years agoAllow unaligned vector pointers for power computation
Andy Hung [Wed, 2 Aug 2017 00:06:23 +0000 (00:06 +0000)]
Allow unaligned vector pointers for power computation
am: 10b7f5a9aa

Change-Id: Iffcbd2ab829627737c02098020d8d72d515448c0

6 years agoAllow unaligned vector pointers for power computation
Andy Hung [Mon, 31 Jul 2017 22:32:29 +0000 (15:32 -0700)]
Allow unaligned vector pointers for power computation

Test: dedicated native test
Bug: 64151823
Change-Id: I620ba9f673782e5769c499158c6fb866a103a9e4

6 years agoMerge "Revert "media: Update libchrome APIS to r456626."" am: 13669840c9 am: e07ce47a...
Eric Laurent [Wed, 26 Jul 2017 20:37:49 +0000 (20:37 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626."" am: 13669840c9 am: e07ce47a5e am: 7810642267
am: 7c8084e4b1

Change-Id: I28024600c0b8a29a0d1023d567c5cb1e00e3e7a7

6 years agoMerge "Revert "media: Update libchrome APIS to r456626."" am: 13669840c9 am: e07ce47a5e
Eric Laurent [Wed, 26 Jul 2017 20:33:56 +0000 (20:33 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626."" am: 13669840c9 am: e07ce47a5e
am: 7810642267

Change-Id: I6e5bb1adbb76a40be7b3a94d9e06160b0de4ce3a

6 years agoMerge "Revert "media: Update libchrome APIS to r456626."" am: 13669840c9
Eric Laurent [Wed, 26 Jul 2017 20:29:14 +0000 (20:29 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626."" am: 13669840c9
am: e07ce47a5e

Change-Id: I635e5fe0b8a46721011b235e565bc3e153117a2e

6 years agoMerge "Revert "media: Update libchrome APIS to r456626.""
Eric Laurent [Wed, 26 Jul 2017 20:19:33 +0000 (20:19 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626.""
am: 13669840c9

Change-Id: Ic9f40e6c258530ad537f98e01a713b48ba0addf1

6 years agoMerge "Revert "media: Update libchrome APIS to r456626.""
Eric Laurent [Wed, 26 Jul 2017 20:02:18 +0000 (20:02 +0000)]
Merge "Revert "media: Update libchrome APIS to r456626.""

6 years agoRevert "media: Update libchrome APIS to r456626."
Luis Hector Chavez [Wed, 26 Jul 2017 17:36:04 +0000 (17:36 +0000)]
Revert "media: Update libchrome APIS to r456626."

This reverts commit 247b914250c9095705965a673452866fed4d4162.

Reason for revert: Broke the mac_sdk
Exempt-From-Owner-Approval: Fixing mac_sdk

Change-Id: Ic0b808d3e7429462d60e7f571bf9c1197819e72e

6 years agoMerge "media: Update libchrome APIS to r456626." am: 9c351fa5f3 am: 3501de6689 am...
Jay Civelli [Wed, 26 Jul 2017 02:06:01 +0000 (02:06 +0000)]
Merge "media: Update libchrome APIS to r456626." am: 9c351fa5f3 am: 3501de6689 am: 8f0560542f
am: 0137a21ae3

Change-Id: If02ce10a57f4d7c5c9122597b28ecd2c10d239f5

6 years agoMerge "media: Update libchrome APIS to r456626." am: 9c351fa5f3 am: 3501de6689
Jay Civelli [Wed, 26 Jul 2017 02:01:26 +0000 (02:01 +0000)]
Merge "media: Update libchrome APIS to r456626." am: 9c351fa5f3 am: 3501de6689
am: 8f0560542f

Change-Id: Id43b3912422abb020d7475a0eb335c606a48e765

6 years agoMerge "media: Update libchrome APIS to r456626." am: 9c351fa5f3
Jay Civelli [Wed, 26 Jul 2017 01:57:29 +0000 (01:57 +0000)]
Merge "media: Update libchrome APIS to r456626." am: 9c351fa5f3
am: 3501de6689

Change-Id: I863039f5cd0e8e52f0e5ae16281b37c572d7a173

6 years agoMerge "media: Update libchrome APIS to r456626."
Jay Civelli [Wed, 26 Jul 2017 01:53:59 +0000 (01:53 +0000)]
Merge "media: Update libchrome APIS to r456626."
am: 9c351fa5f3

Change-Id: I1f43c0bce6a557724ffc0bf5b25ebc2d6254ddcc

6 years agoMerge "media: Update libchrome APIS to r456626."
Treehugger Robot [Wed, 26 Jul 2017 01:47:46 +0000 (01:47 +0000)]
Merge "media: Update libchrome APIS to r456626."

6 years agoMark the module as VNDK or VNDK-SP in Android.bp
Justin Yun [Mon, 24 Jul 2017 06:19:45 +0000 (15:19 +0900)]
Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Ia88348f4904dfc6ffb9ad139cac986b4b9438ff7

6 years agoMake libaudioeffects vendor available.
Steven Moreland [Fri, 14 Jul 2017 18:40:35 +0000 (11:40 -0700)]
Make libaudioeffects vendor available.

This means that both system and vendor libraries
can link against it when the vndk is enabled (when
BOARD_VNDK_VERSION=current is set.

Test: build libaudioeffects with BOARD_VNDK_VERSION=current
Bug: 37342627
Change-Id: I1aa26abd1486e5b432617cb37eaf69e777e7ca6f

6 years agoMerge "RDS PI is a number, not a string."
Tomasz Wasilczyk [Wed, 5 Jul 2017 21:19:26 +0000 (21:19 +0000)]
Merge "RDS PI is a number, not a string."

6 years agoMerge "Make inlines static" into stage-aosp-master am: b76693c9fc -s ours am: 90492d...
Colin Cross [Sat, 1 Jul 2017 04:33:24 +0000 (04:33 +0000)]
Merge "Make inlines static" into stage-aosp-master am: b76693c9fc  -s ours am: 90492da5ed  -s ours
am: b48d758f4e  -s ours

Change-Id: I5c25a1f22fd007c345f7c9876d689f949e1fb67c

6 years agoMerge "Make inlines static" into stage-aosp-master am: b76693c9fc -s ours
Colin Cross [Sat, 1 Jul 2017 04:28:24 +0000 (04:28 +0000)]
Merge "Make inlines static" into stage-aosp-master am: b76693c9fc  -s ours
am: 90492da5ed  -s ours

Change-Id: I9a009c1c30356afb4727d6b19c3b1702d16393a5

6 years agoMerge "Make inlines static" into stage-aosp-master
Colin Cross [Sat, 1 Jul 2017 04:23:23 +0000 (04:23 +0000)]
Merge "Make inlines static" into stage-aosp-master
am: b76693c9fc  -s ours

Change-Id: I4145373db5dd90dfa52097c09221b64c2bd41f0e

6 years agoMerge "Make inlines static" am: e338b979f9 -s ours am: 9c99a1cf3c -s ours am: f8ae9...
Colin Cross [Sat, 1 Jul 2017 04:18:56 +0000 (04:18 +0000)]
Merge "Make inlines static" am: e338b979f9  -s ours am: 9c99a1cf3c  -s ours am: f8ae91e368  -s ours
am: 211e5d2574  -s ours

Change-Id: I71886bd5b0df497190ab6bd38f377c3a71053ba2

6 years agoMerge "Make inlines static" into stage-aosp-master
TreeHugger Robot [Sat, 1 Jul 2017 04:15:25 +0000 (04:15 +0000)]
Merge "Make inlines static" into stage-aosp-master

6 years agoMerge "Make inlines static" am: e338b979f9 -s ours am: 9c99a1cf3c -s ours
Colin Cross [Sat, 1 Jul 2017 04:13:50 +0000 (04:13 +0000)]
Merge "Make inlines static" am: e338b979f9  -s ours am: 9c99a1cf3c  -s ours
am: f8ae91e368  -s ours

Change-Id: I9500c90890e0ef29100cf2c976ddba851285d0aa

6 years agoMerge "Make inlines static" am: e338b979f9 -s ours
Colin Cross [Sat, 1 Jul 2017 04:10:19 +0000 (04:10 +0000)]
Merge "Make inlines static" am: e338b979f9  -s ours
am: 9c99a1cf3c  -s ours

Change-Id: Iad102434f85ddf68f5d2a67796bb4adc472bebf2

6 years agoMerge "Make inlines static"
Colin Cross [Sat, 1 Jul 2017 04:05:27 +0000 (04:05 +0000)]
Merge "Make inlines static"
am: e338b979f9  -s ours

Change-Id: I2a94c355f424a516069077cb3aa8d4dd1d5cd716

6 years agoMake inlines static
Colin Cross [Fri, 30 Jun 2017 21:05:23 +0000 (14:05 -0700)]
Make inlines static

Compiling the non-static inlines with -Oz results in missing symbols,
because clang chooses not to inline the functions but also doesn't
emit a definition because they are not static or extern.  They are
only used in this .c file, so make them static.

Test: builds with -Oz
Bug: 62549703
Change-Id: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63
Merged-In: Ibb78ad982c2911e151f0dd6b01eb6164fe6e8e63

6 years agoMerge "Make inlines static"
Treehugger Robot [Sat, 1 Jul 2017 03:11:34 +0000 (03:11 +0000)]
Merge "Make inlines static"

6 years agoMake inlines static am: 7a800d960a
Colin Cross [Sat, 1 Jul 2017 02:23:54 +0000 (02:23 +0000)]
Make inlines static am: 7a800d960a
am: c87e4a7687  -s ours

Change-Id: Ia707a8ca1194c00afd6b38aa955f467e9d602190

6 years agoMake inlines static
Colin Cross [Sat, 1 Jul 2017 02:18:15 +0000 (02:18 +0000)]
Make inlines static
am: 7a800d960a

Change-Id: Ie86109dd6cc69a3be0168e18d3f266f3f02daa7f