OSDN Git Service
Yifan Hong [Fri, 26 May 2017 20:29:27 +0000 (20:29 +0000)]
Merge "Add pids for processes that dlopens implementations" am:
2410cd179d am:
977066464e
am:
479f9d0c7b
Change-Id: I896d198a1680ad1a5020a712f925db3c3dfc2084
Yifan Hong [Fri, 26 May 2017 20:27:08 +0000 (20:27 +0000)]
Merge "Add pids for processes that dlopens implementations" am:
2410cd179d
am:
977066464e
Change-Id: Ib2b23816c0032bc6303380f05ee1bb4b45de7f43
Yifan Hong [Fri, 26 May 2017 20:25:27 +0000 (20:25 +0000)]
Merge "Add pids for processes that dlopens implementations"
am:
2410cd179d
Change-Id: Ifd75354a22ef848b28113e2d1d1ccf00baf1e976
Treehugger Robot [Fri, 26 May 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Add pids for processes that dlopens implementations"
Jean-Michel Trivi [Fri, 26 May 2017 20:09:55 +0000 (20:09 +0000)]
Merge "Playback activity monitoring: add player types" into oc-dev
am:
8caf56ef7c
Change-Id: Iae04c321f57e33019861ebf60ea29256b0d63e29
TreeHugger Robot [Fri, 26 May 2017 20:05:48 +0000 (20:05 +0000)]
Merge "Playback activity monitoring: add player types" into oc-dev
Yifan Hong [Thu, 25 May 2017 02:45:02 +0000 (19:45 -0700)]
Add pids for processes that dlopens implementations
Test: lshal -itrpc
Test: lshal
Test: lshal --init-vintf
Test: lshal_test
Bug:
37639822
Change-Id: Ia415e5f8dbcd10f24e9a5cfdd591eb829a1da89e
Nicolas Geoffray [Fri, 26 May 2017 10:34:47 +0000 (10:34 +0000)]
Merge "Delete vdex file in delete_odex." am:
99dedeb690 am:
f6b79dd073
am:
6dc664460d
Change-Id: I0116a003cd1985e15d2beb9a60a4262549647774
Nicolas Geoffray [Fri, 26 May 2017 10:29:45 +0000 (10:29 +0000)]
Merge "Delete vdex file in delete_odex." am:
99dedeb690
am:
f6b79dd073
Change-Id: I28ec2908c795bf3e88960732d69e2945b1eac422
Nicolas Geoffray [Fri, 26 May 2017 10:28:16 +0000 (10:28 +0000)]
Merge "Delete vdex file in delete_odex."
am:
99dedeb690
Change-Id: Idccc7fa241cdbb72b0ac5672978350a269ac8378
Nicolas Geoffray [Fri, 26 May 2017 10:21:25 +0000 (10:21 +0000)]
Merge "Delete vdex file in delete_odex."
Nicolas Geoffray [Thu, 25 May 2017 12:58:06 +0000 (13:58 +0100)]
Delete vdex file in delete_odex.
bug:
38513395
Test: unfortunately no unit test here, so after discussing
with agampe@ just relied on build.
Change-Id: I305ddaadc813673fb55473f5e8ca357f39cf98f3
Steven Moreland [Thu, 25 May 2017 23:17:52 +0000 (23:17 +0000)]
Merge "Add thread usage output to lshal." am:
4a3e0a9767 am:
9a130151a2
am:
de314f2df2
Change-Id: I321f393d2fc7252ea6d009c743fe797b083d718a
Steven Moreland [Thu, 25 May 2017 23:08:20 +0000 (23:08 +0000)]
Merge "Add thread usage output to lshal." am:
4a3e0a9767
am:
9a130151a2
Change-Id: I8045623cc47804816df7304cabea1633a18aeada
Steven Moreland [Thu, 25 May 2017 22:58:30 +0000 (22:58 +0000)]
Merge "Add thread usage output to lshal."
am:
4a3e0a9767
Change-Id: Ie0a5eb6b3f1c502e9cf6c70e10354ce133985348
Treehugger Robot [Thu, 25 May 2017 22:42:24 +0000 (22:42 +0000)]
Merge "Add thread usage output to lshal."
Jean-Michel Trivi [Thu, 25 May 2017 22:17:39 +0000 (15:17 -0700)]
Playback activity monitoring: add player types
Add player types for playback activity monitoring:
- AAudio
- hardware sources
- proxy for external players
Test: n/a
Bug:
62027849
Change-Id: I17f4879dd79cc89eb7db373754a79e2e38c97457
Jaekyun Seok [Thu, 25 May 2017 22:06:03 +0000 (22:06 +0000)]
Merge "Newly create idmap only when it is stale" into oc-dev
am:
4bf5dcce19
Change-Id: Ibafdbb1406b822a7e7f50ca229b8aefe9981b547
TreeHugger Robot [Thu, 25 May 2017 21:50:52 +0000 (21:50 +0000)]
Merge "Newly create idmap only when it is stale" into oc-dev
Chia-I Wu [Thu, 25 May 2017 21:27:21 +0000 (21:27 +0000)]
libgui: fix BQ buffer allocation error checking
am:
feec3b1a49
Change-Id: Ie63b629a8eb0f4c08eadbcf3a40ceaf8346a71ba
Chia-I Wu [Thu, 25 May 2017 16:34:56 +0000 (09:34 -0700)]
libgui: fix BQ buffer allocation error checking
The error path was broken since we moved away from
IGraphicBufferAlloc.
Bug:
37956614
Test: simulate buffer allocation failures
Change-Id: I1e1ec840fafd3075b84126c6dbf6194568175a42
Season Li [Thu, 25 May 2017 01:18:05 +0000 (01:18 +0000)]
Merge "SF: Call makeCurrent after presenting each display" am:
7bb8779a79 am:
5079756e8e
am:
53df8fac8b
Change-Id: I9860424ffa54807eccc6ef7ab4dbba99ed18d46a
Season Li [Thu, 25 May 2017 01:12:03 +0000 (01:12 +0000)]
Merge "SF: Call makeCurrent after presenting each display" am:
7bb8779a79
am:
5079756e8e
Change-Id: I6075c26cb0cd73de62f1607712c720e2d2a6248c
Season Li [Thu, 25 May 2017 01:06:02 +0000 (01:06 +0000)]
Merge "SF: Call makeCurrent after presenting each display"
am:
7bb8779a79
Change-Id: If22c0369b968a72dcbac8b97061f5555c18e8432
Treehugger Robot [Thu, 25 May 2017 00:59:58 +0000 (00:59 +0000)]
Merge "SF: Call makeCurrent after presenting each display"
Fabien Sanglard [Wed, 24 May 2017 22:19:31 +0000 (22:19 +0000)]
Merge "Delete SurfaceFlinger BYPASS codepath" into oc-dev
am:
d8ac4fd17a
Change-Id: Ieae1107f4da7b4a3eaa489175bda4bdb62e9d245
TreeHugger Robot [Wed, 24 May 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Delete SurfaceFlinger BYPASS codepath" into oc-dev
Steven Moreland [Wed, 24 May 2017 18:23:08 +0000 (11:23 -0700)]
Add thread usage output to lshal.
This output shows how many threads are in use at a give time.
Test: lshal, manual
Bug:
35099601
Change-Id: I3a22bb131b828cdd77e73e7810229d9c68a496d3
Dan Stoza [Wed, 24 May 2017 18:29:16 +0000 (18:29 +0000)]
Merge "libgui: Add test for OOB slot number in dequeue" into oc-dev
am:
c1225bdafc
Change-Id: Ia6a3f61406928e3293423a4d8981a4ef594779ca
TreeHugger Robot [Wed, 24 May 2017 18:24:03 +0000 (18:24 +0000)]
Merge "libgui: Add test for OOB slot number in dequeue" into oc-dev
Season Li [Thu, 4 Aug 2016 21:32:44 +0000 (14:32 -0700)]
SF: Call makeCurrent after presenting each display
HWC can change EGLContext in each present. Restore to
default EGLContext after commiting each display.
Test: see https://android-review.googlesource.com/#/c/372703/
Change-Id: I4abc84fb3d4b74964fabcad5a2568ff01a6c5dbb
gaoshang [Wed, 24 May 2017 16:23:56 +0000 (16:23 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error" am:
77bee3b429 am:
9d5bddcded
am:
251baedfaf
Change-Id: I34210fcd813c2118f0fa4814884b4adadacc415f
gaoshang [Wed, 24 May 2017 16:20:54 +0000 (16:20 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error" am:
77bee3b429
am:
9d5bddcded
Change-Id: I9ff24304c580bba54afe9b0f4bc4394d513c04cf
gaoshang [Wed, 24 May 2017 16:18:23 +0000 (16:18 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"
am:
77bee3b429
Change-Id: If794d0ec576c91fc8554bf974d7409966b306cba
Treehugger Robot [Wed, 24 May 2017 16:10:16 +0000 (16:10 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"
Fabien Sanglard [Thu, 4 May 2017 18:25:46 +0000 (11:25 -0700)]
Delete SurfaceFlinger BYPASS codepath
Test: AUPT, Manual
Change-Id: I8d6139fbb8a3ec113d7cb973420a5874d3e31030
Merged-Id: I8d6139fbb8a3ec113d7cb973420a5874d3e31030
Jaekyun Seok [Wed, 17 May 2017 15:13:44 +0000 (00:13 +0900)]
Newly create idmap only when it is stale
For now, OverlayManagerService calls Installd.idmap() whenever a user
is changed, and then a idmap is re-generated even though there are no
changes on its target apk and overlay apk.
This CL is to avoid such unnecessary re-generation of idmap. Instead
only a group id will be updated when the idmap isn't outdated.
To correctly check staleness of idmap, "--verify" function of idmap is
invented as well.
Test: building succeeded and tested on sailfish.
Bug:
37179531
Change-Id: I874be9765d37bfa6c562c3f39a395040dc6a7d1f
Carmen Jackson [Tue, 23 May 2017 21:53:06 +0000 (21:53 +0000)]
Merge "Do not set the trace clock in atrace.rc." into oc-dev
am:
27ef38ca4c
Change-Id: I068e661eba9c7e668a6157dc4d704b4b73e8514c
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
Shuzhen Wang [Tue, 23 May 2017 19:59:44 +0000 (19:59 +0000)]
Merge "Surface: Use buffer id to synchronize slots" into oc-dev
am:
adf0ad2090
Change-Id: I01b8012c941001530678f944670a083e34b7ebc6
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
Robert Carr [Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
am:
e2fad8108e
Change-Id: I3fae02f6d1c03e69f55a05bfdf6229580ae1c4ee
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 23:17:00 +0000 (23:17 +0000)]
Otapreopt: Add some static_asserts
am:
ef21fd2b6b
Change-Id: I9f72d69a74a945f3c822401e466028d94330fdb3
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
gaoshang [Wed, 17 May 2017 06:36:46 +0000 (14:36 +0800)]
Fix a anr bug caused by sendFinishedSignal logical error
Because of eliminate multiple benign overflow conditions see:
https://android-review.googlesource.com/#/c/172237/
Changed the do while loop resulting in a logical difference.
When the chainIndex-- to 0, the loop is not run.
It is the most important cycle, it will push head seq to mSeqChains.
If not run, will lead to a batch of seq can not corrected finish.
Eventually leading to the occurrence of anr.
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
Test: Input dispatche process
Bug:
38366215
Change-Id: I87e609dfcb00ac7b8e82c6de789df094e7c25efd
Chris Forbes [Sat, 20 May 2017 01:00:31 +0000 (01:00 +0000)]
Merge "vulkan: Translate usage flags before passing to driver" into oc-dev
am:
b667c05f03
Change-Id: I974356cbc64e3e52b52bb85defa2f548286ece63
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
Carmen Jackson [Fri, 19 May 2017 22:07:47 +0000 (22:07 +0000)]
Merge "Set the atrace clock to the best available value: boot, mono, or global." into oc-dev
am:
bfe6bf6f31
Change-Id: I4b198e07cdf1742aff8a771721021ca6ba28f20a
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:41:08 +0000 (18:41 +0000)]
Merge "DO NOT MERGE Revert "Logging for catching memory issue in Parcel"" into oc-dev
am:
1967749cdc
Change-Id: I1ef9cd112030f317518c483364a9fb505a40d7bc
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
TreeHugger Robot [Fri, 19 May 2017 16:18:25 +0000 (16:18 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.49" into oc-dev-plus-aosp
Jesse Hall [Fri, 19 May 2017 00:40:25 +0000 (17:40 -0700)]
vulkan: update Vulkan headers to 1.0.49
Key changes since 1.0.46:
* Add VK_KHR_get_surface_capabilities2
* Add VK_KHR_shared_presentable_image
* Add VkObjectType enumeration to core API
The extensions had already been added manually in our internal tree,
so this just moves the existing declarations to the same place as in
the public header and fixes one small difference.
Test: dEQP-VK.wsi.android.surface.query_capabilities2
dEQP-VK.wsi.android.shared_presentable_image.*
Change-Id: I1e4bd5d19f36af0d4e878b3971145a1ae1281dd6
Logan Chien [Fri, 19 May 2017 02:20:15 +0000 (02:20 +0000)]
Merge changes from topic 'move-hwc2on1' into oc-dev
am:
df8ca52d13
Change-Id: I54fd4fe69160540a0f0eae3a9b6aa7a377448cd4
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:58:05 +0000 (00:58 +0000)]
Merge "Delete secondary dex profiles during reconciliation" into oc-dev
am:
74a812c587
Change-Id: Ia31c6372f66a4c1a0e574e1e85dfcc7af1307bfd
Calin Juravle [Fri, 19 May 2017 00:50:19 +0000 (00:50 +0000)]
Merge "Delete secondary dex profiles during reconciliation" into oc-dev
Steven Moreland [Fri, 19 May 2017 00:12:01 +0000 (00:12 +0000)]
Merge "Fix race condition in displayservice." into oc-dev
am:
02e3c25f95
Change-Id: I2497f6867fa92f1d746d24c920ba62762b11b49b
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 [Thu, 18 May 2017 20:10:13 +0000 (20:10 +0000)]
surfaceflinger: clear HWC layers in Layer::onRemoved v2
am:
3851225fdd
Change-Id: Id7a9f7883a43b71737efcb645c53b4e81f8ded02
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: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
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
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: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: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
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
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: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:38:14 +0000 (20:38 +0000)]
Merge "Add displayservice." into oc-dev
am:
4820c84197
Change-Id: I4817233aedd593dff62b4f8b4d41fa08cd4c5dd7
Dan Stoza [Tue, 16 May 2017 22:12:48 +0000 (15:12 -0700)]
libgui: Add test for OOB slot number in dequeue
Adds a unit test that verifies that a malicious BnGraphicBufferProducer
cannot pass an invalid slot number to a Surface and thus cause the
Surface to segfault (or otherwise access out-of-bounds memory).
Bug:
36991414
Test: The new Malicious* tests pass after applying the security patch
Change-Id: I2083465a496cfcc8e8c3b3bc288f5f6904005ac3
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
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"
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