OSDN Git Service
android-build-team Robot [Wed, 17 May 2017 08:00:48 +0000 (08:00 +0000)]
release-request-
655284b0-7f0b-48b5-b01d-
27f48a99f2c0-for-git_oc-mr1-release-
4017105 snap-temp-L82600000064873863
Change-Id: Ieff19f14b8261cf7960d4fa2d1de2bca4f45c5de
Logan Chien [Wed, 17 May 2017 06:18:48 +0000 (06:18 +0000)]
Merge changes from topic 'move-hwc2on1'
* changes:
libhwc2on1adapter: Move to vendor partition
Remove stale dependency to libhwc2on1adaptor.so.
Jammy Yu [Wed, 17 May 2017 05:38:51 +0000 (05:38 +0000)]
Merge "Fix error BufferQueue attaching flow." into oc-dev am:
4052245c53
am:
5f44bd7228
Change-Id: Ica833c281516f1e27c686f00d7108f5ff8e7dd2e
Jammy Yu [Wed, 17 May 2017 05:35:53 +0000 (05:35 +0000)]
Merge "Fix error BufferQueue attaching flow." into oc-dev
am:
4052245c53
Change-Id: Ifaead205c3a02ff346512af486e20212d6ffd2b1
TreeHugger Robot [Wed, 17 May 2017 05:29:50 +0000 (05:29 +0000)]
Merge "Fix error BufferQueue attaching flow." into oc-dev
Adam Lesinski [Wed, 17 May 2017 00:20:54 +0000 (00:20 +0000)]
Merge "Revert "Newly create idmap only when it is outdated"" into oc-dev am:
b57d3d222a
am:
2f48fe9aca
Change-Id: I3cac6098593b9fdf7db5ab6e9e8b776c9ab36d72
Adam Lesinski [Wed, 17 May 2017 00:18:55 +0000 (00:18 +0000)]
Merge "Revert "Newly create idmap only when it is outdated"" into oc-dev
am:
b57d3d222a
Change-Id: Ia9e211300173e81c4d64785e19e31c3d0c7344d9
Adam Lesinski [Wed, 17 May 2017 00:12:48 +0000 (00:12 +0000)]
Merge "Revert "Newly create idmap only when it is outdated"" into oc-dev
Yi Kong [Wed, 17 May 2017 00:11:49 +0000 (00:11 +0000)]
Merge "Do not use default initializer for union"
Adam Lesinski [Tue, 16 May 2017 22:06:42 +0000 (22:06 +0000)]
Revert "Newly create idmap only when it is outdated"
This reverts commit
1d091465334784adeded4ef182cc6f732eb6f99e.
Reason for revert: Causes b/
37992057
Change-Id: I7811483016b28a88d6a50bd445dd5d5e8d2e48d6
Jammy Yu [Thu, 23 Feb 2017 00:41:38 +0000 (16:41 -0800)]
Fix error BufferQueue attaching flow.
Fix error BufferQueue attaching flow. Because BufferQueue attaching
buffer flow doesn't set mNeedsReallocation to false, it will case
Surface client to request buffer for attached buffer to cause unsync
buffer states with ACodec. So, for attaching buffer by Producer, we
need to set mNeedsReallocation to false in BufferQueue. And Surface
client will not request buffer again for attached buffer to cause
some missing frames.
Bug:
38238747
Issue:
34897483
Test: GTS
Change-Id: I25f9fff4b5d1f7052ab3be612cf34879fd17c27c
Chia-I Wu [Tue, 16 May 2017 21:39:03 +0000 (21:39 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b am:
2d4959d8eb am:
6a7200333a am:
555543674c
am:
468ea5d080
Change-Id: I78c83942b83df0851831e4914820a602f82f722f
Dan Stoza [Tue, 16 May 2017 21:38:37 +0000 (21:38 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9 am:
79a34dd24b am:
a1b1e635cc am:
4432b0c418
am:
ac016851ca
Change-Id: I9515347f9fb0e408c6c92eda24483b6fe2e0b19e
Chia-I Wu [Tue, 16 May 2017 21:38:11 +0000 (21:38 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b am:
2d4959d8eb am:
6a7200333a am:
2c201405ac
am:
1b9371b862
Change-Id: I4e160a36e4264c1959061c98d57ab0c8bf11aea1
Dan Stoza [Tue, 16 May 2017 21:37:40 +0000 (21:37 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9 am:
79a34dd24b am:
a1b1e635cc am:
0c7f6e142d
am:
29c221a2e5
Change-Id: If5f2a500feb74d2b4f8b87d357ddc0143325a944
Chia-I Wu [Tue, 16 May 2017 21:24:58 +0000 (21:24 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b am:
2d4959d8eb am:
6a7200333a
am:
555543674c
Change-Id: Ib86c92125d63503e5221e02189723d482ce1a0a0
Dan Stoza [Tue, 16 May 2017 21:24:37 +0000 (21:24 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9 am:
79a34dd24b am:
a1b1e635cc
am:
4432b0c418
Change-Id: Id071bd066788d38acc058d8bf01f6f3097602c47
Chia-I Wu [Tue, 16 May 2017 21:21:39 +0000 (21:21 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b am:
2d4959d8eb am:
6a7200333a
am:
2c201405ac
Change-Id: If3c5f8f07ff7deeb5ec2e5bcb312849d639440d0
Dan Stoza [Tue, 16 May 2017 21:21:20 +0000 (21:21 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9 am:
79a34dd24b am:
a1b1e635cc
am:
0c7f6e142d
Change-Id: Ib662e6e52161cde788de5eef3baf48e025a00b89
Chia-I Wu [Tue, 16 May 2017 21:18:41 +0000 (21:18 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b am:
2d4959d8eb
am:
6a7200333a
Change-Id: Iee50110f6189c015e2aca1c77a460d964d8d5439
Chia-I Wu [Tue, 16 May 2017 21:18:40 +0000 (21:18 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b am:
2d4959d8eb
am:
6a7200333a
Change-Id: I3340a1f5ff6d21228a98cd0f48637b09cd07d01e
Dan Stoza [Tue, 16 May 2017 21:18:21 +0000 (21:18 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9 am:
79a34dd24b
am:
a1b1e635cc
Change-Id: I574d7193656580b26b2a2923673f39541f010878
Dan Stoza [Tue, 16 May 2017 21:18:20 +0000 (21:18 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9 am:
79a34dd24b
am:
a1b1e635cc
Change-Id: Idfd63642dda3ae741056b75c9c9ddccd63feb76f
Chia-I Wu [Tue, 16 May 2017 21:15:44 +0000 (21:15 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86 am:
83f226ba1b
am:
2d4959d8eb
Change-Id: Ic8400bff6a8c8e48719abe1aadcb0661d36bba87
Dan Stoza [Tue, 16 May 2017 21:15:20 +0000 (21:15 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b am:
b829d2abe9
am:
79a34dd24b
Change-Id: I3909027db625685911575c9c98b5446b86af09c0
Chia-I Wu [Tue, 16 May 2017 21:12:11 +0000 (21:12 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762 am:
8b99decc86
am:
83f226ba1b
Change-Id: Ic0586397a434045a9594b78ff955f6426b977641
Dan Stoza [Tue, 16 May 2017 21:11:49 +0000 (21:11 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2 am:
d65a388e1b
am:
b829d2abe9
Change-Id: I3e1b7c882bcfcc93e93e296887930771878b25a1
Chia-I Wu [Tue, 16 May 2017 21:08:54 +0000 (21:08 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f am:
72c1a6f762
am:
8b99decc86
Change-Id: I025b51ff0858ddfd88fdbca04724deab8afdabd8
Dan Stoza [Tue, 16 May 2017 21:08:18 +0000 (21:08 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41 am:
f69675e5c2
am:
d65a388e1b
Change-Id: I73489256702d123302a204c2720f9752515020ba
Chia-I Wu [Tue, 16 May 2017 21:05:58 +0000 (21:05 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580 am:
788ff8c16f
am:
72c1a6f762
Change-Id: Idf9fc3f7e2d09483b7e938c0c4389813dd5f2f60
Dan Stoza [Tue, 16 May 2017 21:05:24 +0000 (21:05 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742 am:
787aa48f41
am:
f69675e5c2
Change-Id: Icb1a0aae634951cd903fb2deef632005e01d4d7f
Chia-I Wu [Tue, 16 May 2017 21:02:42 +0000 (21:02 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a am:
0544fa4580
am:
788ff8c16f
Change-Id: I5623d15da983b9277ab968d63b537ce396ad007c
Dan Stoza [Tue, 16 May 2017 21:02:17 +0000 (21:02 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5 am:
9a44ee0742
am:
787aa48f41
Change-Id: I96e45ad313a7ea1233972ac80a1c8c85f6e64618
Chia-I Wu [Tue, 16 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22 am:
1f8b90126a
am:
0544fa4580
Change-Id: Id6d055a523eed1f96e1373d4f3fede43551a8abe
Dan Stoza [Tue, 16 May 2017 20:58:46 +0000 (20:58 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0 am:
cce83f15e5
am:
9a44ee0742
Change-Id: I79f6a2eb14d624b153244788267a16c752927e33
Chia-I Wu [Tue, 16 May 2017 20:56:04 +0000 (20:56 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53 am:
6a9b41dc22
am:
1f8b90126a
Change-Id: Iaf0fd93af8567520229a0a73fda8bd5fcc8091f1
Dan Stoza [Tue, 16 May 2017 20:55:47 +0000 (20:55 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f am:
2fe15aa6f0
am:
cce83f15e5
Change-Id: I82264d2033d6b098199321fd29c0d26017ec5359
Chia-I Wu [Tue, 16 May 2017 20:53:35 +0000 (20:53 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7 am:
91a7e47a53
am:
6a9b41dc22
Change-Id: I03af2ccc0f7f671baa4ec9f7b9a3b55f8b377435
Dan Stoza [Tue, 16 May 2017 20:53:16 +0000 (20:53 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580 am:
78976cea8f
am:
2fe15aa6f0
Change-Id: I36fcc82af237645b61c69d70c574843a5b2753c8
Chia-I Wu [Tue, 16 May 2017 20:50:05 +0000 (20:50 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8 am:
396cc342a7
am:
91a7e47a53
Change-Id: I198ba45e3005214e9cd41379d6f833297be93caf
Dan Stoza [Tue, 16 May 2017 20:49:46 +0000 (20:49 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010 am:
970bb51580
am:
78976cea8f
Change-Id: I30e6a29474b6cf86f97961f527301837b35c8a36
Chia-I Wu [Tue, 16 May 2017 20:46:53 +0000 (20:46 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am:
af33c978c8
am:
396cc342a7
Change-Id: Ic9f8bce011edd718580971059ae96b0d65c9fdda
Dan Stoza [Tue, 16 May 2017 20:45:35 +0000 (20:45 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev am:
98e3c06010
am:
970bb51580
Change-Id: I767956fd15f8be9aa30feb38ad11ec84e98a50bd
Chia-I Wu [Tue, 16 May 2017 20:41:35 +0000 (20:41 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev
am:
af33c978c8
Change-Id: I97f957bc5375d11cd034d4b06baa8636e7999f8c
Dan Stoza [Tue, 16 May 2017 20:41:16 +0000 (20:41 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev
am:
98e3c06010
Change-Id: I28774e185329082424a26cfccca4c95c7863e88f
Chia-I Wu [Tue, 16 May 2017 20:33:31 +0000 (20:33 +0000)]
Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev
TreeHugger Robot [Tue, 16 May 2017 20:30:06 +0000 (20:30 +0000)]
Merge "libgui: Check slot received from IGBP in Surface" into lmp-dev
Rob Carr [Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)]
Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."" into oc-dev am:
cbcefae07a
am:
92a3cc4761
Change-Id: I1e88987fdaacebec61a15f8234839e89f4b79799
Chris Forbes [Tue, 16 May 2017 20:27:44 +0000 (20:27 +0000)]
Merge "Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49 am:
161a9bcda1 am:
4c69f0c2e0" into oc-dev-plus-aosp
am:
90fea838c8
Change-Id: Ia29c95ace545d1dae68273d06b55ee6d41a78cfb
Chris Forbes [Tue, 16 May 2017 20:27:13 +0000 (20:27 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49 am:
161a9bcda1 am:
eb576150d5
am:
8f47ce8194
Change-Id: I60a40d5322e4aa01f4e43f7ed861df5b3ed28a35
Rob Carr [Tue, 16 May 2017 19:59:20 +0000 (19:59 +0000)]
Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."" into oc-dev
am:
cbcefae07a
Change-Id: Ia4f9ffcab90b6358413c566d9a4b05802f8bbfb1
Android Build Merger (Role) [Tue, 16 May 2017 19:55:38 +0000 (19:55 +0000)]
Merge "Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49 am:
161a9bcda1 am:
4c69f0c2e0" into oc-dev-plus-aosp
Chris Forbes [Tue, 16 May 2017 19:55:20 +0000 (19:55 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49 am:
161a9bcda1
am:
4c69f0c2e0
Change-Id: Ib725b06a8f1d28843717736a4a014941f4c6abbe
Chris Forbes [Tue, 16 May 2017 19:55:13 +0000 (19:55 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49 am:
161a9bcda1
am:
eb576150d5
Change-Id: If60dd4fa06a11aa72671573784c0d7774ae4c3ec
Rob Carr [Tue, 16 May 2017 19:53:03 +0000 (19:53 +0000)]
Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."" into oc-dev
Chris Forbes [Tue, 16 May 2017 19:52:13 +0000 (19:52 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49
am:
161a9bcda1
Change-Id: I9461a64173a220e0d21a8b8d0ef537025936660b
Chris Forbes [Tue, 16 May 2017 19:52:12 +0000 (19:52 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b am:
912ff8af49
am:
161a9bcda1
Change-Id: I40d6bd0cd8d3e4630d21218d826ca86127299519
Chris Forbes [Tue, 16 May 2017 19:49:43 +0000 (19:49 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c am:
1ceadac71b
am:
912ff8af49
Change-Id: I67ea29c18cbc22d806c97aab19588802a4001768
Chris Forbes [Tue, 16 May 2017 19:46:11 +0000 (19:46 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07 am:
a078c0780c
am:
1ceadac71b
Change-Id: I89b2e528d27938fa6bae79b3e6baa8e89d7207dd
Chris Forbes [Tue, 16 May 2017 19:42:42 +0000 (19:42 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344 am:
ce069c5a07
am:
a078c0780c
Change-Id: I060bbdef30d8710b8e5d779a0f75b61040530353
Rob Carr [Tue, 16 May 2017 19:40:52 +0000 (19:40 +0000)]
Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."
This reverts commit
1e079c2804edfae77925150280fe79418e58750b.
Bug:
38331032
Change-Id: Ib703b7b80a940550487a80d8ad62947e4becae93
Chris Forbes [Tue, 16 May 2017 19:39:41 +0000 (19:39 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88 am:
600e610344
am:
ce069c5a07
Change-Id: Ic185b2a7c35ea0260d5380d606f6b7b82c78b717
Chris Forbes [Tue, 16 May 2017 19:36:43 +0000 (19:36 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a am:
e3bc28ad88
am:
600e610344
Change-Id: I19dec89ef157c3a61300622c4425d5f6801f139e
Chris Forbes [Tue, 16 May 2017 19:33:42 +0000 (19:33 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6 am:
593a1a217a
am:
e3bc28ad88
Change-Id: I4ad5bf17fdca2bd0adee7a06150d595ef9b6a0fa
Chris Forbes [Tue, 16 May 2017 19:30:42 +0000 (19:30 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe am:
d4cbd296d6
am:
593a1a217a
Change-Id: I6c50751f24fdc5756bd5d1357df184d2a08f3c08
Chris Forbes [Tue, 16 May 2017 19:27:40 +0000 (19:27 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e am:
209ad9b6fe
am:
d4cbd296d6
Change-Id: I3ddc8b4600015cd53d1a41b687518cdbbc7696b6
Chris Forbes [Tue, 16 May 2017 19:24:11 +0000 (19:24 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d am:
81bab8081e
am:
209ad9b6fe
Change-Id: I31fe784570c5978faf7484b3f71a074523c0d33c
Chris Forbes [Tue, 16 May 2017 19:21:39 +0000 (19:21 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c am:
05df3a6f4d
am:
81bab8081e
Change-Id: I78509c86bada44d1d9f9c40e4d64a5120e4c7ab6
Chris Forbes [Tue, 16 May 2017 19:18:41 +0000 (19:18 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340 am:
5c5ee81b0c
am:
05df3a6f4d
Change-Id: I50c771aee7375315ba6c6aa4029baacfe9c199d8
Chris Forbes [Tue, 16 May 2017 19:15:38 +0000 (19:15 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0 am:
71d3ef1340
am:
5c5ee81b0c
Change-Id: Ie7ec2067057ea2dbd4b9af0c93a00ba53879b72f
Chris Forbes [Tue, 16 May 2017 19:12:38 +0000 (19:12 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am:
25556811f0
am:
71d3ef1340
Change-Id: I75797414173ebfb38eefe02ac0a635f10c59d883
Chris Forbes [Tue, 16 May 2017 19:10:08 +0000 (19:10 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev
am:
25556811f0
Change-Id: I5a267f8dccb75625fafd96e67bc0fbb9a2492ce7
Chris Forbes [Tue, 16 May 2017 19:00:54 +0000 (19:00 +0000)]
Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev
TreeHugger Robot [Tue, 16 May 2017 18:42:52 +0000 (18:42 +0000)]
Merge "add # vndk tags to vndk-only symbols of libnativewindow"
Chris Forbes [Wed, 10 May 2017 20:12:00 +0000 (13:12 -0700)]
ui: Fix bad size check in Fence::unflatten
Differs slightly from mnc+ patch: GetFlattenedSize was fixed in mnc.
Test: Boot device, run poc from bug, observe no longer crashes
Bug:
37285689
Change-Id: Id8b851733b088cce0d07493fbf76e7e24f9299ad
Yifan Hong [Tue, 16 May 2017 16:16:30 +0000 (16:16 +0000)]
Merge changes from topic 'lshal_debug' into oc-dev am:
47c1875e35 -s ours
am:
c0e6fa641b
Change-Id: Id8f5b24bdf8fc141f42a2fb357767b45138591e4
Okan Arikan [Tue, 16 May 2017 16:14:18 +0000 (16:14 +0000)]
Merge "Int key for the named buffers."
Yifan Hong [Tue, 16 May 2017 16:12:56 +0000 (16:12 +0000)]
Merge changes from topic 'lshal_debug' into oc-dev
am:
47c1875e35 -s ours
Change-Id: I66ecb116b5f601b08982ca82ab8aeda7e2c8a22e
Yifan Hong [Tue, 16 May 2017 08:01:44 +0000 (08:01 +0000)]
Merge changes from topic 'lshal_debug' into oc-dev
* changes:
Actually remove dead processes from lshal
Add tests to lshal.
Add `lshal debug` command.
Lshal: support commands.
lshal: remove "// static" comments
Logan Chien [Tue, 16 May 2017 05:15:49 +0000 (13:15 +0800)]
libhwc2on1adapter: Move to vendor partition
libhwc2on1adapter is a shim layer for legacy hwcomposer HALs. This is
only used by android.hardware.graphics.composer@2.1-impl.so. This must
not be accessed by framework modules. Thus, this commit moves
libhwc2on1adapter to the vendor partition and removes vendor_available.
Bug:
38302528
Test: Sailfish builds and boots.
Change-Id: I43d66c8c62f3dc90e75805f6a459573c093f9f14
Logan Chien [Tue, 16 May 2017 02:18:17 +0000 (10:18 +0800)]
Remove stale dependency to libhwc2on1adaptor.so.
This commit removes stale dependency to libhwc2on1adaptor. Since commit
831d48ed, mAdapter has become an unused private member. In addition,
this unused unique_ptr leads to an unnecessary symbol reference to the
destructor of HWC2on1Adaptor. This commit removes them completely.
Bug:
38302528
Test: Sailfish builds and boots.
Change-Id: I479f12ddbae91282a13464159f00513aa7cb3208
Yi Kong [Thu, 11 May 2017 18:51:08 +0000 (11:51 -0700)]
Do not use default initializer for union
The next Clang update complains about this code pattern. Rewrite default
constructor to explicitly initialize the union field instead of using
the default initializer.
Test: Build
Bug:
37752547
Change-Id: I22a2aa392d7f4803282baed832b0fa2f852016ac
Rob Carr [Tue, 16 May 2017 01:28:26 +0000 (01:28 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev am:
83c9468c80
am:
0f755fda7f
Change-Id: I0996c441cbfd4ead4ae5d0aaa5e80c9a02788c20
Okan Arikan [Mon, 15 May 2017 22:20:39 +0000 (15:20 -0700)]
Int key for the named buffers.
Also, rename them to global buffers from named buffers.
Bug:
38320428
Test: Run frameworks/native/libs/vr/libdvr/tests on device
Change-Id: I2109aea77e35f2ccd8055208058df4b7287c1d5e
Rob Carr [Mon, 15 May 2017 23:38:34 +0000 (23:38 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
am:
83c9468c80
Change-Id: I99a0a661a5a1c222e0d32276cf4b778ffa9cd05f
Jesse Hall [Mon, 15 May 2017 23:34:53 +0000 (23:34 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev am:
1df013c3ef
am:
3961b0e53a
Change-Id: I44819c2a7ebc1b40b462a17e24cd575ad92b919a
Jesse Hall [Mon, 15 May 2017 23:19:38 +0000 (23:19 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev
am:
1df013c3ef
Change-Id: I0f452c592ce7f87b05626f468a5c2ddb989ff242
Rob Carr [Mon, 15 May 2017 23:17:30 +0000 (23:17 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
TreeHugger Robot [Mon, 15 May 2017 23:16:27 +0000 (23:16 +0000)]
Merge "Clean up BufferHubQueue API and internal bookkeeping."
TreeHugger Robot [Mon, 15 May 2017 23:06:36 +0000 (23:06 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev
Corey Tabaka [Tue, 9 May 2017 01:55:02 +0000 (18:55 -0700)]
Clean up BufferHubQueue API and internal bookkeeping.
- Simplify buffer hangup accounting.
- Add extra checks to gracefully handle the epoll set and slots array
being out of sync.
- Add tests for detaching buffers.
- Switch to using Status<T> for all return/error values.
- Fix minor bug in BufferHubQueueProducer from earlier Status<T>
return value change.
Bug:
36401174
Test: buffer_hub_queue-test passes.
Change-Id: If7f86a45cc048dc77daa2ede56585d3f882dd24f
Jesse Hall [Mon, 15 May 2017 21:14:01 +0000 (14:14 -0700)]
Handle EINTR from sendmsg/recvmsg
Bug:
38317278
Test: bit CtsHardwareTestCases:.HardwareBufferTest
Change-Id: I7994a416f274b7c7916d0866fcb827073b731ccb
Chia-I Wu [Mon, 15 May 2017 17:32:27 +0000 (10:32 -0700)]
libgui: check for invalid slot in attachBuffer
Bug:
37478824
Test: manual
Change-Id: I369337d53539bf7f7e3d925bccdae4045da1b404
Yifan Hong [Mon, 15 May 2017 20:38:53 +0000 (20:38 +0000)]
Merge "Add lshal --neat option" am:
3a6828d50b am:
702ca32b5a am:
42648b7216
am:
52b7b5edc4
Change-Id: Icc2a7f152310f59a36f1c24e1e955a112d61ec8c
Yifan Hong [Mon, 15 May 2017 20:17:11 +0000 (20:17 +0000)]
Merge "Add lshal --neat option" am:
3a6828d50b am:
702ca32b5a
am:
42648b7216
Change-Id: If89739d3318c70d907070da796f8874b21e30bda
Yifan Hong [Mon, 15 May 2017 20:14:39 +0000 (20:14 +0000)]
Merge "Add lshal --neat option" am:
3a6828d50b
am:
702ca32b5a
Change-Id: Ide589b0a4487a0a50e43fcda179bba7ad5600fc4
Yifan Hong [Mon, 15 May 2017 20:12:09 +0000 (20:12 +0000)]
Merge "Add lshal --neat option"
am:
3a6828d50b
Change-Id: I15e00e281522c2ff59f885636c49d3ac41fc8eee
Treehugger Robot [Mon, 15 May 2017 20:05:51 +0000 (20:05 +0000)]
Merge "Add lshal --neat option"
Robert Carr [Tue, 9 May 2017 19:16:54 +0000 (12:16 -0700)]
SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes.
The same sort of thing we had with setPosition...not sure why I didn't
realize we would need the fixes here too! In particular we need to ensure
the following scenarios work:
1. Additional calls to set(Final)Crop while in the setGeometryAppliesWithResize
state are eventually applied.
2. Additional calls to set(Final)Crop while in the setGeometryAppliesWithResize
state are not immediately applied.
3. When we latch the buffer completing the resize...current hasn't been swapped
to drawing...which means our location in LayerRejector.cpp was the wrong
place to update the crop. This raises questions about whether the
Transparent region latching works.
Bug:
37531386
Test: Included in Transaction_test.
Change-Id: I5140d44fd5e591a4afe5bddc201db45f7bcb5674
Dan Stoza [Mon, 1 May 2017 23:31:53 +0000 (16:31 -0700)]
libgui: Check slot received from IGBP in Surface
Checks that the slot number received from mGraphicBufferProducer in
Surface::dequeueBuffer is on the interval [0, NUM_BUFFER_SLOTS) to
protect against a malicious BnGraphicBufferProducer.
Bug:
36991414
Change-Id: I1a76fd1bcce1c558f1c0c30f03638278288ed4fa
OSDN Git Service
