OSDN Git Service
android-build-team Robot [Wed, 24 May 2017 17:10:07 +0000 (17:10 +0000)]
release-request-
2b4652df-202e-4cb9-bf98-
5bd21a9292d6-for-git_oc-release-
4038361 snap-temp-L17500000067353615
Change-Id: I3d2cbf9c86b6cd3f79e35fb0ddbfdec3395123ac
TreeHugger Robot [Tue, 23 May 2017 21:50:28 +0000 (21:50 +0000)]
Merge "Do not set the trace clock in atrace.rc." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 19:52:17 +0000 (19:52 +0000)]
Merge "Surface: Use buffer id to synchronize slots" into oc-dev
Carmen Jackson [Tue, 23 May 2017 18:54:01 +0000 (11:54 -0700)]
Do not set the trace clock in atrace.rc.
This reverts only the atrace.rc change from commit
ea826794184be368f65f099ceac4fc31234700f6.
"Set the atrace clock to the best available value: boot, mono, or global."
This change caused a 100+ms regression in boot time. We also confirm that
the clock is set to the correct value when we call atrace, so we will
still see correct behavior after reverting this change.
Bug:
38504158
Test: Manually tested that the trace clock is updated when atrace is
called.
Change-Id: Ifa302694964a4f9fc54db16e7125d5279067bbfd
Shuzhen Wang [Tue, 23 May 2017 16:41:54 +0000 (09:41 -0700)]
Surface: Use buffer id to synchronize slots
For the same buffer, GraphicBuffer's buffer_handle_t* may change when
doing attach/detach. Use Id instead.
Test: Call attach/detach, and observe mRemovedBuffers is updated
Bug:
38238747
Change-Id: I6ab1ae5340565f98cb981b7e38c31a4f85190e56
android-build-team Robot [Tue, 23 May 2017 12:20:07 +0000 (12:20 +0000)]
release-request-
94bbded7-c270-40fa-9a74-
fedecfd046c6-for-git_oc-release-
4034177 snap-temp-L73200000066785187
Change-Id: I02b41d4a599727e78da7f1af265c4d10fa2e68b3
TreeHugger Robot [Tue, 23 May 2017 04:09:52 +0000 (04:09 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
Andreas Gampe [Mon, 22 May 2017 20:36:06 +0000 (13:36 -0700)]
Otapreopt: Add some static_asserts
Add some checks that indicate version issues.
Bug:
38501464
Test: m
Change-Id: Iec2043eda19126166139d7220618d11032e98af0
android-build-team Robot [Sun, 21 May 2017 08:25:36 +0000 (08:25 +0000)]
release-request-
c72e46fd-06a9-4104-bad3-
f7ba8aeb3e1d-for-git_oc-release-
4029917 snap-temp-L38800000066299680
Change-Id: I1b58f4224e01ca18ef50c8516dd105f3fa4e5186
Chris Forbes [Sat, 20 May 2017 00:54:29 +0000 (00:54 +0000)]
Merge "vulkan: Translate usage flags before passing to driver" into oc-dev
TreeHugger Robot [Fri, 19 May 2017 22:04:11 +0000 (22:04 +0000)]
Merge "Set the atrace clock to the best available value: boot, mono, or global." into oc-dev
Chris Forbes [Fri, 19 May 2017 21:47:29 +0000 (14:47 -0700)]
vulkan: Translate usage flags before passing to driver
Previously we just cast the 32bit flags and jammed them in the two
gralloc1 slots. Use the helper which does the correct translation.
(Yes, all these gralloc1isms are going away in favor of a single 64bit
flags field, but Vulkan HALs expect us to implement our side of
ANDROID_native_buffer correctly.)
Test: boot sailfish, run vulkan demo
Bug:
37686587
Change-Id: I806011986e8140d7f608d281798605bd9ca9a86b
Michael Wachenschwanz [Fri, 19 May 2017 18:27:10 +0000 (18:27 +0000)]
Merge "DO NOT MERGE Revert "Logging for catching memory issue in Parcel"" into oc-dev
Logan Chien [Fri, 19 May 2017 02:14:23 +0000 (02:14 +0000)]
Merge changes from topic 'move-hwc2on1' into oc-dev
* changes:
libhwc2on1adapter: Move to vendor partition
Remove stale dependency to libhwc2on1adaptor.so.
Calin Juravle [Fri, 19 May 2017 00:50:19 +0000 (00:50 +0000)]
Merge "Delete secondary dex profiles during reconciliation" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 23:59:15 +0000 (23:59 +0000)]
Merge "Fix race condition in displayservice." into oc-dev
Carmen Jackson [Fri, 5 May 2017 18:42:32 +0000 (11:42 -0700)]
Set the atrace clock to the best available value: boot, mono, or global.
This reverts commit
dc34097448a76a4bb09636f25567113d7a6551dc.
"Revert "Set the atrace clock to boot when possible and mono otherwise.""
...and includes a fix for devices that break with that change. Write will
fail with an Invalid Argument exception if we programmatically write a
value to the trace_file that doesn't exist in the file. So, we'll check
for both potential values we might set. If neither of them exist, fall
back to setting to 'global', which should be safe since we were doing it
before without checking.
Bug:
32379831
Test: cts-tradefed run singleCommand cts-dev --module
CtsAtraceHostTestCases passed.
Test: Manually examining trace_clock before and after running atrace shows that the
trace_clock changes as expected (for this test I disabled atrace.rc and added an
additional debug print statement):
$ cat /d/tracing/trace_clock
[local] global counter uptime perf mono boot
$ atrace --async_start freq
capturing trace...marlin:/ $ cat /d/tracing/trace_clock
local global counter uptime perf mono [boot]
$ atrace --async_stop > /dev/null
$ cat /d/tracing/trace_clock
local global counter uptime perf mono [boot]
$ atrace --async_start freq
clock is already correct!
$ atrace --async_stop > /dev/null
Change-Id: I267056d19bcdbea58881ab2b32f093caac5f14c1
Calin Juravle [Thu, 18 May 2017 22:33:05 +0000 (15:33 -0700)]
Delete secondary dex profiles during reconciliation
Test: manual inspections after adb shell dumpsys package dexopt
Bug:
38430319
Change-Id: I8401288b753a0c38ee3020d12e8e02c4a25723d2
Robert Carr [Thu, 18 May 2017 21:02:49 +0000 (14:02 -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. In LayerRejector.cpp we have to be sure we are not just latching a buffer
at the old size, which we still allow. This is the correct time to latch
the transparentRegion as it is content dependent, but doesn't represent
a size changing.
The difference between this and the original CL which was reverted has to do with
point 3. The original CL tried to solve point 3 by moving the latching logic from
the LayerRejecter in to Layer::doTransaction. However, in general doTransaction
will not be called in between Latching the buffer and drawing the frame, so this
introduced errors. The new test "FinalCropLatchingBufferOldSize" encapsulates this.
Bug:
37621737
Bug:
37531386
Test: Included in Transaction_test.cpp
Change-Id: I14bd09d01ac6b85895caa1b707d6fa7dac962074
Michael Wachenschwanz [Thu, 18 May 2017 22:08:32 +0000 (22:08 +0000)]
DO NOT MERGE Revert "Logging for catching memory issue in Parcel"
This reverts commit
c65de59762cfc284bd203d97281f5a8f86aba877.
Bug:
37298089
Change-Id: Ib42d27f91bf1408d633a98e6ac7f316175f1e289
Chia-I Wu [Wed, 17 May 2017 21:36:16 +0000 (14:36 -0700)]
surfaceflinger: clear HWC layers in Layer::onRemoved v2
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.
v2 fixes build breakage for non-HWC2 targets.
Bug:
38151478
Bug:
37978067
Test: manual
Change-Id: I8858fc46de1fc6facded219740b931c6486e317e
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
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: I425d090fb213abc767916db3f80cff8eb4ffb876
Merged-In: 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: I0208d7fb21ff2f5d59d367162bc5f982f1515982
Merged-In: I479f12ddbae91282a13464159f00513aa7cb3208
android-build-team Robot [Thu, 18 May 2017 07:14:47 +0000 (07:14 +0000)]
release-request-
60f55d52-4657-4714-89dc-
b6443475d767-for-git_oc-release-
4022373 snap-temp-L45500000065414617
Change-Id: I74ead7e7cc888d76fd94654f35c15d06bc65c1d7
TreeHugger Robot [Thu, 18 May 2017 04:36:30 +0000 (04:36 +0000)]
Merge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 02:29:27 +0000 (02:29 +0000)]
Merge "libui: flush hwbinder commands in Allocator::allocate" into oc-dev
Steven Moreland [Thu, 18 May 2017 01:15:15 +0000 (18:15 -0700)]
Fix race condition in displayservice.
Also addressed a couple of format nits and added copyright headers.
Note, this race condition wouldn't have occured as is because the
service is only being served on one thread.
Test: no race condition still
Bug:
38311538
Change-Id: I7516c800eb89280a16468934677fa978daa5dcec
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: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
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
android-build-team Robot [Wed, 17 May 2017 07:19:52 +0000 (07:19 +0000)]
release-request-
6c498b17-9310-412b-ad36-
3dcf25ffef73-for-git_oc-release-
4017086 snap-temp-L16500000064871237
Change-Id: I048b8a372ed1eb76935051c1a0fda403ac6c99b8
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:12:48 +0000 (00:12 +0000)]
Merge "Revert "Newly create idmap only when it is outdated"" into oc-dev
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: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: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
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
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
android-build-team Robot [Tue, 16 May 2017 20:44:57 +0000 (20:44 +0000)]
Merge cherrypicks of [
2269377,
2269544,
2269625,
2269477,
2269415,
2269999,
2270000,
2270001,
2269602,
2269416] into oc-release
Change-Id: Ic90ee26b99a1e5e79223af87e5315d7f6e94d7dc
Rob Carr [Tue, 16 May 2017 19:40:52 +0000 (19:40 +0000)]
Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes."
Change-Id: I39547c1a6ba7abf3f379fa67acd6ba5772cbf7b4
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 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: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
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 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
android-build-team Robot [Tue, 16 May 2017 07:22:05 +0000 (07:22 +0000)]
release-request-
ad2b7abc-f489-4c21-891e-
cb2cf48c6370-for-git_oc-release-
4012004 snap-temp-L44000000064332402
Change-Id: I6d07183b97142181c268dfa6c71ad38fb8f06395
Yin-Chia Yeh [Thu, 11 May 2017 23:54:04 +0000 (16:54 -0700)]
Surface: add unit test for GetAndFlushRemovedBuffers
Also fix the removed list flush behavior to match spec.
Test: the new test pass, smoke test GCA
Bug:
36869090
Change-Id: I8f7bdd8b168424f4e79980d21a7388aa9e35597e
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:06:36 +0000 (23:06 +0000)]
Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev
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
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
Dan Stoza [Mon, 15 May 2017 18:49:36 +0000 (18:49 +0000)]
libgui: Check slot received from IGBP in Surface am:
ac93b3a30e am:
7cb9cd3df2 am:
057ae95ab2 -s ours am:
bec844f6d4 am:
e7c7be2c17 am:
cc184e4209 am:
2c86168b51 am:
f4a1a4e7fd am:
1102b311c8 am:
f571b41457 am:
fa765bacf8 am:
146f77fc3c am:
4a1e3105bf am:
380e1aa3e9
am:
0cb4516f42
Change-Id: I58afb0e1211d2a8990d406c983eb084827a903b4
Dan Stoza [Mon, 15 May 2017 18:46:34 +0000 (18:46 +0000)]
libgui: Check slot received from IGBP in Surface am:
ac93b3a30e am:
7cb9cd3df2 am:
057ae95ab2 -s ours am:
bec844f6d4 am:
e7c7be2c17 am:
cc184e4209 am:
2c86168b51 am:
f4a1a4e7fd am:
1102b311c8 am:
f571b41457 am:
fa765bacf8 am:
146f77fc3c am:
4a1e3105bf
am:
380e1aa3e9
Change-Id: I7eed6fe471d204a4b8ff1b82b2b7739925294b6e
OSDN Git Service
