OSDN Git Service
John Reck [Fri, 29 Apr 2016 14:49:09 +0000 (14:49 +0000)]
Merge "Don't flatten nullptrs" into nyc-dev
Hangyu Kuang [Fri, 29 Apr 2016 00:58:18 +0000 (00:58 +0000)]
Merge "media: Add missing dobly-vision profile." into nyc-dev
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
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:11:26 +0000 (20:11 +0000)]
Merge "Fix use of invalid iterator." into nyc-dev
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
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
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
Martijn Coenen [Mon, 25 Apr 2016 17:46:01 +0000 (17:46 +0000)]
Merge "Move servicemanager into system-background cpuset." into nyc-dev
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 [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: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
Chia-I Wu [Thu, 21 Apr 2016 22:26:37 +0000 (06:26 +0800)]
vulkan: fix "vkinfo -validate"
Some layers were renamed/merged.
Bug:
28317797
Change-Id: Ie7982790502ad1bed3234b26129cff9e06667365
Chia-I Wu [Thu, 21 Apr 2016 22:06:04 +0000 (06:06 +0800)]
vulkan: fix vkinfo with layer extensions
vkinfo enable layers only when options.validate is true. We should use
layer extensions, such as VK_EXT_debug_report, only when layers are
enabled.
Bug:
28317797
Change-Id: I02bb34b728f3f3072111444194ee97065e38e401
Pablo Ceballos [Thu, 21 Apr 2016 15:52:02 +0000 (15:52 +0000)]
Merge "BQ: Replace items from back of queue" into nyc-dev
Pablo Ceballos [Wed, 20 Apr 2016 03:11:56 +0000 (20:11 -0700)]
BQ: Replace items from back of queue
It's possible to have one or more non-droppable items in the queue
ahead of a droppable item. In that case we want to replace the
droppable one at the end of the queue. By changing the policy to
always replace the last item in the queue (if it's droppable) we
ensure that there will never be more than one droppable item in the
queue and that it will always be the last one.
Bug
27129258
Change-Id: I9a6234fe12a0095ccb93ceb9cdb74616944900b0
Jesse Hall [Wed, 20 Apr 2016 23:58:11 +0000 (16:58 -0700)]
vknulldrv: Use a default allocator when none provided
The loader used to always provide an allocator, even if the app
didn't. It no longer does that, so the null driver must be prepared to
provide its own default allocator.
Fixes bug
28303142
Change-Id: I6ab946913dc4edaf2a0b07ab9ae8c43be69b3ed6
Andriy Naborskyy [Wed, 20 Apr 2016 20:52:56 +0000 (20:52 +0000)]
Merge "remove compass from default wearable_core_hardware.xml" into cw-e-dev am:
86d5272
am:
8cae361
* commit '
8cae361cd12eba8e79938598d5e76820fc3a8a09':
remove compass from default wearable_core_hardware.xml
Change-Id: Ia9c99fa7c739abf7963258d39710645629e0502e
Andriy Naborskyy [Wed, 20 Apr 2016 20:48:40 +0000 (20:48 +0000)]
Merge "remove compass from default wearable_core_hardware.xml" into cw-e-dev
am:
86d5272
* commit '
86d5272389ec8077765684f2b89e99c623833850':
remove compass from default wearable_core_hardware.xml
Change-Id: Idc888dee9bbf8521285a131577952bd4d48dc9c7
Andriy Naborskyy [Wed, 20 Apr 2016 20:39:44 +0000 (20:39 +0000)]
Merge "remove compass from default wearable_core_hardware.xml" into cw-e-dev
Pablo Ceballos [Wed, 20 Apr 2016 20:28:07 +0000 (20:28 +0000)]
Merge "BQ: Avoid unnecessary calls to consumer listener" into nyc-dev
Jesse Hall [Wed, 20 Apr 2016 17:30:39 +0000 (17:30 +0000)]
Merge "libgui: Add getLastQueuedBuffer to BufferQueue" into nyc-dev
Dan Stoza [Tue, 19 Apr 2016 22:41:58 +0000 (22:41 +0000)]
Merge "DispSync: Actually wait forever" into nyc-dev
Dan Stoza [Thu, 7 Apr 2016 23:53:23 +0000 (16:53 -0700)]
libgui: Add getLastQueuedBuffer to BufferQueue
Adds the ability to get the last buffer queued to a BufferQueue plus
its acquire fence.
Bug:
27708453
Change-Id: Iee39475740b40c854a5f46178b2934fd930e61b8
Chia-I Wu [Tue, 19 Apr 2016 22:13:17 +0000 (22:13 +0000)]
Merge "vulkan: replace std::shared_ptr by android::sp" into nyc-dev
Dan Stoza [Tue, 19 Apr 2016 20:30:22 +0000 (20:30 +0000)]
Merge "DispSync: Don't resync if HW vsync is unavailable" into nyc-dev
Pablo Ceballos [Tue, 19 Apr 2016 18:33:00 +0000 (11:33 -0700)]
BQ: Avoid unnecessary calls to consumer listener
Try to avoid unnecessary calls to the consumer listener's
onBuffersReleased() since they can potentially deadlock.
Bug
28254168
Change-Id: Ib064e5ebe1403a1028589342b3c33e6f40bb54a9
Dan Stoza [Tue, 19 Apr 2016 18:56:20 +0000 (11:56 -0700)]
DispSync: Don't resync if HW vsync is unavailable
Don't attempt to resync to hardware vsync if it's not available (if
the display is blanked), which should prevent unusual sequences of
commands (enable vsync, then unblank) to hardware composer.
Bug:
28177844
Change-Id: I9d6046fb0a346830e98829fd250642f0809d7e31
Pablo Ceballos [Tue, 19 Apr 2016 17:11:02 +0000 (17:11 +0000)]
Merge "SF: Fix camera orientation on virtual displays" into nyc-dev
Dan Stoza [Tue, 19 Apr 2016 17:03:46 +0000 (10:03 -0700)]
DispSync: Actually wait forever
When computeNextEventTimeLocked returns INT64_MAX (because there are
currently no listeners), wait until the condition variable is
signaled instead of waiting for a long timeout. Since the condition
variable timeout is specified using CLOCK_REALTIME behind the scenes,
we can receive false wakeups in the presence of large system clock
changes.
Bug:
28152577
Change-Id: I88dbab5d5d0776cb25dea76a4574db055b308fd1
Tim Murray [Tue, 19 Apr 2016 16:50:03 +0000 (16:50 +0000)]
Merge "Revert "Revert "DispSync: Always resync after inactivity""" into nyc-dev
Tim Murray [Tue, 19 Apr 2016 16:29:23 +0000 (16:29 +0000)]
Revert "Revert "DispSync: Always resync after inactivity""
This reverts commit
67264e930992e43ef3351b04692d4ca59cbb01ad.
We've fixed the kernel issues this exposed.
bug
28198793
Change-Id: Ie895cc0a815094cce4bee3b2bf45800ee1e2fdc3
Chia-I Wu [Mon, 18 Apr 2016 00:21:31 +0000 (08:21 +0800)]
vulkan: replace std::shared_ptr by android::sp
With the change, we do not handle exceptions anymore. Remove
-fexceptions.
Bug:
26732452
Change-Id: I2782f9b522cb25f158515fcf90312013e672225b
Pablo Ceballos [Sat, 16 Apr 2016 00:31:51 +0000 (17:31 -0700)]
SF: Fix camera orientation on virtual displays
Camera uses NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY to make the camera
preview always look upright on the device display. This commit changes
the behavior of this flag slightly. Instead of applying the inverse
transform of the current display when compositing, apply the inverse
transform of the primary display to all displays. This assumes that
the camera orientation is tied to the primary display.
Bug
2628180
Change-Id: I0da22423490a93fe943fd59e6c122aa6aaf30b11
Kalle Raita [Mon, 18 Apr 2016 23:03:37 +0000 (16:03 -0700)]
Look EGL extension matches beyond partial match
Bug:
28198559
Change-Id: I8d483d04e855b62432e1da786629890d09ae9d00
Jeff Sharkey [Mon, 18 Apr 2016 19:43:16 +0000 (19:43 +0000)]
Merge "Consistent creation/destruction of user data." into nyc-dev
Michael Wright [Mon, 18 Apr 2016 19:05:04 +0000 (19:05 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev am:
58dc18a am:
ab4b3c3 am:
2352674
am:
c846278
* commit '
c846278141c94385a2c931a1df80ed3ffcc8e7c2':
Add new MotionEvent flag for partially obscured windows.
Change-Id: Ia0940c0440b94922fde7a93ef5d95df59aed3c3e
Michael Wright [Mon, 18 Apr 2016 18:59:32 +0000 (18:59 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev am:
58dc18a am:
ab4b3c3
am:
2352674
* commit '
23526744e686a97487ac17bf344cf6932532c9d2':
Add new MotionEvent flag for partially obscured windows.
Change-Id: I383a125570663a744d8091860612f948cbf180fd
Michael Wright [Mon, 18 Apr 2016 18:53:53 +0000 (18:53 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev am:
58dc18a
am:
ab4b3c3
* commit '
ab4b3c3b01da510227c7724ea2b68a6ce0bffc80':
Add new MotionEvent flag for partially obscured windows.
Change-Id: I68bf7f1d8130dc222a672e8c994afeb5b5d39a90
Michael Wright [Mon, 18 Apr 2016 18:48:20 +0000 (18:48 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev
am:
58dc18a
* commit '
58dc18a43d0a832c3d684bbc27f8d4a3341c1582':
Add new MotionEvent flag for partially obscured windows.
Change-Id: I7d75c5a4c41e9b56cceac91ae731a85a3186b8f7
TreeHugger Robot [Mon, 18 Apr 2016 18:40:32 +0000 (18:40 +0000)]
Merge "Added -v option to bugreportz." into nyc-dev
Michael Wright [Mon, 18 Apr 2016 18:40:17 +0000 (18:40 +0000)]
Merge "Add new MotionEvent flag for partially obscured windows." into mnc-dev
Robert Carr [Thu, 24 Mar 2016 19:19:32 +0000 (12:19 -0700)]
Add setOverrideScalingMode to SurfaceControl
Provide an interface for the window manager to override
the client specified scaling mode. This makes it possible
for the window manager to force windows to be scaleable
for animations, etc, even when a resize is pending.
Bug:
27891386
Change-Id: Ic4aae9917bd6869ee0dbb425979b4e21c68342a3
TreeHugger Robot [Sat, 16 Apr 2016 04:43:37 +0000 (04:43 +0000)]
Merge "sensorservice: switch to use sp<> in sensor list" into nyc-dev
Colin Cross [Fri, 15 Apr 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Log when binder thread pool is starved" into nyc-dev
Colin Cross [Fri, 15 Apr 2016 21:29:55 +0000 (14:29 -0700)]
Log when binder thread pool is starved
Log when the number of threads executing binder commands is equal to the
maximium size of the thread pool for >100ms.
Bug:
28201939
Change-Id: I892863d8a81c06e362d4ae18ab08485fdec3c0bb
Craig Donner [Fri, 15 Apr 2016 21:29:39 +0000 (21:29 +0000)]
Merge "Adds spec for EGL_ANDROID_create_native_client_buffer." into nyc-dev
Dan Stoza [Fri, 15 Apr 2016 21:22:46 +0000 (21:22 +0000)]
Merge "SF: Fix the delivery of visible and damage rects to HWC" into nyc-dev
Tim Murray [Fri, 15 Apr 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Revert "DispSync: Always resync after inactivity"" into nyc-dev
Mika Isojarvi [Fri, 15 Apr 2016 20:31:33 +0000 (20:31 +0000)]
Merge "White list EGL_EXT_yuv_surface extension" into nyc-dev
Peng Xu [Fri, 8 Apr 2016 06:15:14 +0000 (23:15 -0700)]
sensorservice: switch to use sp<> in sensor list
* Switch to use smart pointer in SensorList to avoid object
life cycle issue.
* Refactor HardwareSensor and various virtual sensor class.
* Change active virtual sensor map into a set of handles.
Change-Id: I674d5eb5c0038179f9ef1b6f0d576b8b605649ec
Felipe Leme [Fri, 15 Apr 2016 16:31:33 +0000 (09:31 -0700)]
Added -v option to bugreportz.
Calling 'bugreportz -v' will print its version, which will make it
easier for 'adb' to support multiple versions in the future (for
example, next version could display the bugreport progress rather than
wait until it is finished).
BUG:
27653204
Change-Id: I1bbb35a66cfc79ca534ae9eb7c2a53540755d653
Jeff Sharkey [Fri, 15 Apr 2016 02:45:06 +0000 (20:45 -0600)]
Consistent creation/destruction of user data.
Preparing and destroying users currently needs to be split across
installd, system_server, and vold, since no single party has all the
required SELinux permissions.
Start passing down flags so we only prepare/destroy storage areas
that have keys currently installed.
Add delete_dir_contents_and_dir() argument to ignore ENOENT, since
all we care about is the directory being gone.
Bug:
27896918
Change-Id: Ia1cccc9b35e6ff09e3ca50effeab676157b856e8
Mika Isojärvi [Fri, 15 Apr 2016 18:58:56 +0000 (11:58 -0700)]
White list EGL_EXT_yuv_surface extension
Bug:
28210992
Change-Id: If81a503de4cdfeba5a01d4d80d669714a2dfdb6b
TreeHugger Robot [Fri, 15 Apr 2016 18:18:15 +0000 (18:18 +0000)]
Merge "SF: Don't pop pending state into mCurrentState" into nyc-dev
Gary Smith [Fri, 15 Apr 2016 16:22:04 +0000 (17:22 +0100)]
SF: Fix the delivery of visible and damage rects to HWC
The storage space for the visible and damage regions was inside the
HWCLayerVersion1 class, which is temporarily allocated while using
an iterator. As such, the storage has been deleted by the time the
HWC gets a pointer to it sometime later and hence the HWC reads
garbage in all layers.
This commit moves the storage into the DisplayData structure and hence
it persists until the next frame.
Bug
28200888
Change-Id: If7cc8d2de49e3e66e9d17cc45934d8e544576026
Craig Donner [Fri, 15 Apr 2016 16:41:25 +0000 (09:41 -0700)]
Adds spec for EGL_ANDROID_create_native_client_buffer.
Change-Id: I7dacf234a3b5f5f9c50a0b4c0f5b82618f6bd09d
Fixes:
28210230
Martijn Coenen [Fri, 15 Apr 2016 12:29:05 +0000 (14:29 +0200)]
Move servicemanager into system-background cpuset.
Bug:
24949295
Change-Id: I9149c43edf79d9acbc5af4b3dc1eae59c695a86a
Dan Stoza [Thu, 14 Apr 2016 23:42:07 +0000 (23:42 +0000)]
Merge "HWC2: Change version detection scheme" into nyc-dev
Pablo Ceballos [Thu, 14 Apr 2016 22:49:55 +0000 (15:49 -0700)]
SF: Don't pop pending state into mCurrentState
Let mCurrentState always represent the most up to date state, even if
there are transactions we don't want to commit yet. Past snapshots of
the state are kept in mPendingState. In doTransaction(), grab the
correct pending state from mPendingState, but save it to a local copy
that gets committed rather than overriding mCurrentState.
Bug
27205755
Change-Id: Ib0ea809da1954409787c52b8f41d7963a57a6a4c
Chia-I Wu [Thu, 14 Apr 2016 22:37:28 +0000 (22:37 +0000)]
Merge changes I05c45303,I25b71570,I56ebc0ee into nyc-dev
* changes:
vulkan: fix vkGet*ProcAddr for un-enabled extensions
vulkan: do not query non-enabled WSI functions
vulkan: pass hal_extensions to InitDriverTable
Dan Stoza [Thu, 14 Apr 2016 21:44:34 +0000 (21:44 +0000)]
Merge "HWC2: Check SidebandStream capability on load" into nyc-dev
Dan Stoza [Thu, 14 Apr 2016 21:30:41 +0000 (14:30 -0700)]
HWC2: Change version detection scheme
SurfaceFlinger now checks hardware composer module numbers by looking
at device.version, the high byte of which corresponds to the HWC
major version (0x01... for HWC 1.x and 0x02... for HWC 2.0).
Bug:
28161397
Change-Id: I4560bf60c35bdb97629fda1aa1256b03122688ad
Lianchao Song [Thu, 14 Apr 2016 21:09:38 +0000 (21:09 +0000)]
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk am:
d89d29d -s ours
am:
f42496c -s ours
* commit '
f42496c55225aaf2aa28a059bc38aef3badd3705':
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk
Change-Id: I18d5a628fc494995eb29c72af42951fbb81cefad
Lianchao Song [Thu, 14 Apr 2016 21:06:15 +0000 (21:06 +0000)]
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk
am:
d89d29d -s ours
* commit '
d89d29d348855a9348509555a2d6fe87202ca715':
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk
Change-Id: I10bc5f966913b39c81ffffa73739bbe24055a54d
Andy Hung [Thu, 14 Apr 2016 20:47:23 +0000 (20:47 +0000)]
Merge "Unify dumped native stack traces" into nyc-dev
Dan Stoza [Thu, 14 Apr 2016 19:31:01 +0000 (12:31 -0700)]
HWC2: Check SidebandStream capability on load
Checks whether the HWC2 device has the SidebandStream capability
before attempting to load the corresponding function pointer
Bug:
28161394
Change-Id: I6407d61a1b23138781e57213bcb868be46609018
Lianchao Song [Tue, 12 Apr 2016 13:58:32 +0000 (21:58 +0800)]
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk
Add the parameter check during the operation of memcopy/memmove
to avoid the over boundary risk.
If this issue happen, the android system will restart.
Modify the code refer to the review comment
BUG:
28123226
Change-Id: Ib17e94d9b916938756d460bc2c05dd2d60246932
Signed-off-by: Lianchao Song <songlianchao@huawei.com>
Pablo Ceballos [Thu, 14 Apr 2016 17:10:26 +0000 (17:10 +0000)]
Merge "egl: add EGL_KHR_mutable_render_buffer" into nyc-dev
Dan Stoza [Thu, 14 Apr 2016 16:11:48 +0000 (16:11 +0000)]
Revert "DispSync: Always resync after inactivity"
This reverts commit
f34b9be610ce286af224364cb6e69ef6f7697ee9.
Bug:
28160740
Change-Id: I48a5bd66712651b42fdc0aaf1492899d7b032977
Andriy Naborskyy [Thu, 14 Apr 2016 02:54:14 +0000 (19:54 -0700)]
remove compass from default wearable_core_hardware.xml
The compass is not a required Android Wear sensor.
BUG:
22854370
Change-Id: Ibe3cb1a80bab59cee294a34aa3331fb92a5ca0d6
Andy Hung [Thu, 14 Apr 2016 02:35:34 +0000 (19:35 -0700)]
Unify dumped native stack traces
Bug:
28179196
Change-Id: Ie728ceace7aaf38389dd9684342e351feed6e5a7
Chia-I Wu [Wed, 13 Apr 2016 08:52:06 +0000 (16:52 +0800)]
vulkan: fix vkGet*ProcAddr for un-enabled extensions
vulkan::api::InitDispatchTable no longer queries for non-enabled WSI
functions. We could now return NULL instead of ProcHook::disabled_proc.
This also matches what the spec says.
Bug:
28173232
Change-Id: I05c45303025d25e49f75c18a912fc4cc2b13979f
Chia-I Wu [Wed, 13 Apr 2016 07:13:21 +0000 (15:13 +0800)]
vulkan: do not query non-enabled WSI functions
Initialize dispatch table entries for non-enabled WSI functions to stubs.
We do not want to initialize them to NULL because they may still be
invoked through the exported WSI entrypoints.
Bug:
25850852
Change-Id: I25b715700990ad7432740f031764d70396024d32
Chia-I Wu [Wed, 13 Apr 2016 07:01:00 +0000 (15:01 +0800)]
vulkan: pass hal_extensions to InitDriverTable
We only need hal_extensions to initialize the driver tables. There is no
need to save it in driver::{Instance,Device}Data.
Change-Id: I56ebc0ee9c5bc5e543e7a84412b03b842bd8ced5
Keun-young Park [Thu, 14 Apr 2016 00:04:37 +0000 (17:04 -0700)]
remove non-mandatory features from car_core
- things like camera, compass, accelerometer, landscape mode not
mandated.
- each product should add it as necessary.
bug:
28175543
Change-Id: I171e88bee598198a8aeb64afae77b0045c02b2da
TreeHugger Robot [Wed, 13 Apr 2016 23:43:54 +0000 (23:43 +0000)]
Merge changes I7389829a,I4f3f91e8 into nyc-dev
* changes:
vulkan: pass VK_LAYER_FUNCTION_DATA_CALLBACK to layers
vulkan: update vk_layer_interface.h
Craig Donner [Wed, 13 Apr 2016 21:46:06 +0000 (21:46 +0000)]
Merge "Minor changes and cleanup to support EXT_protected_content." into nyc-dev
Chia-I Wu [Wed, 13 Apr 2016 02:20:59 +0000 (10:20 +0800)]
vulkan: pass VK_LAYER_FUNCTION_DATA_CALLBACK to layers
VK_LAYER_FUNCTION_DATA_CALLBACK effectively allows us to pass
driver::SetDataInternal to layers. It will be called on handles of
potentially unknown types. Add two internal types
VK_DEFINE_HANDLE(InstanceDispatchable)
VK_DEFINE_HANDLE(DeviceDispatchable)
in driver namespace for type safety.
Bug:
28015368
Change-Id: I7389829a7d8c374197cd7046973777b49e436961