OSDN Git Service

android-x86/frameworks-native.git
7 years agolibgui: Add Surface::getLastDequeueStartTime
Dan Stoza [Thu, 1 Jun 2017 06:16:33 +0000 (06:16 +0000)]
libgui: Add Surface::getLastDequeueStartTime
am: 932f008485

Change-Id: I77404c1b97cb997a057558362b9bfdf9df65c8da

7 years agoMerge "Disable in-place vdex update" am: d9917d78a0 am: 2521871a1f
David Sehr [Wed, 31 May 2017 22:15:04 +0000 (22:15 +0000)]
Merge "Disable in-place vdex update" am: d9917d78a0 am: 2521871a1f
am: b8e9326fd8

Change-Id: Ia2297f8cc31830e4e3909580f3af45dfb96e5901

7 years agoMerge "Disable in-place vdex update" am: d9917d78a0
David Sehr [Wed, 31 May 2017 22:10:23 +0000 (22:10 +0000)]
Merge "Disable in-place vdex update" am: d9917d78a0
am: 2521871a1f

Change-Id: I9c4d606bcb054ad96b28a4da76a7ddf241d8687b

7 years agoMerge "Disable in-place vdex update"
David Sehr [Wed, 31 May 2017 22:08:21 +0000 (22:08 +0000)]
Merge "Disable in-place vdex update"
am: d9917d78a0

Change-Id: Ieb4a1235dc99cac32b6fb441ee98e0cbdf4b7661

7 years agoMerge "Disable in-place vdex update"
Treehugger Robot [Wed, 31 May 2017 22:00:43 +0000 (22:00 +0000)]
Merge "Disable in-place vdex update"

7 years agolibgui: Add Surface::getLastDequeueStartTime
Dan Stoza [Wed, 31 May 2017 20:50:16 +0000 (13:50 -0700)]
libgui: Add Surface::getLastDequeueStartTime

Adds the getLastDequeueStartTime method, which allows the caller to
determine whether the last dequeueBuffer call fell into a given time
window.

Bug: 62213889
Test: SurfaceTest.TestGetLastDequeueStartTime in libgui_test
Change-Id: I1684deb09273745a3adc751554624d2257fa890e

