OSDN Git Service
Okan Arikan [Mon, 8 May 2017 20:31:34 +0000 (13:31 -0700)]
Adopt the use of shared buffers.
Bug:
37001948
Test: Make system image
Change-Id: I032574f250e0f0fe7768af649730406e24d853db
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:34:58 +0000 (09:34 +0000)]
Merge "Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"" into oc-dev am:
fb8cedea27
am:
aff95601d6
Change-Id: I2e0212c60a288acf0369f1ac0fd20d6124c88618
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:30:28 +0000 (09:30 +0000)]
Merge "Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"" into oc-dev
am:
fb8cedea27
Change-Id: I3c71f6ea2f15249486398c65d77ad1c9e161b118
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:27:07 +0000 (09:27 +0000)]
Merge "Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"" into oc-dev
Przemyslaw Szczepaniak [Thu, 18 May 2017 09:17:02 +0000 (09:17 +0000)]
Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"
Causing failures due to lack of clearHwcLayers in git_master and few
other branches/builds. Looks like clearHwcLayers needs USE_HWC2
to be defined, seems to be not defined in few branches/builds?
This reverts commit
06837418fe9fb0c6deeab7d62ac5bf65c7bb2b98.
Change-Id: Ic0e3a99b45543503d5fa8a90f3569764ebe922e3
Howard Chen [Thu, 18 May 2017 05:05:12 +0000 (05:05 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline" am:
f232542c03 am:
9d57a08f8e am:
79453d7171 -s ours
am:
e6747bd39c
Change-Id: I89d30d262d95106257a8104943f1c74fd1f3da9b
Howard Chen [Thu, 18 May 2017 05:01:13 +0000 (05:01 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline" am:
f232542c03 am:
9d57a08f8e
am:
79453d7171 -s ours
Change-Id: Id31db457d4469e55299c63196c2e15d2d6d9c405
Chia-I Wu [Thu, 18 May 2017 04:52:38 +0000 (04:52 +0000)]
Merge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev am:
e256ecb511
am:
59cfc5e6b9
Change-Id: Idb78673c7f1ba98476b2c2aa7609b7e374aa8937
Chia-I Wu [Thu, 18 May 2017 04:47:28 +0000 (04:47 +0000)]
Merge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev
am:
e256ecb511
Change-Id: I3d46760b868a0b1f4db95b8ba8de4f434292ebc9
TreeHugger Robot [Thu, 18 May 2017 04:36:30 +0000 (04:36 +0000)]
Merge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev
Howard Chen [Thu, 18 May 2017 03:12:27 +0000 (03:12 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline" am:
f232542c03
am:
9d57a08f8e
Change-Id: I4133c2f0eb21a282385cbb05656b115e9a5b4dfa
Howard Chen [Thu, 18 May 2017 03:03:38 +0000 (03:03 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline"
am:
f232542c03
Change-Id: I45b92a5340d8bbc6aa0898b0a1ef073223e49cf6
Howard Chen [Thu, 18 May 2017 02:50:48 +0000 (02:50 +0000)]
Merge "Support halt the trace when schd-dbg hit deadline"
Chia-I Wu [Thu, 18 May 2017 02:38:57 +0000 (02:38 +0000)]
Merge "libui: flush hwbinder commands in Allocator::allocate" into oc-dev am:
06da1581fc
am:
051ca32c5e
Change-Id: I785c527a189c1d3a0727c7d8cf5eb57129a41994
Chia-I Wu [Thu, 18 May 2017 02:35:27 +0000 (02:35 +0000)]
Merge "libui: flush hwbinder commands in Allocator::allocate" into oc-dev
am:
06da1581fc
Change-Id: I23fb96fa38421ff8e1788b489d927736534ea458
TreeHugger Robot [Thu, 18 May 2017 02:29:27 +0000 (02:29 +0000)]
Merge "libui: flush hwbinder commands in Allocator::allocate" into oc-dev
Chia-I Wu [Thu, 18 May 2017 00:40:19 +0000 (00:40 +0000)]
Merge "surfaceflinger: fix a release fence leak" into oc-dev am:
5c580eaeb6
am:
4a09c8fb5e
Change-Id: Ie0df74a1390d880735ed05887dbc7a653e0dc7ee
Chia-I Wu [Thu, 18 May 2017 00:36:50 +0000 (00:36 +0000)]
Merge "surfaceflinger: fix a release fence leak" into oc-dev
am:
5c580eaeb6
Change-Id: I84760b3e922c4a3b6ea221bd04e3d24a8d932e22
TreeHugger Robot [Thu, 18 May 2017 00:29:43 +0000 (00:29 +0000)]
Merge "surfaceflinger: fix a release fence leak" into oc-dev
Chris Forbes [Wed, 17 May 2017 21:49:54 +0000 (21:49 +0000)]
Merge "libvulkan: Enable GSC2 and SPI extensions" into oc-dev am:
d69b9d0e87
am:
c4edc50adb
Change-Id: I91b510a1b9553ca25853a7a370fddb40f39e4221
Yin-Chia Yeh [Wed, 17 May 2017 21:49:15 +0000 (21:49 +0000)]
Merge "Surface: add unit test for GetAndFlushRemovedBuffers" into oc-dev am:
52402901b3
am:
941af0bd18
Change-Id: Iadae9a5eb905b1c6ec1f0030e94732d26cb83780
Chris Forbes [Wed, 17 May 2017 21:45:20 +0000 (21:45 +0000)]
Merge "libvulkan: Enable GSC2 and SPI extensions" into oc-dev
am:
d69b9d0e87
Change-Id: Ibf936d0fe5f3584a198623ecf669522b63aebd06
Yin-Chia Yeh [Wed, 17 May 2017 21:44:57 +0000 (21:44 +0000)]
Merge "Surface: add unit test for GetAndFlushRemovedBuffers" into oc-dev
am:
52402901b3
Change-Id: I65921d1e49b099ecb010acd53d5310d5291fe23a
Chris Forbes [Wed, 17 May 2017 21:42:59 +0000 (21:42 +0000)]
Merge "libvulkan: Enable GSC2 and SPI extensions" into oc-dev
Chia-I Wu [Wed, 17 May 2017 21:36:16 +0000 (14:36 -0700)]
surfaceflinger: clear HWC layers in Layer::onRemoved
Explicitly destroy HWC layers in Layer::onRemoved rather than doing
that implicitly in the destructor. The layer may be destructed by
any thread that holds a sp<Layer>, but only the main thread should
talk to the composer.
Bug:
38151478
Bug:
37978067
Test: manual
Change-Id: If6fcfaa5a70d247b751f2b4d9aec9eca890e3aa5
TreeHugger Robot [Wed, 17 May 2017 21:32:27 +0000 (21:32 +0000)]
Merge "Surface: add unit test for GetAndFlushRemovedBuffers" into oc-dev
Chia-I Wu [Wed, 17 May 2017 20:43:16 +0000 (13:43 -0700)]
surfaceflinger: fix a release fence leak
We leak release fence fds when we believe hwcomposer2 gives us any
invalid layer and return early.
Bug:
38151478
Test: boots
Change-Id: I299721eca8bc7927052170fe87ee51e9b91006aa
Steven Moreland [Wed, 17 May 2017 20:58:59 +0000 (20:58 +0000)]
Merge "Add displayservice." into oc-dev am:
4820c84197
am:
b9a84e400b
Change-Id: I560b3198db69ca69952ec04c150d7de39b5bbbc7
Steven Moreland [Wed, 17 May 2017 20:38:14 +0000 (20:38 +0000)]
Merge "Add displayservice." into oc-dev
am:
4820c84197
Change-Id: I4817233aedd593dff62b4f8b4d41fa08cd4c5dd7
TreeHugger Robot [Wed, 17 May 2017 20:19:59 +0000 (20:19 +0000)]
Merge "Add displayservice." into oc-dev
Steven Moreland [Wed, 17 May 2017 00:42:50 +0000 (17:42 -0700)]
Add displayservice.
This hidl service provides information about vsync and hotplug
to vendor services which is required by at least some camera
hal implementations.
Test: VtsFwkDisplayServiceV1_0TargetTest
Bug:
38311538
Change-Id: Ifc344c11ca4b3c8cebc6f0145f506d1aa774506d
TreeHugger Robot [Wed, 17 May 2017 17:52:31 +0000 (17:52 +0000)]
Merge "Add shmem config buffer to libvrflinger"
Peng Xu [Wed, 17 May 2017 17:27:08 +0000 (17:27 +0000)]
Merge "No more ashmem equivalent checker false alarm"
John Bates [Thu, 11 May 2017 18:00:31 +0000 (11:00 -0700)]
Add shmem config buffer to libvrflinger
This allows VrCore to configure some tunable behaviors
of libvrflinger.
- Added dvrDisplayManagerDeleteNamedBuffer for testing config buffer
creation.
- Added tests for named buffers, including one for the config buffer.
- Added IsValid to broadcast_ring to avoid tracking redundant state
externally.
Bug:
38193993
Test: Run dvr_named_buffer-test
Change-Id: I52722dd314233b5bea1ca6377c14b5c856825746
Howard Chen [Wed, 17 May 2017 07:55:36 +0000 (07:55 +0000)]
Merge "Make the binder_lock category optional" am:
61e58d5a47 am:
c4a8373ccd am:
f06f26bbb5
am:
c821f28ff2 -s ours
Change-Id: Ib6d4562fa23099469bf963037802b225457ec954
Howard Chen [Wed, 17 May 2017 07:52:28 +0000 (07:52 +0000)]
Merge "Make the binder_lock category optional" am:
61e58d5a47 am:
c4a8373ccd
am:
f06f26bbb5
Change-Id: I6f9d043a8a2ac1a3a1d6a1e135fb061b94edccba
Howard Chen [Wed, 17 May 2017 07:40:34 +0000 (07:40 +0000)]
Merge "Make the binder_lock category optional" am:
61e58d5a47
am:
c4a8373ccd
Change-Id: I1c8565bbc58b42522a12a2b43004fc765e20f605
Howard Chen [Wed, 17 May 2017 07:38:36 +0000 (07:38 +0000)]
Merge "Make the binder_lock category optional"
am:
61e58d5a47
Change-Id: I6fec33b45edd7665d26f4c5ad5e9c7f4f7ce7d21
Treehugger Robot [Wed, 17 May 2017 07:28:41 +0000 (07:28 +0000)]
Merge "Make the binder_lock category optional"
TreeHugger Robot [Wed, 17 May 2017 07:04:49 +0000 (07:04 +0000)]
Merge "Make the binder_lock category optional"
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.
Howard Chen [Wed, 10 May 2017 08:32:11 +0000 (16:32 +0800)]
Make the binder_lock category optional
The binder_lock event type has been deprecated after binder
driver uses fine grained locking. This patch makes "binder_lock"
an optional category for atrace to support system w/ w/o FGL.
Bug:
37559846
Test: pixel phone with "atrace --async_start binder_lock"
Merged-In: I691efd355e903a26629f896a56a664502e5807f7
Change-Id: I691efd355e903a26629f896a56a664502e5807f7
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"
Peng Xu [Tue, 16 May 2017 22:12:22 +0000 (15:12 -0700)]
No more ashmem equivalent checker false alarm
The checker for ashmem file descriptor equivalency is
too strict and false alarms. This CL fix the issue.
Bug:
38352409
Test: successfully register multiple ashmem sensor direct channels
without "Duplicate create channel request for the
same share memory"
Change-Id: Ib80b47944940ce708953632855174d2f90c41b49
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:30:34 +0000 (14:30 -0700)]
libui: flush hwbinder commands in Allocator::allocate
Bug:
36279079
Test: monkey test on fugu
Change-Id: I81f72d63d3ede64f279b26208bb5df7646050e73
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
OSDN Git Service
