OSDN Git Service
Peng Xu [Wed, 1 Mar 2017 17:58:31 +0000 (17:58 +0000)]
Merge "Define direct sensor report NDK API"
Rob Carr [Wed, 1 Mar 2017 17:49:23 +0000 (17:49 +0000)]
Merge changes from topic 'surfaceview-without-wm'
* changes:
Add detachChildren transaction.
Add deferTransaction variant taking GraphicBufferProducer.
Yifan Hong [Wed, 1 Mar 2017 06:15:06 +0000 (06:15 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest." am:
73d5aef51e am:
86c2f1cb0c
am:
4ccb9b6fb2
Change-Id: I7b34fe8c1015c48818fa293e18522b9644ffb568
Yifan Hong [Wed, 1 Mar 2017 06:12:34 +0000 (06:12 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest." am:
73d5aef51e
am:
86c2f1cb0c
Change-Id: I37a103eed5dd0d383faec6fffe552d0020d69b41
Yifan Hong [Wed, 1 Mar 2017 06:10:04 +0000 (06:10 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest."
am:
73d5aef51e
Change-Id: Ibd6873caa3d7c9bb9949b1d21666430a0cd7890a
Treehugger Robot [Wed, 1 Mar 2017 06:05:13 +0000 (06:05 +0000)]
Merge "lshal --vintf to create a skeleton hal manifest."
Yifan Hong [Wed, 1 Mar 2017 03:38:24 +0000 (19:38 -0800)]
lshal --vintf to create a skeleton hal manifest.
Run it as follows:
lshal --init-vintf=/data/a.xml
lshal --init-vintf > /data/a.xml
Test: lshal --init-vintf with and without path argument
Bug:
35852743
Change-Id: Ief9385fc2764a487d1a70644699e01133bdc8a8e
Peng Xu [Thu, 16 Feb 2017 07:31:22 +0000 (23:31 -0800)]
Define direct sensor report NDK API
Added following NDK API and corresponding enums.
Sensor direct report
* ASensorManager_configureDirectReport
* ASensorManager_createSharedMemoryDirectChannel
* ASensorManager_createHardwareBufferDirectChannel
* ASensorManager_destroyDirectChannel
* ASensor_getHighestDirectReportRateLevel
* ASensor_isDirectChannelTypeSupported
Test: cts-tradefed run cts --module CtsSensorTestCases \
--test android.hardware.cts.SensorNativeTest
Bug:
30985702
Change-Id: Id9425734d5a9db8030b4dc1d1fcef9e37fb7a4cc
Steven Moreland [Wed, 1 Mar 2017 04:00:56 +0000 (04:00 +0000)]
Merge "lshal: separate timeout for hwservicemanager list" am:
180bb92608 am:
b67f970cfe
am:
cf148e1e08
Change-Id: Ic5e76ba7bde5966075fc657dc7ed21b97fd00299
Steven Moreland [Wed, 1 Mar 2017 03:58:24 +0000 (03:58 +0000)]
Merge "lshal: separate timeout for hwservicemanager list" am:
180bb92608
am:
b67f970cfe
Change-Id: I6f240558cf45aa840abea2aed5af5ec559f7b209
Steven Moreland [Wed, 1 Mar 2017 03:55:56 +0000 (03:55 +0000)]
Merge "lshal: separate timeout for hwservicemanager list"
am:
180bb92608
Change-Id: I4ca38f7831505366201ca7a480dae358ecfc39ba
Treehugger Robot [Wed, 1 Mar 2017 03:50:11 +0000 (03:50 +0000)]
Merge "lshal: separate timeout for hwservicemanager list"
Rob Carr [Wed, 1 Mar 2017 02:43:47 +0000 (02:43 +0000)]
Merge "SurfaceControl: Correct setMatrix parameter naming."
Rob Carr [Wed, 1 Mar 2017 02:41:53 +0000 (02:41 +0000)]
Merge "SurfaceFlinger: Trivial Transaction_test refactoring."
Steven Moreland [Wed, 1 Mar 2017 01:52:58 +0000 (17:52 -0800)]
lshal: separate timeout for hwservicemanager list
Bug:
35752836
Test: lshal works
Change-Id: I201da49e375d2d5e9ea67dfdf34ef2d5a8b537b0
Mathias Agopian [Wed, 1 Mar 2017 01:15:50 +0000 (01:15 +0000)]
Merge "clean-up EGL includes"
Mathias Agopian [Wed, 1 Mar 2017 01:15:29 +0000 (01:15 +0000)]
Merge "Remove unneeded references to IMemory"
Mathias Agopian [Tue, 28 Feb 2017 23:00:49 +0000 (15:00 -0800)]
clean-up EGL includes
Test: compile and run
Bug: cleanup
Change-Id: Icb6c70c80d455446d7163a20d51c41d9b6e0b578
Mathias Agopian [Tue, 28 Feb 2017 23:20:31 +0000 (15:20 -0800)]
Remove unneeded references to IMemory
Test: compiled & run
Bug: cleanup
Change-Id: Ifef6695275f244a420df574b3bc49adb99c93fbf
Elliott Hughes [Tue, 28 Feb 2017 18:14:22 +0000 (10:14 -0800)]
Move dumpstate to calling getprop.
There's no obvious reason for reinventing the wheel like this (given that
dumpstate already spends most of its time calling out to other utilities),
and I keep having to come and fix this code.
(This time the problem being that there's no longer a limit on system
property names.)
Bug: http://b/
33926793
Test: ran dumpstate
Change-Id: I08281680df5aabfdb39228abf8c2aab089cc8b9e
Steve Pfetsch [Tue, 28 Feb 2017 10:35:54 +0000 (10:35 +0000)]
Merge "Extend hack to new driver version"
Martijn Coenen [Tue, 28 Feb 2017 09:16:19 +0000 (09:16 +0000)]
Merge "Truncate trace output files." am:
09ab378326 am:
d62093dae4
am:
f114e0f7fe
Change-Id: Iae062a81f9da04a6dd47eb625df14a6b2c66e33c
Martijn Coenen [Tue, 28 Feb 2017 09:14:19 +0000 (09:14 +0000)]
Merge "Truncate trace output files." am:
09ab378326
am:
d62093dae4
Change-Id: I5d4cf03c1ecc81851a71d23f13adb02838d14bdf
Martijn Coenen [Tue, 28 Feb 2017 09:11:48 +0000 (09:11 +0000)]
Merge "Truncate trace output files."
am:
09ab378326
Change-Id: Iec36d0074c6e5fd90c3f9b39d07feef89ddb4b31
Martijn Coenen [Tue, 28 Feb 2017 09:08:33 +0000 (09:08 +0000)]
Merge "Truncate trace output files."
TreeHugger Robot [Tue, 28 Feb 2017 04:02:28 +0000 (04:02 +0000)]
Merge "Move Gralloc1Mapper test to libui/tests"
Jaesoo Lee [Tue, 28 Feb 2017 03:00:48 +0000 (03:00 +0000)]
Merge "configstore: import configstore-utils as a header library"
TreeHugger Robot [Tue, 28 Feb 2017 02:29:38 +0000 (02:29 +0000)]
Merge "Add private consumer and producer flags to AHardwareBuffer."
TreeHugger Robot [Tue, 28 Feb 2017 01:17:15 +0000 (01:17 +0000)]
Merge "pose_service cleanup"
TreeHugger Robot [Tue, 28 Feb 2017 00:19:19 +0000 (00:19 +0000)]
Merge "Remove unused dependency on libandroid in libeds"
Stephen Kiazyk [Mon, 27 Feb 2017 19:33:44 +0000 (11:33 -0800)]
Remove unused dependency on libandroid in libeds
This dependency is unused.
Bug: None
Test: Full recompile of libeds, no compile errors or missing
dependencies.
Change-Id: Iced2bb8c420630568b8609923e47e3b6a5ceb0c7
Craig Donner [Sat, 25 Feb 2017 00:20:20 +0000 (16:20 -0800)]
Move Gralloc1Mapper test to libui/tests
Bug:
34939453
Test: manual
Change-Id: Ib1b442881e375cb2e4acdedaa324cd91dc71739e
Craig Donner [Sat, 25 Feb 2017 00:02:08 +0000 (16:02 -0800)]
Add private consumer and producer flags to AHardwareBuffer.
This also generalizes and simplifies the flag conversion,
making it more bulletproof in the future. To add more flags,
just add new entries into the mapping arrays.
Bug:
34050596
Bug:
35765937
Test: cts-tradefed run cts -m CtsNativeHardwareTestCases
Also added new cc_test libs/nativewindow/tests to test gralloc flag conversion
Change-Id: Ib96b277e837f2ab8c332f14df60e88580e3d868d
Jeff Sharkey [Mon, 27 Feb 2017 21:22:11 +0000 (21:22 +0000)]
Merge "Revert "Refactor SurfaceFlinger::rebuildLayerStacks""
Jeff Sharkey [Mon, 27 Feb 2017 21:15:18 +0000 (14:15 -0700)]
Revert "Refactor SurfaceFlinger::rebuildLayerStacks"
This reverts commit
3beb7117d247c64c5d9d3a7e6df7eecdd9523711.
Bug:
35801498
Change-Id: Ife431b19f3aef21cbe07863ca2964b2a40677dbd
Peng Xu [Mon, 27 Feb 2017 20:58:19 +0000 (20:58 +0000)]
Merge "Define shared memory NDK API"
TreeHugger Robot [Mon, 27 Feb 2017 18:45:25 +0000 (18:45 +0000)]
Merge "Adjust traces to diagnostic of HWC2on1Adapter"
TreeHugger Robot [Mon, 27 Feb 2017 18:38:49 +0000 (18:38 +0000)]
Merge "Fix error code check in releaseBuffer"
TreeHugger Robot [Mon, 27 Feb 2017 18:34:31 +0000 (18:34 +0000)]
Merge "Refactor SurfaceFlinger::rebuildLayerStacks"
Robert Carr [Mon, 13 Feb 2017 19:32:32 +0000 (11:32 -0800)]
Add detachChildren transaction.
Add SurfaceControl#detachChildren for use by the WindowManager.
This method is used in cases where the WM would previously preserve
windows the client tried to destroy. For example, when becoming invisible
(in the activity lifecycle sense, not in the SurfaceFlinger sense)
an app will destroy its child surfaces. Previously the WM would keep child
windows alive until the animation finishes to prevent glitches. The new
scheme for this is the WM will detach the children at this point,
at which point the parent layer becomes the owner of the children and the WM
can control the lifecycle as it wishes. I also included a test for reparentChildren
as I realized I had forgotten that.
Test: New test in Transaction_test.cpp
Change-Id: I79c22b2ccccceb9bdcc37b70c491bdf33dcf83d2
Robert Carr [Wed, 11 Jan 2017 00:42:54 +0000 (16:42 -0800)]
Add deferTransaction variant taking GraphicBufferProducer.
For SurfaceView using child layers, the client framework
will not have access to the Handle* for the parent surface,
but still needs a way to defer transactions to it's frames.
Test: Tested with corresponding SurfaceView modifications and existing tests.
Change-Id: I6f01c360e85a95ff0ab08db406741221152e5d5c
Jaesoo Lee [Mon, 27 Feb 2017 04:46:40 +0000 (13:46 +0900)]
configstore: import configstore-utils as a header library
The android.hardware.configstore-utils library is no more built as a
static library but as a header only library.
This change applies this in building SurfaceFlinger.
Design doc: go/design-confighal
Bug:
35397068
Test: build, run on sailfish
Change-Id: I7d7abf3c87861bf7daa293af4e9d6841f854711e
Chris Forbes [Tue, 21 Feb 2017 23:49:18 +0000 (12:49 +1300)]
vulkan: Advertise present modes based on actual capabilities
Now that all the infrastructure is in place, we can advertise
the correct set of present modes. These are:
- mailbox, always
- fifo, always (required by spec)
- shared demand refresh, if the driver can do it
- shared continuous refresh, if the driver can do it
V2: Switch from std::vector to android::Vector (thanks Ian)
V3: Single flag
Test: build
Change-Id: I4df43dd0b0067ef7ae7d5ac0535eb9f8f311dee3
Chris Forbes [Tue, 21 Feb 2017 23:36:02 +0000 (12:36 +1300)]
vulkan: Conditionally enumerate KHR_shared_presentable_image
This requires:
- GPDP2 present and enabled
- ANDROID_native_buffer V7 implemented
- Driver supporting at least one shared presentation mode
This unpicks the weird case of the hal having to expose the
extension while the api surface was all implemented in the
loader.
V3: Single flag
Change-Id: I336af1a9d2549b74631c7a93a2c3e0e1469a9622
Test: build
Chris Forbes [Mon, 20 Feb 2017 04:12:53 +0000 (17:12 +1300)]
vulkan: Split known/intercepted extension lists
We need to do some work in the loader based on whether gpdp2 is present
and enabled, and we'd like to /not/ filter gpdp2 out of extension lists.
However, we don't need or want to generate full forwarding stubs.
All extensions in driver.KnownExtensions will have enums and matching
infrastructure generated, but only extensions in
driver.InterceptedExtensions will have g_hook_procs populated for their
entrypoints.
V3: Define driver.KnownExtensions in terms of
driver.InterceptedExtensions as always a superset.
Change-Id: If0fdabad99fa4637d7c6fc1e9a7e5e3908b53aca
Test: build
Chris Forbes [Wed, 15 Feb 2017 06:38:50 +0000 (19:38 +1300)]
vulkan: Rev 7 of ANDROID_native_buffer
Adds a new structure to be chained to GetPhysicalDeviceProperties2KHR in
order to determine whether the loader should be exposing
KHR_shared_presentable_image (and if so, which present modes can be
supported).
V3: Replace separate enables with combined 'sharedImage'
Test: build
Change-Id: I32a8b1f09f413aa4ea2a37ea0d50914a20967865
Jesse Hall [Sun, 26 Feb 2017 06:12:23 +0000 (22:12 -0800)]
resolve merge conflicts of
641f2cf42 to master
Test: [sailfish] make ; mmm frameworks/native/vulkan
Change-Id: I8555fdfbe6375e6266d07b66b5a8085d37e1ffde
Jesse Hall [Sun, 26 Feb 2017 06:01:53 +0000 (06:01 +0000)]
Merge changes I6437dc95,I77261381 am:
d9f506fd47
am:
1a04c987e1
Change-Id: Ie2b1a07adc7dda6a1bbdd9fda09d9956a02ba0d0
Jesse Hall [Sun, 26 Feb 2017 05:58:55 +0000 (05:58 +0000)]
Merge changes I6437dc95,I77261381
am:
d9f506fd47
Change-Id: Ib3af51d0e71015bbc60f39bf209517b749bd80c0
Jesse Hall [Sun, 26 Feb 2017 05:54:04 +0000 (05:54 +0000)]
Merge changes I6437dc95,I77261381
* changes:
vulkan: update Vulkan headers to 1.0.38
vulkan: Update Vulkan headers to 1.0.22
Jesse Hall [Fri, 24 Feb 2017 23:13:45 +0000 (15:13 -0800)]
vulkan: update Vulkan headers to 1.0.38
Test: make ; mmm frameworks/native/vulkan
Change-Id: I6437dc951bd694cb848f75d0de7eb7dbe8a4d1fe
Jesse Hall [Tue, 26 Jul 2016 22:20:40 +0000 (15:20 -0700)]
vulkan: Update Vulkan headers to 1.0.22
Meaningful changes to platform code:
* VKAPI_ATTR is now defined properly when building for 32-bit ARMv8a.
* The pData parameter to vkCmdUpdateBuffer changed from uint32_t* to
void*. Alignment is still required to be four bytes (by spec), and
the size parameter was always supposed to be bytes, not words.
Bug:
29460769
Test: make ; mmm frameworks/native/vulkan
Change-Id: I77261381e5702a3b2bc1d1ea4c0606151547be47
(cherry picked from commit
56d386a7a46c8ac36df8820c3ccf3da048ef1970)
TreeHugger Robot [Sat, 25 Feb 2017 02:03:01 +0000 (02:03 +0000)]
Merge "dumpstate: run lshal as root."
Fabien Sanglard [Sat, 25 Feb 2017 01:33:52 +0000 (17:33 -0800)]
Refactor SurfaceFlinger::rebuildLayerStacks
Reduce indentation with early return
Change-Id: Ic3a16bf45a0c1792b0fcbd5d9d1cd9f1e239ae32
Peng Xu [Fri, 24 Feb 2017 09:30:16 +0000 (01:30 -0800)]
Define shared memory NDK API
Added shared memory NDK API definition, including the following
functions:
* int ASharedMemory_create(const char *name, size_t size);
* size_t ASharedMemory_getSize(int fd);
* int ASharedMemory_setProt(int fd, int prot);
Bug:
5995644
Bug:
30985702
Test: compiles
Change-Id: I4da6741728b7963f0f1d356dd3d9429e706c88a4
Mathias Agopian [Fri, 24 Feb 2017 22:32:05 +0000 (14:32 -0800)]
remove warnings
Test: compiled
Bug: cleanup
Change-Id: Ic7a189b4e2947b9552b00e5fa3c245d2505ab2a2
Mathias Agopian [Fri, 24 Feb 2017 22:31:31 +0000 (14:31 -0800)]
Remove dead-code
“format” is reset in all code-paths below.
Test: compiled
Bug: cleanup
Change-Id: I2503fc6ca8726cf39f3a9c46264d504623a7290b
TreeHugger Robot [Fri, 24 Feb 2017 23:30:16 +0000 (23:30 +0000)]
Merge "docs: Fix links in native multinetwork API documentation. Test: Verified by manual build."
Mathias Agopian [Fri, 24 Feb 2017 23:25:50 +0000 (23:25 +0000)]
Merge changes Ie7574cfe,Icc302d2b
* changes:
remove unneeded forward declaration
fix typo (minor)
Yifan Hong [Fri, 24 Feb 2017 23:14:53 +0000 (23:14 +0000)]
Merge "dumpstate HAL uses "default" service name"
Steven Moreland [Fri, 24 Feb 2017 22:42:19 +0000 (14:42 -0800)]
dumpstate: run lshal as root.
Running lshal as root gives additional information about which processes
have registered with which hals.
Test: adb bugreport and checked for appropriate output in lshal
Fixes:
35741078
Change-Id: I75606909ebccf2df3dc164d72edd2456facb3ad3
Fabien Sanglard [Thu, 23 Feb 2017 19:17:11 +0000 (11:17 -0800)]
Adjust traces to diagnostic of HWC2on1Adapter
Change-Id: I0110fac372791bec657521522de3e08907f465f7
Fabien Sanglard [Thu, 23 Feb 2017 23:02:34 +0000 (15:02 -0800)]
Fix error code check in releaseBuffer
BufferQueueConsumer can occasionaly return STALE_BUFFER_SLOT which
does not indicate an error but that there is no more to be done.
SurfaceFlingerConsumer should report and error only with a status
code inferior to zero.
Test: AUPT
Change-Id: Ie0624358301e1e3b090adf35facd6eac79c214db
Quddus Chong [Fri, 24 Feb 2017 21:49:58 +0000 (13:49 -0800)]
docs: Fix links in native multinetwork API documentation.
Test: Verified by manual build.
Change-Id: I29e382fc6b2e3241cb3f42e153d8997b8b837f3a
Mathias Agopian [Fri, 24 Feb 2017 21:31:54 +0000 (13:31 -0800)]
remove unneeded forward declaration
this is already taken care of by vk_platform.h
Test: compiled & booted
Bug:
35164655
Change-Id: Ie7574cfe985fed86922c923ca3b2225e017c2d5a
Mathias Agopian [Fri, 24 Feb 2017 21:33:19 +0000 (13:33 -0800)]
fix typo (minor)
Test: compiled & booted
Bug:
35164655
Change-Id: Icc302d2b8301d877f76a3b652a42abcaeb2c99c7
TreeHugger Robot [Fri, 24 Feb 2017 19:46:05 +0000 (19:46 +0000)]
Merge "docs: Add brief and detailed descriptions for native trace API. Test: Verified via technical review and manual build."
Yifan Hong [Fri, 24 Feb 2017 18:21:11 +0000 (18:21 +0000)]
Merge "gralloc HAL uses "default" service name"
Quddus Chong [Thu, 23 Feb 2017 22:51:09 +0000 (14:51 -0800)]
docs: Add brief and detailed descriptions for native trace API.
Test: Verified via technical review and manual build.
Change-Id: Iccd0a78ea4e0f5b9b7d6397bef99084876759058
Mathias Agopian [Fri, 10 Feb 2017 02:48:34 +0000 (18:48 -0800)]
split libandroid.so
- ANativeWindow (native_window.h) and
AHardwareBuffer (hardware_buffer.h) now live
in libnativewindow.so, which is a vodka library.
- libandroid.so still provide those symbols
via a static library version (libnativewindow.a)
- removed libbinder dependency as well
Test: compiled & booted
Bug:
35164655
Change-Id: Ib4bc8e8fc9ec1891bcbee63c28fd0131d82edf29
Chong Zhang [Thu, 23 Feb 2017 22:36:18 +0000 (22:36 +0000)]
Merge "MediaCas: add plugin APIs"
TreeHugger Robot [Thu, 23 Feb 2017 22:27:37 +0000 (22:27 +0000)]
Merge "Create VR HWComposer without locks held"
Mark Urbanus [Thu, 23 Feb 2017 19:16:04 +0000 (11:16 -0800)]
Create VR HWComposer without locks held
Problem:
Surfaceflinger is occassionally deadlocking when switching to VR Mode.
Root-cause:
During the creation of the VR HWComposer through hwbinder,
hwservicemanager notifies surfaceflinger the service is available through a
binder callback. Because Surfaceflinger holds the state-lock during the
HWComposer creation, its possible all of SurfaceFlinger's binder threads are
handling other transactions waiting for the state-lock to be released.
This prevents the hwservicemanager callback ever to be handled resulting in
a deadlock.
Solution:
Don't hold the state-lock when instantiating the VR HWComposer.
Test: Validated deadlocks no longer occur when switching to VR mode.
Bug:
35680107
Change-Id: I932c81fce293a8b57983f4242432b87522ce964c
TreeHugger Robot [Thu, 23 Feb 2017 19:35:45 +0000 (19:35 +0000)]
Merge "Fix crash in sensord that can occur during system instability"
Chris Phoenix [Wed, 25 Jan 2017 07:01:13 +0000 (23:01 -0800)]
dumpstate HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.
Test: builds
Bug:
33844934
Change-Id: I87d3f4f00965e8cccb18b9bd158bd8d393ea8d5a
Yifan Hong [Thu, 23 Feb 2017 19:22:53 +0000 (19:22 +0000)]
Merge "hwcomposer HAL uses "default" service name"
John Bates [Wed, 22 Feb 2017 23:47:50 +0000 (15:47 -0800)]
Fix crash in sensord that can occur during system instability
Bug:
35624417
Test: Manually ran CubeSea and closed/openned it several times
Change-Id: I57810531d0ceccfa02afcf0af265587ca88e05be
Quddus Chong [Thu, 23 Feb 2017 16:55:42 +0000 (16:55 +0000)]
Merge "docs: Configure Doxygen to ignore conditional compilation statements. Test: Verified by manual build."
TreeHugger Robot [Thu, 23 Feb 2017 03:09:39 +0000 (03:09 +0000)]
Merge "Expose display manager client event fd"
TreeHugger Robot [Thu, 23 Feb 2017 03:02:05 +0000 (03:02 +0000)]
Merge "VR: Replace sw sync fences with egl sync fences"
Chris Phoenix [Tue, 24 Jan 2017 22:08:33 +0000 (14:08 -0800)]
hwcomposer HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.
Test: builds
Bug:
33844934
Change-Id: I6befd081add61e355bc25dd0c630ac07ea0103c4
Hendrik Wagenaar [Thu, 23 Feb 2017 00:38:41 +0000 (16:38 -0800)]
pose_service cleanup
* Some code changed, but the helper functions remain
Bug: None
Test: No test required - deleted code
Change-Id: I53181dfe847aa37dca302a3a318d3e9e18b09158
Quddus Chong [Wed, 22 Feb 2017 23:19:35 +0000 (15:19 -0800)]
docs: Configure Doxygen to ignore conditional compilation statements.
Test: Verified by manual build.
Change-Id: I96256700597c4dc498b36f52037ded2ea5a25e0d
Kalle Raita [Wed, 22 Feb 2017 21:05:45 +0000 (13:05 -0800)]
Extend hack to new driver version
Change I5a8bb16f0f9563e32314cff2a2a7a45760cfc356 introduced a hack
to work around driver/loader version mismatch. This change adds a new
driver version to use the same path.
Test: dEQP-VK.wsi.android.swapchain.*
Change-Id: I6db889a181710239ad9b286919cfc834271c9721
Stephen Kiazyk [Tue, 21 Feb 2017 23:31:15 +0000 (15:31 -0800)]
Expose display manager client event fd
This will allow the display manager client to use epoll to wait and
respond to changes in the current set of VR display surfaces.
Bug: None
Test: Compiled and ran with simple standalone binary application.
Change-Id: I7680f5a56348abfb686e78d13e0e737466735ac6
Jeff Sharkey [Wed, 22 Feb 2017 20:25:13 +0000 (20:25 +0000)]
Merge "Logic for atmoic/tombstone behavior; split mode."
Daniel Nicoara [Wed, 22 Feb 2017 17:22:41 +0000 (12:22 -0500)]
VR: Replace sw sync fences with egl sync fences
HWComposer::presentDisplay() synchronously calls into the VR WM
presentation code to queue the new frame. If VR WM is showing (drawing)
it will return an EGL fence that will be used to signal when the last
showing frame is no longer used in VR WM. Otherwise an invalid FD (-1)
is returned symbolizing that the last frame isn't in use anymore and the
caller can re-use those buffers immediately.
Bug: b/
35096352
Test: Verified SurfaceFlinger output shows correctly in vr_wm
Change-Id: I2b7c2c767d4aa85370dd6519113cb9a2269c7477
TreeHugger Robot [Wed, 22 Feb 2017 19:24:45 +0000 (19:24 +0000)]
Merge "Ensure display metrics on display service creation"
Jeff Sharkey [Wed, 22 Feb 2017 01:30:28 +0000 (18:30 -0700)]
Logic for atmoic/tombstone behavior; split mode.
Flesh out logic for cache directories that request new atomic and/or
tombstone clearing behaviors. Atomic directories are considered for
deletion as a single all-or-nothing unit, and tombstone directories
truncate any removed files instead of unlinking them.
Since these behaviors can be mixed together, add local tests that
quickly verify several different permutations.
Reduce memory footprint of CacheItem objects by only storing name
and pointer to parent (instead of full path). Fix ordering bug by
switching to std::stable_sort.
Add "V2_DEFY_QUOTA" flag so we can split clearing into two distinct
phases: clearing data for apps above their quotas, and then pushing
deeper by clearing data for apps below their quotas.
Test: adb shell /data/nativetest64/installd_cache_test/installd_cache_test
Bug:
34692014,
33811826
Change-Id: I156897de1d1d1c371b2b837128b2e286bf33d40d
Yifan Hong [Wed, 22 Feb 2017 18:43:43 +0000 (18:43 +0000)]
Merge "lshal: Fix timeout causes unexpected exits." am:
057e74631b am:
fdf61aa557
am:
91a4bd9cd2
Change-Id: I4663a64806ddb285e8bf5e9235759fee49bc8a93
Yifan Hong [Wed, 22 Feb 2017 18:41:44 +0000 (18:41 +0000)]
Merge "lshal: Fix timeout causes unexpected exits." am:
057e74631b
am:
fdf61aa557
Change-Id: Ie3f025b610fd8b523b4f03c2c9b5d62b7966f309
Yifan Hong [Wed, 22 Feb 2017 18:40:04 +0000 (18:40 +0000)]
Merge "lshal: Fix timeout causes unexpected exits."
am:
057e74631b
Change-Id: Iadfbc11f8bbfc45759f2214d0811922cbb173758
Yifan Hong [Wed, 22 Feb 2017 18:28:23 +0000 (18:28 +0000)]
Merge "lshal: Fix timeout causes unexpected exits."
Stephen Kiazyk [Wed, 22 Feb 2017 01:09:22 +0000 (17:09 -0800)]
Ensure display metrics on display service creation
This fixes a potential race condition where a VR app could request the
display metrics from the VR display service before it actually queries
them from the HWC.
Bug: None
Test: Compiled and ran Vr app.
Change-Id: Ie95b7f5a8ef2e286c7b2994ca94fd87214567e24
Martijn Coenen [Wed, 22 Feb 2017 08:25:31 +0000 (09:25 +0100)]
Truncate trace output files.
To avoid creating trace files with garbage at the end.
Bug:
35588070
Test: atrace runs
Change-Id: I26ef4c652ca2e2dd8ff9d11d4f380b44791cb960
TreeHugger Robot [Wed, 22 Feb 2017 07:39:15 +0000 (07:39 +0000)]
Merge "Add missing GLES 3.x metadata"
Robert Carr [Wed, 22 Feb 2017 03:48:26 +0000 (19:48 -0800)]
SurfaceControl: Correct setMatrix parameter naming.
The first parameter dsdx controls the X scaling. The last parameter
is called dtdy but controls the Y scaling. Clearly this was meant to be
named dsdy. You can verify this with a quick look at Transaction_test.
Test: Tried various stuff, phone still works.
Change-Id: Ie9e898443350ffdcf227888a8d85efdbe1b6b033
Robert Carr [Wed, 22 Feb 2017 03:41:24 +0000 (19:41 -0800)]
SurfaceFlinger: Trivial Transaction_test refactoring.
Make consistent use of the assertBG/FG color helpers
introduced in a past CL.
Test: Existing test passes.
Change-Id: Ic793c195e9ff8a99a3b6fbcfc9995b522c252c9a
TreeHugger Robot [Wed, 22 Feb 2017 00:40:14 +0000 (00:40 +0000)]
Merge "cleanup libui’s includes"
Yifan Hong [Tue, 21 Feb 2017 22:59:00 +0000 (14:59 -0800)]
lshal: Fix timeout causes unexpected exits.
with thread::detach the background thread keeps running even after
the thread object is destroyed; the background thread will access
caller's stack memory, causing segfault. Change it to a thread join
to avoid the issue. To avoid waiting too long on the child thread,
send a SIGINT if timeout (child thread's signal handler will then
call pthread_exit() to terminate the thread).
Since we are using pthread_* functions, change usage of std::thread
to pthread_t for consistency.
Test: lshal
Test: run lshal with IPC_CALL_TIMEOUT set to zero will no longer
cause SIGSEGV and SIGABRT (test 10 times)
Bug:
35623669
Change-Id: I4eef8ffd8ff399793648e861ca4c1a2bdcc7ec50