7 years agoMerge "Consistent "low storage" behavior." into oc-dev
Jeff Sharkey [Wed, 31 May 2017 14:49:31 +0000 (14:49 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
am: 1e4088fc68

Change-Id: I8a2328710d4bc770badfcc9778534fccaaf91405

7 years agoMerge "Consistent "low storage" behavior." into oc-dev
Jeff Sharkey [Wed, 31 May 2017 14:18:24 +0000 (14:18 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev

7 years agoMerge "dumpstate: Track debuggerd API changes." am: ccc5db441b am: 62b9a75c4c
Narayan Kamath [Wed, 31 May 2017 12:29:12 +0000 (12:29 +0000)]
Merge "dumpstate: Track debuggerd API changes." am: ccc5db441b am: 62b9a75c4c
am: ea3784b686

Change-Id: I82e5974f96a2a617d31a63813dac22035532c59b

7 years agoMerge "dumpstate: Track debuggerd API changes." am: ccc5db441b
Narayan Kamath [Wed, 31 May 2017 12:16:32 +0000 (12:16 +0000)]
Merge "dumpstate: Track debuggerd API changes." am: ccc5db441b
am: 62b9a75c4c

Change-Id: Id1320f3373a4bbcdcfd945ea9299bd8a805adc12

7 years agoMerge "dumpstate: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 12:06:51 +0000 (12:06 +0000)]
Merge "dumpstate: Track debuggerd API changes."
am: ccc5db441b

Change-Id: I05214262704a572a4645df427a76227f8d9eeac4

7 years agoMerge "dumpstate: Track debuggerd API changes."
Narayan Kamath [Wed, 31 May 2017 11:55:47 +0000 (11:55 +0000)]
Merge "dumpstate: Track debuggerd API changes."

7 years agodumpstate: Track debuggerd API changes.
Narayan Kamath [Wed, 31 May 2017 09:33:28 +0000 (10:33 +0100)]
dumpstate: Track debuggerd API changes.

dump_backtrace_to_file_timeout now needs an additional argument
that specifies the dump type.

Bug: 36024548
Test: make; manual bug report capture
Change-Id: I6ce3c172dd571e296d9ced9c576b88ea487b2fbb

7 years agoMerge "EGL: Do not look up default namespace when sphal is defined" into oc-dev
Justin Yun [Wed, 31 May 2017 07:09:16 +0000 (07:09 +0000)]
Merge "EGL: Do not look up default namespace when sphal is defined" into oc-dev
am: 74a4049e5a

Change-Id: I34fa6f48116712bb44db77923fcedcd4f93b3781

7 years agoMerge "EGL: Do not look up default namespace when sphal is defined" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 07:01:38 +0000 (07:01 +0000)]
Merge "EGL: Do not look up default namespace when sphal is defined" into oc-dev

7 years agoMerge "Mark libui as vendor_available" into oc-dev
Jayant Chowdhary [Wed, 31 May 2017 04:05:02 +0000 (04:05 +0000)]
Merge "Mark libui as vendor_available" into oc-dev
am: 375a5b563c

Change-Id: I170d012b8b13b914c2d228dfa3255b23cd5d0900

7 years agoMerge "Mark libui as vendor_available" into oc-dev
Jayant Chowdhary [Wed, 31 May 2017 03:59:44 +0000 (03:59 +0000)]
Merge "Mark libui as vendor_available" into oc-dev

7 years agoMerge "add missing lib dependency to libvndksupport" into oc-dev
Jiyong Park [Wed, 31 May 2017 00:36:08 +0000 (00:36 +0000)]
Merge "add missing lib dependency to libvndksupport" into oc-dev
am: 09e388ffeb

Change-Id: I2030be9640c8fc01416208f1e114719b8784c6ad

7 years agoMerge "add missing lib dependency to libvndksupport" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 00:26:11 +0000 (00:26 +0000)]
Merge "add missing lib dependency to libvndksupport" into oc-dev

7 years agoConsistent "low storage" behavior.
Jeff Sharkey [Tue, 30 May 2017 20:38:42 +0000 (14:38 -0600)]
Consistent "low storage" behavior.

When freeing cached data, the caller can now provide a "reserved"
size which we won't clear cached data from.

Bug: 38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Ieb91b3e5345a950d4785fd7915f520f0a68a567a

7 years agoadd missing lib dependency to libvndksupport
Jiyong Park [Sat, 27 May 2017 06:29:41 +0000 (15:29 +0900)]
add missing lib dependency to libvndksupport

libutils is now depending on libvndksupport. So any client that
statically links to libutils needs to link against libvndksuppor as
well.

Bug: 62084107
Test: start an app, run 'adb shell atrace gfx --stream'. atrace from the
graphics driver are visible.

Change-Id: I98917dc92a1b8bde52e69e1923a1c1530a088bd6

7 years agoDisable in-place vdex update
David Sehr [Fri, 26 May 2017 23:32:55 +0000 (16:32 -0700)]
Disable in-place vdex update

Vdex files can be corrupted by dexlayout or by previously dexlayout-ed
files being recompiled if they are used as both input and output.
Disable this feature.

Bug: 38113240
Test: OTA and dexopt
Change-Id: Iee2d9a6c1ba8cddda25290f68f50649d5288d588

7 years agoMerge "Add pids for processes that dlopens implementations" am: 2410cd179d am: 977066464e
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

7 years agoMerge "Add pids for processes that dlopens implementations" am: 2410cd179d
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

7 years agoMerge "Add pids for processes that dlopens implementations"
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

7 years agoMerge "Add pids for processes that dlopens implementations"
Treehugger Robot [Fri, 26 May 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Add pids for processes that dlopens implementations"

7 years agoMerge "Playback activity monitoring: add player types" into oc-dev
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

7 years agoMerge "Playback activity monitoring: add player types" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 20:05:48 +0000 (20:05 +0000)]
Merge "Playback activity monitoring: add player types" into oc-dev

7 years agoAdd pids for processes that dlopens implementations
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

7 years agoMerge "Delete vdex file in delete_odex." am: 99dedeb690 am: f6b79dd073
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

7 years agoMerge "Delete vdex file in delete_odex." am: 99dedeb690
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

7 years agoMerge "Delete vdex file in delete_odex."
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

7 years agoMerge "Delete vdex file in delete_odex."
Nicolas Geoffray [Fri, 26 May 2017 10:21:25 +0000 (10:21 +0000)]
Merge "Delete vdex file in delete_odex."

7 years agoDelete 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

7 years agoEGL: Do not look up default namespace when sphal is defined
Justin Yun [Mon, 22 May 2017 06:13:40 +0000 (15:13 +0900)]
EGL: Do not look up default namespace when sphal is defined

If sphal name space exists, try to load drivers from sphal.
This patch stops loading the driver if it fails to find the driver
from sphal, instead of falling back to the default namespace.

Bug: 38435840
Test: sailfish builds and boots
Change-Id: Ib8ba73f57aa25431c4a2efe7c61a3699237cc3d2
Merged-In: Ib8ba73f57aa25431c4a2efe7c61a3699237cc3d2
(cherry picked from commit b732030e847e74f00ecd37ff15a36b103efd97b9)

7 years agoMerge "Add thread usage output to lshal." am: 4a3e0a9767 am: 9a130151a2
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

7 years agoMerge "Add thread usage output to lshal." am: 4a3e0a9767
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

7 years agoMerge "Add thread usage output to lshal."
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

7 years agoMerge "Add thread usage output to lshal."
Treehugger Robot [Thu, 25 May 2017 22:42:24 +0000 (22:42 +0000)]
Merge "Add thread usage output to lshal."

7 years agoPlayback activity monitoring: add player types
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

7 years agoMerge "Newly create idmap only when it is stale" into oc-dev
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

7 years agoMerge "Newly create idmap only when it is stale" into oc-dev
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

7 years agolibgui: fix BQ buffer allocation error checking
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

7 years agolibgui: fix BQ buffer allocation error checking
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

7 years agoMerge "SF: Call makeCurrent after presenting each display" am: 7bb8779a79 am: 5079756e8e
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

7 years agoMerge "SF: Call makeCurrent after presenting each display" am: 7bb8779a79
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

7 years agoMerge "SF: Call makeCurrent after presenting each display"
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

7 years agoMerge "SF: Call makeCurrent after presenting each display"
Treehugger Robot [Thu, 25 May 2017 00:59:58 +0000 (00:59 +0000)]
Merge "SF: Call makeCurrent after presenting each display"

7 years agoMerge "Delete SurfaceFlinger BYPASS codepath" into oc-dev
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

7 years agoMerge "Delete SurfaceFlinger BYPASS codepath" into oc-dev
TreeHugger Robot [Wed, 24 May 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Delete SurfaceFlinger BYPASS codepath" into oc-dev

7 years agoAdd thread usage output to lshal.
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

7 years agoMerge "libgui: Add test for OOB slot number in dequeue" into oc-dev
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

7 years agoMerge "libgui: Add test for OOB slot number in dequeue" into oc-dev
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

7 years agoSF: Call makeCurrent after presenting each display
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

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error" am: 77bee3b429 am...
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

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error" am: 77bee3b429
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

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error"
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

7 years agoMerge "Fix a anr bug caused by sendFinishedSignal logical error"
Treehugger Robot [Wed, 24 May 2017 16:10:16 +0000 (16:10 +0000)]
Merge "Fix a anr bug caused by sendFinishedSignal logical error"

7 years agoDelete SurfaceFlinger BYPASS codepath
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

7 years agoNewly create idmap only when it is stale
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

7 years agoMerge "Do not set the trace clock in atrace.rc." into oc-dev
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

7 years agoMerge "Do not set the trace clock in atrace.rc." into oc-dev
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

7 years agoMerge "Surface: Use buffer id to synchronize slots" 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

7 years agoMerge "Surface: Use buffer id to synchronize slots" 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

7 years agoDo not set the trace clock in atrace.rc.
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

7 years agoSurface: Use buffer id to synchronize slots
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

7 years agoMerge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
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

7 years agoMerge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 04:09:52 +0000 (04:09 +0000)]
Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev

7 years agoOtapreopt: Add some static_asserts
Andreas Gampe [Mon, 22 May 2017 23:17:00 +0000 (23:17 +0000)]
Otapreopt: Add some static_asserts
am: ef21fd2b6b

Change-Id: I9f72d69a74a945f3c822401e466028d94330fdb3

7 years agoOtapreopt: Add some static_asserts
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

7 years agoFix a anr bug caused by sendFinishedSignal logical error
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

7 years agoMerge "vulkan: Translate usage flags before passing to driver" into oc-dev
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

7 years agoMerge "vulkan: Translate usage flags before passing to driver" into oc-dev
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

7 years agoMerge "Set the atrace clock to the best available value: boot, mono, or global."...
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

7 years agoMerge "Set the atrace clock to the best available value: boot, mono, or global."...
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

7 years agovulkan: Translate usage flags before passing to driver
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

7 years agoMerge "DO NOT MERGE Revert "Logging for catching memory issue in Parcel"" into oc-dev
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

7 years agoMerge "DO NOT MERGE Revert "Logging for catching memory issue in Parcel"" into oc-dev
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

7 years agoMerge "vulkan: update Vulkan headers to 1.0.49" into oc-dev-plus-aosp
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

7 years agovulkan: update Vulkan headers to 1.0.49
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

7 years agoMerge changes from topic 'move-hwc2on1' into oc-dev
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

7 years agoMerge changes from topic 'move-hwc2on1' 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.

7 years agoMerge "Delete secondary dex profiles during reconciliation" into oc-dev
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

7 years agoMerge "Delete secondary dex profiles during reconciliation" into oc-dev
Calin Juravle [Fri, 19 May 2017 00:50:19 +0000 (00:50 +0000)]
Merge "Delete secondary dex profiles during reconciliation" into oc-dev

7 years agoMerge "Fix race condition in displayservice." 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

7 years agoMerge "Fix race condition in displayservice." 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

7 years agoSet the atrace clock to the best available value: boot, mono, or global.
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

7 years agoDelete secondary dex profiles during reconciliation
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

7 years agoSurfaceFlinger: setGeometryAppliesWithResize crop latching fixes.
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

7 years agoDO NOT MERGE Revert "Logging for catching memory issue in Parcel"
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

7 years agosurfaceflinger: clear HWC layers in Layer::onRemoved v2
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

7 years agosurfaceflinger: clear HWC layers in Layer::onRemoved v2
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

7 years agoMerge "Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"" into oc-dev
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

7 years agoMerge "Revert "surfaceflinger: clear HWC layers in Layer::onRemoved"" into oc-dev
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

7 years agoRevert "surfaceflinger: clear HWC layers in Layer::onRemoved"
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

7 years agolibhwc2on1adapter: Move to vendor partition
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

7 years agoRemove stale dependency to libhwc2on1adaptor.so.
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

7 years agoMerge "Support halt the trace when schd-dbg hit deadline" am: f232542c03 am: 9d57a08f8e
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

7 years agoMerge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev
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

7 years agoMerge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev
TreeHugger Robot [Thu, 18 May 2017 04:36:30 +0000 (04:36 +0000)]
Merge "surfaceflinger: clear HWC layers in Layer::onRemoved" into oc-dev