OSDN Git Service
android-build-team Robot [Wed, 11 Oct 2017 07:21:22 +0000 (07:21 +0000)]
Snap for
4388906 from
e3c46b0a49d045fa38d35e5cf7ad4becaacbbed6 to oc-mr1-release
Change-Id: Idf8a19c496af8b724e0567d948ce219375e43441
Wei Jia [Tue, 10 Oct 2017 23:39:58 +0000 (23:39 +0000)]
Merge changes from topic "am-
18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am:
402b8a0ef5
am:
e14c028ff7
Change-Id: I15b17df04afbbd0379c98f74e4fcf7aef7cb5a42
Wei Jia [Tue, 10 Oct 2017 23:28:26 +0000 (23:28 +0000)]
Merge changes from topic "am-
18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
am:
402b8a0ef5
Change-Id: Id2a604cf81ce8f44739365d77d5777caccf76220
Lajos Molnar [Tue, 10 Oct 2017 23:27:45 +0000 (23:27 +0000)]
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am:
1e79b0c156
am:
648703351f
Change-Id: I0e610da707f2988f441eb86d5b55f6d9088feec6
Lajos Molnar [Tue, 10 Oct 2017 23:24:34 +0000 (23:24 +0000)]
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
am:
1e79b0c156
Change-Id: I2ce31c4b8db21cf20975f9855215b48e3779915e
Android Build Merger (Role) [Tue, 10 Oct 2017 23:20:56 +0000 (23:20 +0000)]
Merge changes from topic "am-
18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
* changes:
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441 am:
b9e0bdb6e8 am:
1d242fdfff am:
c8ab764e51
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071 am:
4797f02aee am:
d951771d27 am:
bd9ffb2a77 am:
da86840b7b
Wei Jia [Tue, 10 Oct 2017 23:19:32 +0000 (23:19 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441 am:
b9e0bdb6e8 am:
1d242fdfff
am:
c8ab764e51
Change-Id: Icb9afd4abcdca6b64fdedbb5dbf5f468d9d88130
TreeHugger Robot [Tue, 10 Oct 2017 23:14:36 +0000 (23:14 +0000)]
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
Marco Nelissen [Tue, 10 Oct 2017 23:14:17 +0000 (23:14 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071 am:
4797f02aee am:
d951771d27 am:
bd9ffb2a77
am:
da86840b7b
Change-Id: I67fa80e2f3da716d86a4a08ec25b795036a6524e
Wei Jia [Tue, 10 Oct 2017 23:07:06 +0000 (23:07 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441 am:
b9e0bdb6e8
am:
1d242fdfff
Change-Id: Ifac6eee45c655b843f782ce732643f44dd0dd986
Marco Nelissen [Tue, 10 Oct 2017 23:05:51 +0000 (23:05 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071 am:
4797f02aee am:
d951771d27
am:
bd9ffb2a77
Change-Id: I7eb4c7d04b7c51fc5a8fa230cfc1db03829760c7
Wei Jia [Tue, 10 Oct 2017 22:56:46 +0000 (22:56 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441
am:
b9e0bdb6e8
Change-Id: Id003ce3e6655581041f2a427408b177f1235f431
Marco Nelissen [Tue, 10 Oct 2017 22:54:58 +0000 (22:54 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071 am:
4797f02aee
am:
d951771d27
Change-Id: I7345add98dd4856771587bd5b42179fe76bf5032
Wei Jia [Tue, 10 Oct 2017 22:41:24 +0000 (22:41 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5
am:
0b6424a441
Change-Id: I37a115a1778d1852401427cd2a7c16299c8c60f4
Marco Nelissen [Tue, 10 Oct 2017 22:40:41 +0000 (22:40 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071
am:
4797f02aee
Change-Id: I27dea01e8c38ea4768043d5b1f1075e75fe36581
Eric Laurent [Tue, 10 Oct 2017 22:40:39 +0000 (22:40 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d am:
31ac3bd137 am:
830bbb259e am:
960f0f335e -s ours am:
1fd129f457 -s ours
am:
a5d924154e -s ours
Change-Id: I1810d2f976168e3b32bbdc16726cd73182f979ed
Marco Nelissen [Tue, 10 Oct 2017 22:36:29 +0000 (22:36 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours am:
4758facf28 am:
db1e02306c am:
32d62af8e0 am:
fc64ad47f6
am:
cf3b663306
Change-Id: I63bf2c7a0ec2769aaeccfd5b97677dab47975a27
Wei Jia [Tue, 10 Oct 2017 22:33:02 +0000 (22:33 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours
am:
41392611b5
Change-Id: I5a120cc1fc60d9e4d47efe4c953286eb8dc6b3f2
Marco Nelissen [Tue, 10 Oct 2017 22:32:13 +0000 (22:32 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours
am:
769a422071
Change-Id: I78f95557dfa60537f1a8da92b6c5f8668f18a4c8
Eric Laurent [Tue, 10 Oct 2017 22:29:54 +0000 (22:29 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d am:
31ac3bd137 am:
830bbb259e am:
960f0f335e -s ours
am:
1fd129f457 -s ours
Change-Id: I5471dae8cdbd105f8f76e8c7fd3bcb1f9cc847a8
Marco Nelissen [Tue, 10 Oct 2017 22:24:30 +0000 (22:24 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours am:
4758facf28 am:
db1e02306c am:
32d62af8e0
am:
fc64ad47f6
Change-Id: Ie7cf45469fd8d2a731c2d888027cec9ba76f1bc8
Wei Jia [Tue, 10 Oct 2017 22:22:16 +0000 (22:22 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747
am:
6c15ae2aa9 -s ours
Change-Id: I100024372f76521ea697a7742dba8ac064e972cc
Eric Laurent [Tue, 10 Oct 2017 22:22:05 +0000 (22:22 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d am:
31ac3bd137 am:
830bbb259e
am:
960f0f335e -s ours
Change-Id: I9e99134af75cc2f03eaec7e8686ee1ab04c678ed
Marco Nelissen [Tue, 10 Oct 2017 22:21:58 +0000 (22:21 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b
am:
efcbb62657 -s ours
Change-Id: I418cd498a25c0a1670ab1ba52c5e85ced779c3e0
Marco Nelissen [Tue, 10 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours am:
4758facf28 am:
db1e02306c
am:
32d62af8e0
Change-Id: I9f59f0429fdbb0e6bc6607b3e757fc1ac8f017b1
Eric Laurent [Tue, 10 Oct 2017 22:17:24 +0000 (22:17 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d am:
31ac3bd137
am:
830bbb259e
Change-Id: Ibd1f49311e7315b67d361c1ac48bbb436e4cf1d7
Marco Nelissen [Tue, 10 Oct 2017 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours am:
4758facf28
am:
db1e02306c
Change-Id: I81c93c34c33f32ff0ebd471a9e91b8e8a230abaa
Eric Laurent [Tue, 10 Oct 2017 22:08:14 +0000 (22:08 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d
am:
31ac3bd137
Change-Id: Ia824880f1020c46b30989325d154f88134cbdaed
Marco Nelissen [Tue, 10 Oct 2017 22:04:53 +0000 (22:04 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours
am:
4758facf28
Change-Id: Ie6a6ff729b8d5461f86a7ab9e3dbb6f04f4659b5
Eric Laurent [Tue, 10 Oct 2017 22:01:19 +0000 (22:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb
am:
7f0263ba2d
Change-Id: I1777f119f17e359bead997c1bd043e1554c5125c
Marco Nelissen [Tue, 10 Oct 2017 21:57:23 +0000 (21:57 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567
am:
e79b2f044c -s ours
Change-Id: I39d12c1761c74291eead9f98fc3a7409a79b2c43
Eric Laurent [Tue, 10 Oct 2017 21:32:01 +0000 (21:32 +0000)]
Soundtrigger service: fix cross deadlock with audio policy service am:
0957621867
am:
87da65273f -s ours
Change-Id: I72d68a8ba1dbed53e2887879c9b391bfb59c987e
Eric Laurent [Tue, 10 Oct 2017 21:30:46 +0000 (21:30 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
am:
dbda8a95eb
Change-Id: I325b9ad452b2ee6da8368ad5951fc37cad80723f
Eric Laurent [Tue, 10 Oct 2017 21:28:46 +0000 (21:28 +0000)]
Soundtrigger service: fix cross deadlock with audio policy service
am:
0957621867
Change-Id: I7007032007fda2505fe567dc75e91d666cf9dcf3
Eric Laurent [Tue, 10 Oct 2017 21:21:31 +0000 (21:21 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
Wei Jia [Tue, 10 Oct 2017 21:15:33 +0000 (21:15 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c
am:
7b66ddb747
Change-Id: I70c6a85ff698c487031aed697a880ab0c5e62769
Marco Nelissen [Tue, 10 Oct 2017 21:14:35 +0000 (21:14 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2
am:
0ada8e950b
Change-Id: I0a88ce1fa0a73966d2c1a61e1ff70d0f30d711ae
Wei Jia [Tue, 10 Oct 2017 21:10:51 +0000 (21:10 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0
am:
1fad937a9c
Change-Id: If2da3bc028a3dd7bcbbb96ac1abe567e2ba71f86
Marco Nelissen [Tue, 10 Oct 2017 21:09:54 +0000 (21:09 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c
am:
c3f16a62a2
Change-Id: Ie546935111a19ca0ff157e8bffb95dffd7ed8a46
Wei Jia [Tue, 10 Oct 2017 21:02:53 +0000 (21:02 +0000)]
MediaExtractor: ensure users to check returned value by getTrack.
am:
46e359cbc0
Change-Id: I4a953b55c86be7590e7cf54b01b01c26e98aba19
Marco Nelissen [Tue, 10 Oct 2017 21:02:10 +0000 (21:02 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
am:
45a05eb567
Change-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6
Marco Nelissen [Tue, 10 Oct 2017 21:01:59 +0000 (21:01 +0000)]
Don't CHECK if the source can't be started
am:
711f83fa6c
Change-Id: Ib21b34c2c9707cfeb9a20a31417c84c9af8a585e
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
* changes:
Handle idle->loaded state transition when loaded->idle is still in progress
IMediaExtractor: ensure users to check returned value by getTrack.
Don't CHECK if the source can't be started
Fix issues with extractor dumpsys
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
android-build-team Robot [Fri, 6 Oct 2017 07:28:00 +0000 (07:28 +0000)]
Snap for
4380782 from
94cb791a4c74c9324a1ce25ae1d78698997759a2 to oc-mr1-release
Change-Id: I75bb3140ea89f3c4b196125bb6b8dc885beab817
TreeHugger Robot [Fri, 6 Oct 2017 05:20:15 +0000 (05:20 +0000)]
Merge "stagefright: convert heif rotation angle to clockwise" into oc-mr1-dev
Chong Zhang [Thu, 5 Oct 2017 22:16:59 +0000 (15:16 -0700)]
stagefright: convert heif rotation angle to clockwise
bug:
67470228
Test: verify rotation using test app attached in the bug
Change-Id: I75605d207243e2bc0cc67abc7cdc135c02984779
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
android-build-team Robot [Thu, 5 Oct 2017 07:30:42 +0000 (07:30 +0000)]
Snap for
4378450 from
7b7f4e0f8bdf7542561ece15c4ffc2542fb7750d to oc-mr1-release
Change-Id: Ia78c9ddfd2bd2814fd70eeced1bda1eb96c6b565
Phil Burk [Wed, 4 Oct 2017 23:38:59 +0000 (23:38 +0000)]
aaudio: disable MMAP mode by not creating AAudioService am:
969f2c97f0
am:
73b78ac7d9 -s ours
Change-Id: Iab154cd4cd91b60e479b77077f3c2fe42f1c26e9
Phil Burk [Wed, 4 Oct 2017 23:35:11 +0000 (23:35 +0000)]
aaudio: disable MMAP mode by not creating AAudioService
am:
969f2c97f0
Change-Id: I360ee2a32a4ed67539932775ef8c1f001b756092
Glenn Kasten [Wed, 4 Oct 2017 22:44:57 +0000 (22:44 +0000)]
Merge "Increase heap size for fast capture in stereo" into oc-mr1-dev
android-build-team Robot [Wed, 4 Oct 2017 07:27:40 +0000 (07:27 +0000)]
Snap for
4376088 from
7932c6d14b09c1eeaef4d76859ef18ef93b62bf4 to oc-mr1-release
Change-Id: Ic75625ea785bb670688ea113bba16fc6d4580906
TreeHugger Robot [Wed, 4 Oct 2017 03:34:36 +0000 (03:34 +0000)]
Merge "Monitor binder status to media.metrics service" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 03:08:45 +0000 (03:08 +0000)]
Merge "Check transaction status in WGraphicBufferSource" into oc-mr1-dev
Phil Burk [Tue, 12 Sep 2017 23:42:44 +0000 (16:42 -0700)]
aaudio: disable MMAP mode by not creating AAudioService
Only Legacy mode will work, which uses AudioFlinger.
Note that another CL with the same ID in oc-mr1-dev is used to prevent
AAudio MMAP from being disabled in MR1 and master.
Bug:
65280854
Bug:
65262790
Test: See bugs. Any attempt to use MMAP will fail to open the service.
Merged-In: Ic68d136c99c16134aa704495311ab25285fd76a9
Change-Id: Ic68d136c99c16134aa704495311ab25285fd76a9
Phil Burk [Tue, 3 Oct 2017 19:16:54 +0000 (19:16 +0000)]
Merge "audioserver: enable AAudioService for MR1" into oc-mr1-dev
Glenn Kasten [Tue, 3 Oct 2017 17:12:20 +0000 (10:12 -0700)]
Increase heap size for fast capture in stereo
Test: at bug
Bug:
66967812
Change-Id: I06423217e02f644452d6a03ae01316fd6d2d9145
TreeHugger Robot [Tue, 3 Oct 2017 10:59:59 +0000 (10:59 +0000)]
Merge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev
android-build-team Robot [Tue, 3 Oct 2017 07:29:39 +0000 (07:29 +0000)]
Snap for
4373604 from
e387edc8fd036388b79050f72a4f3cfcd1015839 to oc-mr1-release
Change-Id: I5b70578a41cee88885c93d3dd689a5046dfde65e
Pawin Vongmasa [Tue, 3 Oct 2017 00:58:37 +0000 (17:58 -0700)]
Check transaction status in WGraphicBufferSource
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
67298613
Change-Id: Ibd6f4c28e3bffc65c59a32d5790cec52e29ab8ec
Ray Essick [Mon, 2 Oct 2017 17:56:18 +0000 (10:56 -0700)]
Correct cleanup when compacting metrics attributes
Correct management of compacted media metrics attributes; ensure
proper release of a stale reference after copying it down into
a spot vacated as part of a deletion.
Bug:
67110197
Test: logcat to see it trip through the fix
Change-Id: I19031ebf257e958141524458da6b808fa741cce7
Ray Essick [Mon, 2 Oct 2017 16:29:49 +0000 (09:29 -0700)]
Monitor binder status to media.metrics service
Add code to use binder's linkToDeath() so that our clients learn when
(infrequently, we hope) the media.metrics service dies for some
reason. When this happens, arrange for the client to re-establish
its connection to the service.
Bug:
66948389
Test: kill media.metrics, watch logcat for reestablishment messages
Change-Id: Ic518b955ce6816698b21e6a9c844587cef2e2712
android-build-team Robot [Mon, 2 Oct 2017 04:25:05 +0000 (04:25 +0000)]
release-request-
53526352-7b51-4ab1-a661-
632ffc55dd7c-for-git_oc-mr1-release-
4371241 snap-temp-L10900000107789672
Change-Id: I10139bbfb947d2c4b3b88e557713e9f02693eb17
Phil Burk [Fri, 29 Sep 2017 22:06:40 +0000 (15:06 -0700)]
audioserver: enable AAudioService for MR1
Another CL in OC-DEV may have turned it off.
This was added to resolve merge conflicts and to
only enable AAudioService when supported by the vendor.
Bug:
65280854
Bug:
65262790
Test: Enter adb shell setprop aaudio.mmap_policy 1
Test: Enter adb shell killall audioserver
Test: Enter adb shell dumpsys media.aaudio
Test: It should print "Can't find service: media.aaudio".
Test: Enter adb shell setprop aaudio.mmap_policy 2
Test: Enter adb shell killall audioserver
Test: Enter adb shell dumpsys media.aaudio
Test: It should print a short dump because the service is running.
Change-Id: Ic68d136c99c16134aa704495311ab25285fd76a9
Yin-Chia Yeh [Fri, 29 Sep 2017 21:13:28 +0000 (14:13 -0700)]
Camera: fix wrong vector size bug
Test: partner testing, CTS
Bug:
67107422
Change-Id: If9db3cca35aecceb8ca24ebf0e913efb84bc0dae
Yin-Chia Yeh [Fri, 29 Sep 2017 19:01:02 +0000 (12:01 -0700)]
Camera: check HIDL transaction ret value
Test: CTS
Bug:
67102043
Change-Id: I40d6ec4f576850fdc8b39a795cf5bb01dc00b3db
android-build-team Robot [Fri, 29 Sep 2017 01:05:52 +0000 (01:05 +0000)]
Merge cherrypicks of [
2978126,
2977997,
2977757,
2977846,
2977998,
2978351,
2978352,
2977999,
2978127] into oc-mr1-release
Change-Id: I053eba934d96e9cd2a93184d1c66edb63e1d15b8
Chien-Yu Chen [Wed, 23 Aug 2017 00:50:54 +0000 (17:50 -0700)]
camera: Use device level ZSL if supported
If enableZsl is enabled in still capture template, disable ZSL in
the framework and use device level ZSL instead.
Test: CTS
Bug:
64117056
Change-Id: Ia7f7e3b0212419a12bc1ccb3f708f527b8a0b12c
(cherry picked from commit
fa52c0fd3ce1bb23450b9b9a188aa3e66e36d613)
TreeHugger Robot [Thu, 28 Sep 2017 22:12:16 +0000 (22:12 +0000)]
Merge "camera: Use device level ZSL if supported" into oc-mr1-dev
Phil Burk [Thu, 28 Sep 2017 15:55:24 +0000 (15:55 +0000)]
Merge "audioflinger: do not call onTearDown() in threadLoop_exit()" into oc-mr1-dev
Phil Burk [Wed, 27 Sep 2017 20:51:41 +0000 (13:51 -0700)]
audioflinger: do not call onTearDown() in threadLoop_exit()
This is just for MmapThread.
This change will prevent a recursive mutex lock when the teardown calls
stop() on the stream.
Bug:
66971139
Test: unplug headphones with aaudio-echo, see bugreport
Change-Id: I904a8e575bbc5ae8b03350c061dd23cba62783f0
android-build-team Robot [Wed, 27 Sep 2017 07:33:02 +0000 (07:33 +0000)]
release-request-
a41f1f54-b764-45d4-b9ce-
16ae3001be88-for-git_oc-mr1-release-
4362737 snap-temp-L87100000106492125
Change-Id: I8a08badd77c813141342916f6d7d3d2e6e2a8b73
TreeHugger Robot [Tue, 26 Sep 2017 20:36:49 +0000 (20:36 +0000)]
Merge "Camera: don't hold memory map lock during callback" into oc-mr1-dev
Julien Desprez [Tue, 26 Sep 2017 17:29:00 +0000 (17:29 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb am:
af93be238f am:
35c28bb88f am:
c2b8b3f072 am:
0e4a89e436
am:
fbf55f744a
Change-Id: I87b131a0444f83fdec3c05efde00e8c1056d67b9
Julien Desprez [Tue, 26 Sep 2017 17:27:00 +0000 (17:27 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb am:
af93be238f am:
35c28bb88f am:
c2b8b3f072
am:
0e4a89e436
Change-Id: I57e3b1d15ffd012e2346fc394d4a701b49ef0754
Julien Desprez [Tue, 26 Sep 2017 17:24:32 +0000 (17:24 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb am:
af93be238f am:
35c28bb88f
am:
c2b8b3f072
Change-Id: I90cce4197d2537e4821607c9948f07086e51f070
Julien Desprez [Tue, 26 Sep 2017 17:22:29 +0000 (17:22 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb am:
af93be238f
am:
35c28bb88f
Change-Id: I2971472558c986121f134bde112ca57829d19cea
Julien Desprez [Tue, 26 Sep 2017 17:20:31 +0000 (17:20 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539 am:
8dc2a5fdfb
am:
af93be238f
Change-Id: Id023ae01a22e71617b898c8ce2c65ccae6ca295a
Julien Desprez [Tue, 26 Sep 2017 17:17:59 +0000 (17:17 +0000)]
Revert "Make stagefright command available for STS tests." am:
4197479539
am:
8dc2a5fdfb
Change-Id: I2679093d7a32ac111cf674dc357ac32853a99b81
Julien Desprez [Tue, 26 Sep 2017 17:15:31 +0000 (17:15 +0000)]
Revert "Make stagefright command available for STS tests."
am:
4197479539
Change-Id: I3fd20c38c33720d6e0824022976fb2db21eb6419
Julien Desprez [Tue, 26 Sep 2017 17:02:21 +0000 (17:02 +0000)]
Revert "Make stagefright command available for STS tests."
Bug:
66943976
This reverts commit
e286ff463b46ca987562adc9b24d49f1ee191b92.
Change-Id: I9704307962d86e82baf0215b60fadeaa1cc470df
android-build-team Robot [Tue, 26 Sep 2017 07:28:21 +0000 (07:28 +0000)]
release-request-
787c7134-f106-4590-90f7-
0fb685b91259-for-git_oc-mr1-release-
4360035 snap-temp-L24200000106060350
Change-Id: Ie7fbdc9930a361cfb06a47fe3adb71168fc5fdd6
Andres Celis [Mon, 25 Sep 2017 22:41:52 +0000 (22:41 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e am:
80a9c17582 am:
15052a13c1 am:
c29da42e23 am:
9ab0a4da85
am:
f35ee5186c
Change-Id: I8426fbf133c87dffcc2e5ec8f0a9f6156e660e33
Andres Celis [Mon, 25 Sep 2017 22:39:23 +0000 (22:39 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e am:
80a9c17582 am:
15052a13c1 am:
c29da42e23
am:
9ab0a4da85
Change-Id: I8f774a856e7137bb0d46548611bd0cb4732c88fd
Andres Celis [Mon, 25 Sep 2017 22:35:49 +0000 (22:35 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e am:
80a9c17582 am:
15052a13c1
am:
c29da42e23
Change-Id: I02da406a30367840f32d2112d1b4dc7f2babaeb2
Andres Celis [Mon, 25 Sep 2017 22:31:20 +0000 (22:31 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e am:
80a9c17582
am:
15052a13c1
Change-Id: I9d74a9914420bbf71203f8c79ad09eeca77e3d2f
Andres Celis [Mon, 25 Sep 2017 22:29:19 +0000 (22:29 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b am:
ef136ff97e
am:
80a9c17582
Change-Id: I41d392a8930721fce8359a6814d8db8ff7859d5f
Andres Celis [Mon, 25 Sep 2017 22:27:19 +0000 (22:27 +0000)]
Make stagefright command available for STS tests. am:
e286ff463b
am:
ef136ff97e
Change-Id: I64167e4b7aaca441a13d33667a519c0ffd8899d2
Andres Celis [Mon, 25 Sep 2017 22:24:49 +0000 (22:24 +0000)]
Make stagefright command available for STS tests.
am:
e286ff463b
Change-Id: I3ad4b941d5aebce2bf33f621b872e9ce0dc72ac1
android-build-team Robot [Sun, 24 Sep 2017 07:44:00 +0000 (07:44 +0000)]
release-request-
2950741e-0b24-4d70-b748-
67bb2b5435b5-for-git_oc-mr1-release-
4357583 snap-temp-L55500000105655441
Change-Id: I3feb62c280d18fe1498c882988dddc30b34a6b93
TreeHugger Robot [Fri, 22 Sep 2017 20:55:30 +0000 (20:55 +0000)]
Merge "Camera NDK: fix release image failure during destructor" into oc-mr1-dev
Yin-Chia Yeh [Fri, 22 Sep 2017 18:32:53 +0000 (11:32 -0700)]
Camera: don't hold memory map lock during callback
Test: partner stress tests
Bug:
66691828
Change-Id: I2f0048293380f0a89ba46c441c1d77bae8aec7be
TreeHugger Robot [Fri, 22 Sep 2017 03:54:39 +0000 (03:54 +0000)]
Merge "softFlac: handle eos buffers at any stage" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 02:07:55 +0000 (02:07 +0000)]
Merge "audioflinger: volume control to HAL for VoIP streams" into oc-mr1-dev
Yin-Chia Yeh [Wed, 20 Sep 2017 00:28:25 +0000 (17:28 -0700)]
Camera NDK: fix release image failure during destructor
Test: new CTS test that close reader with images in
acquired state
Bug:
65839749
Change-Id: Iac9d2b1a3298ca619f2ab71a02641052f9a51f2e
Ram Mohan [Fri, 15 Sep 2017 14:52:36 +0000 (20:22 +0530)]
softFlac: handle eos buffers at any stage
Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Host \
-l INFO
Bug:
63796949
Change-Id: I528b4bc041aab8affc28cb7d1b96ea6065754798
Eric Laurent [Thu, 21 Sep 2017 00:54:22 +0000 (17:54 -0700)]
audioflinger: volume control to HAL for VoIP streams
Do not apply stream volume in software for special VoIP output
stream mixers but send it to the HAL instead.
Bug:
64392515.
Test: Fi calls
Change-Id: I698a1a0ad17d672d09187529dcbc5d259284e4af
TreeHugger Robot [Thu, 21 Sep 2017 15:03:28 +0000 (15:03 +0000)]
Merge "Remove codec aggregation/summarization" into oc-mr1-dev