OSDN Git Service
Elliott Hughes [Wed, 4 May 2016 22:31:13 +0000 (15:31 -0700)]
resolve merge conflicts of
7a52b75 to nyc-dev-plus-aosp
Change-Id: Ic895408a1ecd4ec0d15ae06ec81029e79b67bbd7
Elliott Hughes [Wed, 4 May 2016 22:16:41 +0000 (22:16 +0000)]
Merge "Switch to more conventional ps arguments in dumpstate."
am:
90c04fe679
* commit '
90c04fe6791b619be58d13d785a1fbe8f35a45ab':
Switch to more conventional ps arguments in dumpstate.
Change-Id: I181c915cb4604bcaef1e613784cd2c1dd1427085
Elliott Hughes [Wed, 4 May 2016 22:13:14 +0000 (22:13 +0000)]
Merge "Switch to more conventional ps arguments in dumpstate."
Elliott Hughes [Wed, 4 May 2016 21:03:54 +0000 (14:03 -0700)]
Switch to more conventional ps arguments in dumpstate.
I'll come back and remove the "toybox" once I've switched the symlink
from toolbox to toybox...
Change-Id: I00f848ab4dade8650726b054429a2926d3d72018
Jesse Hall [Wed, 4 May 2016 18:43:31 +0000 (11:43 -0700)]
resolve merge conflicts of
0b546c4 to nyc-dev-plus-aosp
Change-Id: I76408f38afc40816ae4cc7ef82d1250225d18032
Jesse Hall [Wed, 4 May 2016 17:43:51 +0000 (17:43 +0000)]
Merge "GLConsumer: add build-time disable of gpu protected content" into nyc-dev
Jesse Hall [Wed, 4 May 2016 04:12:39 +0000 (21:12 -0700)]
GLConsumer: add build-time disable of gpu protected content
Some drivers incorrectly claim support for EGL_EXT_protected_content.
Until we've been able to verify that devices which claim support
actually implement it properly, require that GPU access to protected
content be manually enabled per-device.
Bug:
28545166
Change-Id: Ic10e47a99c38737ce1c39439fe9347d628aec491
Pablo Ceballos [Tue, 3 May 2016 19:04:51 +0000 (19:04 +0000)]
Merge "EGL: Disconnect native window in eglDestroySurface" into nyc-dev
am:
1ae52ea860
* commit '
1ae52ea860d9b29dc79f44e117e2c7e971162737':
EGL: Disconnect native window in eglDestroySurface
Change-Id: I660a6ef241ef9d9c5a3d8a9ba7d17cd4086b7596
Pablo Ceballos [Tue, 3 May 2016 18:57:05 +0000 (18:57 +0000)]
Merge "EGL: Disconnect native window in eglDestroySurface" into nyc-dev
Pablo Ceballos [Mon, 2 May 2016 18:24:13 +0000 (11:24 -0700)]
EGL: Disconnect native window in eglDestroySurface
Bug
27455025
Change-Id: I7549a3acb724e749925a8249feb180088aec7f3c
Narayan Kamath [Tue, 3 May 2016 10:51:03 +0000 (10:51 +0000)]
Merge "installd: remove spammy warning for non-existent profile dirs." into nyc-dev
am:
5dda72b2a1
* commit '
5dda72b2a14c7d81756ec019d0f8daac228dca45':
installd: remove spammy warning for non-existent profile dirs.
Change-Id: I5cbddc96c9140197dce48361a9a9a855f704c8a9
TreeHugger Robot [Tue, 3 May 2016 10:45:18 +0000 (10:45 +0000)]
Merge "installd: remove spammy warning for non-existent profile dirs." into nyc-dev
Narayan Kamath [Mon, 2 May 2016 08:47:49 +0000 (09:47 +0100)]
installd: remove spammy warning for non-existent profile dirs.
Also gets rid of a lstat call which seems unnecessary. We can
directly open the directory and fail if the open fails.
bug:
28510519
Change-Id: Iaf2b7e69d51e2670e62cbe2807874c9b0dd471e5
Peng Xu [Mon, 2 May 2016 21:59:12 +0000 (21:59 +0000)]
Merge "[sensorservice] Fix on-change sensor send latest value on enable" into nyc-dev
am:
f6fc321644
* commit '
f6fc3216442b76d591883f38ea462fd3111e07aa':
[sensorservice] Fix on-change sensor send latest value on enable
Change-Id: Ia8c4d174dd6729f92fed98b389b7cb8ececf3abd
Trevor Bunker [Mon, 2 May 2016 21:38:11 +0000 (21:38 +0000)]
Merge "[sensorservice] Fix on-change sensor send latest value on enable" into nyc-dev
Peng Xu [Mon, 2 May 2016 21:15:50 +0000 (14:15 -0700)]
[sensorservice] Fix on-change sensor send latest value on enable
This CL correct the behavior of sensorservice so that the latest
value of on-change sensor is send to client when enabling sensor.
The errornous behavior before is that sensorservice send the oldest
value in local cache.
Bug:
28480791
Change-Id: I7e0b8e52fa0be62ba95910789cff1fe0d4fbb03f
Chih-hung Hsieh [Mon, 2 May 2016 17:29:48 +0000 (17:29 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
8a414ededd
am:
c2d0d24b62
* commit '
c2d0d24b62ca16624da976b59fd6225f4939180d':
Fix google-explicit-constructor warnings.
Change-Id: Ie3e0021c634faaafaeec495de3441225b70eb9d6
Chih-Hung Hsieh [Mon, 2 May 2016 17:25:27 +0000 (17:25 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
8a414ededd
* commit '
8a414ededd8b48a07de5faac03cc473ce5a42735':
Fix google-explicit-constructor warnings.
Change-Id: I7326206fbc97d0e80c5ca8be62fa39dc174293e1
Chih-hung Hsieh [Mon, 2 May 2016 17:14:48 +0000 (17:14 +0000)]
Merge "Fix google-explicit-constructor warnings."
Dan Stoza [Mon, 2 May 2016 16:55:52 +0000 (16:55 +0000)]
Merge "SF: Clear local sync points on hide and destroy" into nyc-dev
am:
54ebc56413
* commit '
54ebc564132c4c734d5917baa5c91a36c6f915ef':
SF: Clear local sync points on hide and destroy
Change-Id: Ife257492cfa0c34e67fae6568a3b9aee2570c8f8
Dan Stoza [Mon, 2 May 2016 16:39:41 +0000 (16:39 +0000)]
Merge "SF: Clear local sync points on hide and destroy" into nyc-dev
sergeyv [Sat, 30 Apr 2016 00:07:29 +0000 (00:07 +0000)]
Merge "Atrace: store app list in multiple sysprops" into nyc-dev
am:
9a8ddb6e71
* commit '
9a8ddb6e71605d5304226234ed01cedccf54e849':
Atrace: store app list in multiple sysprops
Change-Id: I62335b70ef0dfd27bdcb6aa9eeaba00f0208fdfb
Sergei Vasilinetc [Sat, 30 Apr 2016 00:02:23 +0000 (00:02 +0000)]
Merge "Atrace: store app list in multiple sysprops" into nyc-dev
Chih-Hung Hsieh [Fri, 29 Apr 2016 23:23:55 +0000 (16:23 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I83bb2282249ecd4e39347b90f5fb53788e1fff5b
Chia-I Wu [Fri, 29 Apr 2016 22:24:46 +0000 (22:24 +0000)]
Merge changes I6e89439a,I9d9aafe6,I38340654,Ie50a9d37,Icd98abf5, ... into nyc-dev
am:
63fd900686
* commit '
63fd90068696bda0c59bd36bd543dc6eafc41e51':
vulkan: deprecate device layers
vulkan: detect errors in VkEnumerate*ExtensionProperties
vulkan: do not distinguish instance or device LayerRef
vulkan: make Get*LayerRef take a Layer
vulkan: refactor layer extension enumeration
vulkan: refactor layer enumeration
Change-Id: I1ecc01b5c4b116d8f4248bfd20a96775142278b6
TreeHugger Robot [Fri, 29 Apr 2016 22:21:04 +0000 (22:21 +0000)]
Merge changes I6e89439a,I9d9aafe6,I38340654,Ie50a9d37,Icd98abf5, ... into nyc-dev
* changes:
vulkan: deprecate device layers
vulkan: detect errors in VkEnumerate*ExtensionProperties
vulkan: do not distinguish instance or device LayerRef
vulkan: make Get*LayerRef take a Layer
vulkan: refactor layer extension enumeration
vulkan: refactor layer enumeration
Craig Donner [Fri, 29 Apr 2016 20:53:19 +0000 (20:53 +0000)]
Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev
am:
188b9f0035
* commit '
188b9f00358d1f9f880b6d9deadc0b54f07b888e':
Support EGL_EXT_protected_content in GLConsumer.
Change-Id: I4a4f15049d62e55395d69e83157fbf4c140c52a3
Craig Donner [Fri, 29 Apr 2016 20:47:38 +0000 (20:47 +0000)]
Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev
sergeyv [Thu, 28 Apr 2016 18:40:04 +0000 (11:40 -0700)]
Atrace: store app list in multiple sysprops
bug:
28200530
Change-Id: Ifee0f3a63cf1caf4dbd867155614f94614417af5
Craig Donner [Fri, 29 Apr 2016 01:09:40 +0000 (18:09 -0700)]
Support EGL_EXT_protected_content in GLConsumer.
When the consumer creates an EGLImage, it must now pass
EGL_PROTECTED_CONTENT_EXT to eglCreateImageKHR for protected buffers to be
mapped onto the GPU. This allows us to no longer need QCOM specific flags in
a few places (already removed).
Bug:
27536318
Change-Id: I1c49886d2dcbdceaf5fa9a33288753115651b4f2
John Reck [Fri, 29 Apr 2016 14:57:22 +0000 (14:57 +0000)]
Merge "Return the transform to apply in getLastQueuedBuffer" into nyc-dev
am:
1992e9430c
* commit '
1992e9430c82cc0d3f1b1fbb66749934a7482e8d':
Return the transform to apply in getLastQueuedBuffer
Change-Id: I04656a473afd254914ac0970fcaa3d27b26e6c3e
John Reck [Fri, 29 Apr 2016 14:57:22 +0000 (14:57 +0000)]
Merge "Don\'t flatten nullptrs" into nyc-dev
am:
55e5cc0ea2
* commit '
55e5cc0ea20f1cbfe71b76b3d3975dc02e061f4c':
Don't flatten nullptrs
Change-Id: Ib4c2d067ec151904048cfb4a54b36d0398d1a670
John Reck [Fri, 29 Apr 2016 14:49:15 +0000 (14:49 +0000)]
Merge "Return the transform to apply in getLastQueuedBuffer" into nyc-dev
John Reck [Fri, 29 Apr 2016 14:49:09 +0000 (14:49 +0000)]
Merge "Don't flatten nullptrs" into nyc-dev
Chia-I Wu [Thu, 14 Apr 2016 03:55:51 +0000 (11:55 +0800)]
vulkan: deprecate device layers
Allow instance layers to intercept all commands and enumerate device
extensions. Ignore application device layers. Enumerate all enabled
instance layers in vkEnumerateDeviceLayerProperties.
Bug:
27911856
Change-Id: I6e89439ab10835dd1a43732c2333a92201e52550
Hangyu Kuang [Fri, 29 Apr 2016 01:05:59 +0000 (01:05 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev
am:
99c68bbfa3
* commit '
99c68bbfa3bd3f323d070992c3a8da0b5b57762b':
media: Add missing dobly-vision profile.
Change-Id: I46fa5cbfc1eb64814964272c83afe6e2847fa802
Hangyu Kuang [Fri, 29 Apr 2016 00:58:18 +0000 (00:58 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev
Dan Stoza [Thu, 28 Apr 2016 23:29:06 +0000 (16:29 -0700)]
SF: Clear local sync points on hide and destroy
Clears out a Layer's local sync points when the layer is destroyed
and when it is hidden, so that any Layers waiting for frames to
appear on that Layer are not blocked when attempting to apply
transactions
Bug:
28399096
Change-Id: I380a83624f9d7ea5797f66daa711ae4b80475bdf
John Reck [Thu, 28 Apr 2016 20:18:15 +0000 (13:18 -0700)]
Return the transform to apply in getLastQueuedBuffer
Bug:
28428955
Change-Id: Id48f7d3bf3f5deb074cf0a6a52a41caac875db41
Hangyu Kuang [Thu, 28 Apr 2016 19:27:15 +0000 (19:27 +0000)]
Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev
am:
32a6129e41
* commit '
32a6129e4132c96bebc7034498ab093540123f7f':
media: Change VP9 ProfileLevel to start from 0x1.
Change-Id: Ib86d1f4beb5342da1b9faf5515b5237539fe10ee
Hangyu Kuang [Thu, 28 Apr 2016 18:32:56 +0000 (18:32 +0000)]
Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev
Hangyu Kuang [Thu, 28 Apr 2016 17:54:04 +0000 (10:54 -0700)]
media: Add missing dobly-vision profile.
Bug:
28411120
Change-Id: Icd72dd1ede99e64b77f6b27f61d37a75130669cf
John Reck [Thu, 28 Apr 2016 17:12:47 +0000 (10:12 -0700)]
Don't flatten nullptrs
Bug:
28428970
BufferQueueProducer can return a nullptr for
the GraphicBuffer if there's nothing queued, which
IGraphicBufferProducer would attempt to flatten.
It's useful to distinguish that there's nothing queued
instead of just generic error, so fix IGraphicBufferProducer
to handle null GraphicBuffers.
Change-Id: I9e2b11e107e093d209a89a01d14feec3e885f268
Chih-Hung Hsieh [Thu, 28 Apr 2016 16:14:32 +0000 (09:14 -0700)]
resolve merge conflicts of
168dc86 to nyc-dev-plus-aosp
Change-Id: I1554cec6ea880a87921f723bc96972cb8e1d3c5c
Chih-Hung Hsieh [Thu, 28 Apr 2016 15:16:23 +0000 (15:16 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
a5226fb
* commit '
a5226fb2cf3d03544da1f9d4d44887c4143e0af0':
Fix google-explicit-constructor warnings.
Change-Id: I10c47f1c6502c038fdc82271bc829635a22cbead
Treehugger Robot [Thu, 28 Apr 2016 15:11:54 +0000 (15:11 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chia-I Wu [Wed, 27 Apr 2016 03:57:53 +0000 (11:57 +0800)]
vulkan: detect errors in VkEnumerate*ExtensionProperties
Return VK_ERROR_LAYER_NOT_PRESENT when the layer is not available.
Change-Id: I9d9aafe6e40c2ca49e58bc7c70114d0f11de2f81
Chia-I Wu [Wed, 27 Apr 2016 23:15:51 +0000 (07:15 +0800)]
vulkan: do not distinguish instance or device LayerRef
Merge Get*LayerRef into GetLayerRef and remove LayerRef::is_instance_.
With the removal, LayerRef::SupportsExtension becomes ambiguous. Replace
it with FindLayer*Extension. Remove unused LayerRef::GetName and
LayerRef::GetSpecName while at it.
There should be no user-visible change.
Bug:
27911856
Change-Id: I38340654b52338e9ed46d1c4462a6b254b0cab64
Chia-I Wu [Wed, 27 Apr 2016 23:39:32 +0000 (07:39 +0800)]
vulkan: make Get*LayerRef take a Layer
The only user-visible change should be improved error messages.
Bug:
27911856
Change-Id: Ie50a9d37f07b590026176642f2c67270225f9280
Chia-I Wu [Wed, 27 Apr 2016 01:54:02 +0000 (09:54 +0800)]
vulkan: refactor layer extension enumeration
Replace Get*LayerExtensions by a set of new functions that do not
distinguish instance and device layers.
There should be no user-visible change.
Bug:
27911856
Change-Id: Icd98abf51a936769f8f2f218794043b5e2611c5c
Chia-I Wu [Wed, 27 Apr 2016 22:36:09 +0000 (06:36 +0800)]
vulkan: refactor layer enumeration
Replace Enumerate*Layers by a set of new functions that do not distinguish
instance and device layers. The new functions are also careful not to
pollute the rest of the loader with std containers.
There should be no user-visible change.
Bug:
27911856
Change-Id: I4790fadc1aa2ea934a4628bce55dd45892f15e0b
Felipe Leme [Thu, 28 Apr 2016 00:22:43 +0000 (00:22 +0000)]
Merge "Remove temporary file on user builds." into nyc-dev
am:
d97e99f
* commit '
d97e99f7d4665530a699bb72ee694174cb938536':
Remove temporary file on user builds.
Change-Id: Ie53c87ba8508d024ac0bf55a62c8934fb323ccc1
TreeHugger Robot [Thu, 28 Apr 2016 00:11:43 +0000 (00:11 +0000)]
Merge "Remove temporary file on user builds." into nyc-dev
Felipe Leme [Thu, 21 Apr 2016 22:42:55 +0000 (15:42 -0700)]
Remove temporary file on user builds.
BUG:
27366368
Change-Id: Id85566f6ba02fcb6afc122ffe6990d0a14086375
Christopher Ferris [Wed, 27 Apr 2016 20:23:31 +0000 (20:23 +0000)]
Merge "Fix use of invalid iterator." into nyc-dev
am:
44e9c02
* commit '
44e9c027958ef5d7f8c8a06137ff9832b43114fb':
Fix use of invalid iterator.
Change-Id: Iaf425573fa29066179a12914eeec9bc90a5fab62
Christopher Ferris [Wed, 27 Apr 2016 20:11:26 +0000 (20:11 +0000)]
Merge "Fix use of invalid iterator." into nyc-dev
Jeff Hao [Wed, 27 Apr 2016 20:06:17 +0000 (20:06 +0000)]
Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
am:
8335fa3
* commit '
8335fa3f500addd8804869388fd91d776aa56188':
Support to pass <uses-library> option through to dex2oat.
Change-Id: I8872e82441b39c1363a8e9852b63dd68e1d71d0f
Peng Xu [Wed, 27 Apr 2016 19:55:26 +0000 (19:55 +0000)]
Merge "Fix sensor uuid, retrofit recent event logger" into nyc-dev
am:
cf43c26
* commit '
cf43c2654da64f12d0803c66dd75525b3f1ab09f':
Fix sensor uuid, retrofit recent event logger
Change-Id: Ibb34fafb727e194bf78a2c90588c25d96aa7e51e
Jeff Hao [Wed, 27 Apr 2016 19:54:02 +0000 (19:54 +0000)]
Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
Peng Xu [Wed, 27 Apr 2016 19:37:57 +0000 (19:37 +0000)]
Merge "Fix sensor uuid, retrofit recent event logger" into nyc-dev
Jeff Hao [Wed, 16 Mar 2016 22:59:25 +0000 (15:59 -0700)]
Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.
Part of a multi-project change.
Includes fix from
c09662d9bbd35840b24cae8d336a0d11c0cbdb7b
Bug:
26880306
(cherry-picked from commmit
de7f0cf8a699f6f7a7d29b4a14d800bea9abbef4)
Change-Id: Ideb2aba46f4cf52acb9dd480993513a60dbfd6ce
Christopher Ferris [Tue, 26 Apr 2016 18:29:08 +0000 (11:29 -0700)]
Fix use of invalid iterator.
The code grabbed an iterator to a slot, but eventually does an erase
of the iterator. Unfortunately, the code then attempts to use this
invalid iterator which can introduce subtle crashes by putting a
garbage value on the free buffer list.
Bug:
28351886
Change-Id: I42a4431b182cee4de829f15fa4ddc175a3d141f7
Hangyu Kuang [Wed, 27 Apr 2016 00:01:29 +0000 (17:01 -0700)]
media: Change VP9 ProfileLevel to start from 0x1.
Bug:
28380207
Related to Bug:
25684127
Change-Id: I396a65991acc066ae05bc8b65a2e7ea787599f64
Chia-I Wu [Wed, 27 Apr 2016 00:15:00 +0000 (00:15 +0000)]
Merge changes I97efd6c9,I6460f8f0,Ic67e4290,I16214514,Ieaa4e463, ... into nyc-dev
am:
6cfb89c
* commit '
6cfb89c0bfe11c2ee513fe4df339ad753d4ad4ff':
vulkan: remove g_device_layers
vulkan: ignore device-only layers
vulkan: ignore layer libraries without instance layers
vulkan: add FindLayer helper
vulkan: constify LayerRef members
vulkan: make g_library_mutex per-LayerLibrary
vulkan: make LayerLibrary a class
vulkan: refactor GetLayerGetProcAddr
vulkan: refactor AddLayerLibrary
vulkan: refactor LayerRef::~LayerRef
vulkan: refactor GetLayerRef
vulkan: add a constructor for LayerLibrary
Change-Id: I47275542ab13f945d8295fb069cae4ac2cd0de4c
TreeHugger Robot [Tue, 26 Apr 2016 23:42:26 +0000 (23:42 +0000)]
Merge changes I97efd6c9,I6460f8f0,Ic67e4290,I16214514,Ieaa4e463, ... into nyc-dev
* changes:
vulkan: remove g_device_layers
vulkan: ignore device-only layers
vulkan: ignore layer libraries without instance layers
vulkan: add FindLayer helper
vulkan: constify LayerRef members
vulkan: make g_library_mutex per-LayerLibrary
vulkan: make LayerLibrary a class
vulkan: refactor GetLayerGetProcAddr
vulkan: refactor AddLayerLibrary
vulkan: refactor LayerRef::~LayerRef
vulkan: refactor GetLayerRef
vulkan: add a constructor for LayerLibrary
Treehugger Robot [Tue, 26 Apr 2016 23:40:02 +0000 (23:40 +0000)]
Merge "Atrace:use ReadFileToString to read file" am:
3cebac7
am:
ab682e4
* commit '
ab682e471572d11c5aa217c9cdd5e2c5f3716598':
Atrace:use ReadFileToString to read file
Change-Id: If2ee9e48032ac71f843a4a24d9cc012587bace79
Stephane Gasparini [Tue, 26 Apr 2016 23:36:18 +0000 (23:36 +0000)]
Merge "Atrace:use ReadFileToString to read file"
am:
3cebac7
* commit '
3cebac75a29cabec5024a7316117f401b60cc248':
Atrace:use ReadFileToString to read file
Change-Id: Ib5b32935ea42321dc3566655cb875ed04161b7cb
Treehugger Robot [Tue, 26 Apr 2016 23:29:34 +0000 (23:29 +0000)]
Merge "Atrace:use ReadFileToString to read file"
Christopher Wiley [Tue, 26 Apr 2016 16:20:54 +0000 (16:20 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd" am:
758973c
am:
512926e
* commit '
512926e2d7d9d9ac9e2487c38579c73998e14243':
libbinder: Replace ScopedFd with base::unique_fd
Change-Id: Ie07321addb7a5f2ae49f276e31b80054d1154bd4
Christopher Wiley [Tue, 26 Apr 2016 16:17:33 +0000 (16:17 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd"
am:
758973c
* commit '
758973c497209b0a0d2b3a8afb6c0b0b139b8ab8':
libbinder: Replace ScopedFd with base::unique_fd
Change-Id: Icf1e8b60601118e1d95c0f58f9cb38efbdd6c680
Christopher Wiley [Tue, 26 Apr 2016 16:09:57 +0000 (16:09 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd"
Pablo Ceballos [Tue, 26 Apr 2016 14:01:39 +0000 (14:01 +0000)]
Merge "Revert "EGL: Ensure surfaces are disconnected when destroyed"" into nyc-dev
am:
5882a26
* commit '
5882a267d0bee5e9505fe4e714f50378f5ef70d0':
Revert "EGL: Ensure surfaces are disconnected when destroyed"
Change-Id: Ice7d5a3ceba042eea77f773a99f58a8bb91cc6af
Pablo Ceballos [Tue, 26 Apr 2016 13:50:41 +0000 (13:50 +0000)]
Merge "Revert "EGL: Ensure surfaces are disconnected when destroyed"" into nyc-dev
Pablo Ceballos [Mon, 25 Apr 2016 20:40:08 +0000 (20:40 +0000)]
Revert "EGL: Ensure surfaces are disconnected when destroyed"
This reverts commit
541de498ec7356c5e4af92500cf2fb8fc707fd50.
Bug
28295465
Change-Id: If81ed4a5a73a9612579b58291c37c7830ea1f7db
Chia-I Wu [Fri, 22 Apr 2016 01:42:41 +0000 (09:42 +0800)]
vulkan: remove g_device_layers
All device layers are now instance layers. We do not need to maintain two
vectors.
Change-Id: I97efd6c92395f00ac41aae6862e5607dfa678156
Chia-I Wu [Mon, 18 Apr 2016 08:45:15 +0000 (16:45 +0800)]
vulkan: ignore device-only layers
Ignore device layers that have no matching instance layers.
Change-Id: I6460f8f0c3c1288c23843e0875fa6a90f7f6cb8d
Chia-I Wu [Tue, 19 Apr 2016 04:22:52 +0000 (12:22 +0800)]
vulkan: ignore layer libraries without instance layers
Make vkEnumerateInstanceLayerProperties and
vkEnumerateInstanceExtensionProperties mandatory for layer libraries. If
vkEnumerateInstanceLayerProperties enumerates no instance layer, ignore
the layer library.
Change-Id: Ic67e4290f0cd5f9098bd02d9d01cc0194398424a
Chia-I Wu [Fri, 22 Apr 2016 02:10:04 +0000 (10:10 +0800)]
vulkan: add FindLayer helper
It finds a Layer using the layer name.
Change-Id: I16214514fcdef09f9016dc2c71fcd5c1f3d0fa6b
Chia-I Wu [Tue, 19 Apr 2016 03:45:57 +0000 (11:45 +0800)]
vulkan: constify LayerRef members
Consitfy GetSpecVersion and layer_.
Change-Id: Ieaa4e463ca4666fc9f81b9904fe0783c55e98d03
Chia-I Wu [Mon, 25 Apr 2016 23:37:44 +0000 (07:37 +0800)]
vulkan: make g_library_mutex per-LayerLibrary
All that need to be protected are LayerLibrary::Open and
LayerLibrary::Close.
Change-Id: I81b2e7cc36d8c260ddcba69074c71a5244f5b443
Elliott Hughes [Mon, 25 Apr 2016 23:39:13 +0000 (23:39 +0000)]
Merge "Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test." am:
32e2d0f
am:
38adc64
* commit '
38adc64dee5eb9c4cb9bd3eca1be52b537426a12':
Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test.
Change-Id: I97ff217d7decafc7ef0a283fa14526ed6ed4e47a
Elliott Hughes [Mon, 25 Apr 2016 23:32:46 +0000 (23:32 +0000)]
Merge "Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test."
am:
32e2d0f
* commit '
32e2d0f76893f1b6bde0caa19247df8262776e2b':
Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test.
Change-Id: Ifbcd04d77a11cc89e3e73b522a263382aa29b6a2
Elliott Hughes [Mon, 25 Apr 2016 23:22:31 +0000 (23:22 +0000)]
Merge "Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test."
Chih-Hung Hsieh [Mon, 25 Apr 2016 22:41:05 +0000 (15:41 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I0ce850de85e0de6a5472dd142f738856142db9ec
Elliott Hughes [Mon, 25 Apr 2016 20:17:48 +0000 (13:17 -0700)]
Remove HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE test.
This is no longer defined anywhere, and has never existed on LP64.
Change-Id: Ic2c51410526f6adbdfe872d4c3b99cbe3badb8d1
Martijn Coenen [Mon, 25 Apr 2016 17:52:23 +0000 (17:52 +0000)]
Merge "Move servicemanager into system-background cpuset." into nyc-dev
am:
62b6bc7
* commit '
62b6bc7c8c5e5016f575955dab147f70f8b8cc0a':
Move servicemanager into system-background cpuset.
Change-Id: If74176c4e20082988f0df33869d881fc051e1129
Martijn Coenen [Mon, 25 Apr 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Move servicemanager into system-background cpuset." into nyc-dev
Christopher Wiley [Mon, 11 Apr 2016 18:09:37 +0000 (11:09 -0700)]
libbinder: Replace ScopedFd with base::unique_fd
unique_fd is a more canonical construct going forward.
Bug:
27804373
Test: checkbuilds pass on aosp x86_64-eng
Change-Id: I53eca34c0f4fd00be770a6898ff06ec2e98b9c8e
Peng Xu [Mon, 21 Dec 2015 20:00:23 +0000 (12:00 -0800)]
Fix sensor uuid, retrofit recent event logger
Fix an issue that causes uuid field not being initialzed in
sensorservice.
MostRecentEventLogger in sensorservice is migrated to use RingBuffer
instead of a custom circular buffer. This is expected to improve
readability and maintainability of code.
Dumpsys print format is retouched to offer more information in easier
to read format.
Bug:
28305085
Change-Id: I190e43350b60a22a9fccb92a95d6eab06a471560
Jesse Hall [Sat, 23 Apr 2016 00:20:29 +0000 (00:20 +0000)]
libvulkan: Reset window before creating swapchain
am:
3d1c82a
* commit '
3d1c82a750046f055951242bf27909ad7d9cdf52':
libvulkan: Reset window before creating swapchain
Change-Id: Iba576d9acc5c926a6f6451cff591de73f8004cc7
Jesse Hall [Fri, 22 Apr 2016 22:28:29 +0000 (15:28 -0700)]
libvulkan: Reset window before creating swapchain
When using one window for two consecutive swapchains, some of the
settings from the first swapchain were affecting how many buffers we
thought we needed for the second, eventually leading us to attempt to
dequeue more buffers than we actually could.
Bug:
28075694
Change-Id: I7d2cabc2365986dfcfe8a03d16bb71ca1616f144
Chia-I Wu [Fri, 22 Apr 2016 03:44:46 +0000 (03:44 +0000)]
Merge changes Ifeba21da,Ie7982790,I02bb34b7 into nyc-dev
am:
2ee735c97c
* commit '
2ee735c97c760cec76c1385f1896b822ff45cba5':
vulkan: silence a warning when layers are enabled
vulkan: fix "vkinfo -validate"
vulkan: fix vkinfo with layer extensions
Change-Id: If22805ef70cac2ce978980a157dc252cf7e9226e
Chia-I Wu [Fri, 22 Apr 2016 03:41:45 +0000 (03:41 +0000)]
Merge changes Ifeba21da,Ie7982790,I02bb34b7 into nyc-dev
* changes:
vulkan: silence a warning when layers are enabled
vulkan: fix "vkinfo -validate"
vulkan: fix vkinfo with layer extensions
Chia-I Wu [Mon, 18 Apr 2016 04:20:02 +0000 (12:20 +0800)]
vulkan: make LayerLibrary a class
Make all data members private and suffix them with an underscore.
Constify path_ while at it. There is no functional change.
Change-Id: I98db9bfb1cfa9a15a501a5d3c6037fe08cff5717
Chia-I Wu [Mon, 18 Apr 2016 08:38:39 +0000 (16:38 +0800)]
vulkan: refactor GetLayerGetProcAddr
Add and call LayerLibrary::GetGPA from GetLayerGetProcAddr. There is no
functional change.
Change-Id: Ie0ec8c16633239bd8d8e634fac7525401d73343a
Chia-I Wu [Mon, 18 Apr 2016 08:33:20 +0000 (16:33 +0800)]
vulkan: refactor AddLayerLibrary
Add and call LayerLibrary::EnumerateLayers from AddLayerLibrary. There is
no functional change.
Change-Id: I6bb2a6fd6f78299c179c0c7af7c60b388e109734
Chia-I Wu [Mon, 18 Apr 2016 04:12:36 +0000 (12:12 +0800)]
vulkan: refactor LayerRef::~LayerRef
Add and call LayerLibrary::Close from LayerRef::~LayerRef. There is no
functional change.
Change-Id: I514a1631204f104293a2b75f0a6d34d8625e68b1
Chia-I Wu [Mon, 18 Apr 2016 04:11:00 +0000 (12:11 +0800)]
vulkan: refactor GetLayerRef
Add and call LayerLibrary::Open from GetLayerRef. There is no functional
change.
Change-Id: I00cff2bbc7984bb3d861eb88aea423c36b0d806f
Chia-I Wu [Mon, 18 Apr 2016 04:08:39 +0000 (12:08 +0800)]
vulkan: add a constructor for LayerLibrary
There is no functional change.
Change-Id: I77b6c7c6a697cb25cee42cda3b5683885186545a
Chia-I Wu [Thu, 21 Apr 2016 22:40:40 +0000 (06:40 +0800)]
vulkan: silence a warning when layers are enabled
Layers always do
vkGetInstanceProcAddr(VK_NULL_HANDLE, "vkCreateDevice")
and we should not log an error.
Change-Id: Ifeba21da73d982775edc4e6a91ce0f0f5eab191d
OSDN Git Service
