OSDN Git Service
Jesse Hall [Tue, 4 Apr 2017 23:17:21 +0000 (23:17 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.46" am:
4cc7755c7c am:
a867102e0c
am:
84558da59d -s ours
Change-Id: I4fbaf5cbb078693968061996a0e73a65e195e9da
Jesse Hall [Tue, 4 Apr 2017 23:14:19 +0000 (23:14 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.46" am:
4cc7755c7c
am:
a867102e0c
Change-Id: I0769a81a5c324253886ee07ccd51fc0d8af15daa
Jesse Hall [Tue, 4 Apr 2017 23:12:19 +0000 (23:12 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.46"
am:
4cc7755c7c
Change-Id: Id6997396c7a42517338bb36e24db1c50c600e248
Treehugger Robot [Tue, 4 Apr 2017 23:08:13 +0000 (23:08 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.46"
Mathias Agopian [Tue, 4 Apr 2017 21:55:42 +0000 (21:55 +0000)]
Merge "fix race condition that can cause a use after free" into oc-dev
am:
2d45cf2a40
Change-Id: Ib574c8c9887fecd4ca542d92d61671d6c8a3625e
Mathias Agopian [Tue, 4 Apr 2017 21:51:01 +0000 (21:51 +0000)]
Merge "fix race condition that can cause a use after free" into oc-dev
Jiwen 'Steve' Cai [Tue, 4 Apr 2017 21:39:55 +0000 (21:39 +0000)]
Merge "Harden BufferHubQueueProducerTest" into oc-dev
am:
8e5deb6b96
Change-Id: If03751b511b12e043aee734b8b7b401a7dd378d4
TreeHugger Robot [Tue, 4 Apr 2017 21:32:43 +0000 (21:32 +0000)]
Merge "Harden BufferHubQueueProducerTest" into oc-dev
Jeff Sharkey [Tue, 4 Apr 2017 21:25:47 +0000 (21:25 +0000)]
Merge "Offer to "fixup" GIDs used for app data." into oc-dev
am:
e7353ae5fc
Change-Id: I7b0b11c6b47fdd09f3f36bd77714065f917b87cd
TreeHugger Robot [Tue, 4 Apr 2017 21:18:16 +0000 (21:18 +0000)]
Merge "Offer to "fixup" GIDs used for app data." into oc-dev
Mathias Agopian [Tue, 4 Apr 2017 00:14:31 +0000 (17:14 -0700)]
fix race condition that can cause a use after free
Bug:
33004354
Test: manual
Change-Id: I9b38ee644b02268c9b995a330db758aa2e568399
Okan Arikan [Tue, 4 Apr 2017 18:32:14 +0000 (18:32 +0000)]
Merge "Fix pose predictor jank." into oc-dev
am:
53ed7bfca1
Change-Id: I1b23c28c71e1c463d80a7a5810a8dbe843c7befd
TreeHugger Robot [Tue, 4 Apr 2017 18:23:45 +0000 (18:23 +0000)]
Merge "Fix pose predictor jank." into oc-dev
Jesse Hall [Tue, 4 Apr 2017 18:11:58 +0000 (18:11 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.46" into oc-dev
am:
05601b602c
Change-Id: I0eea0f3e19bc346f8e539c9614eb863a087fff7e
Jesse Hall [Tue, 4 Apr 2017 18:04:14 +0000 (18:04 +0000)]
Merge "vulkan: update Vulkan headers to 1.0.46" into oc-dev
Jesse Hall [Mon, 20 Mar 2017 20:09:19 +0000 (13:09 -0700)]
vulkan: update Vulkan headers to 1.0.46
- Add VK_EXT_swapchain_colorspace
- Add VK_KHR_incremental_present
Test: dEQP-VK.api.smoke.*
dEQP-VK.wsi.android.incremental_present.*
Bug:
36886707
Change-Id: I70ffd56a63da39301cd9706b1b91cf3643aab916
Okan Arikan [Fri, 31 Mar 2017 21:04:51 +0000 (14:04 -0700)]
Fix pose predictor jank.
There were two issues:
- A math error in angular velocity computation.
This has unit tests and they were failing.
Need to make sure these units tests get executed.
- There is an inherent sensor latency that we need to account for.
Bug:
36693596,
36196200
Test: Run VrHome, see less hanky result.
Change-Id: Ifcf191f16de9ee64aa14bcbb74c9126db18ebaa8
Chia-I Wu [Tue, 4 Apr 2017 16:23:29 +0000 (16:23 +0000)]
Merge "libui: clean up GraphicBuffer interface" into oc-dev
am:
c428826fdf
Change-Id: I5f594029e94b1a363e2f07dbdc5aeb32c2d58098
Daniel Nicoara [Tue, 4 Apr 2017 16:23:16 +0000 (16:23 +0000)]
Merge "VR: Move VR HWC DVR API to libdvr" into oc-dev
am:
5ce4bb2cbe
Change-Id: I533b4634d8f6e25d06967092840cc30a9a3cf4c9
Chia-I Wu [Tue, 4 Apr 2017 16:16:23 +0000 (16:16 +0000)]
Merge "libui: clean up GraphicBuffer interface" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 16:14:03 +0000 (16:14 +0000)]
Merge "VR: Move VR HWC DVR API to libdvr" into oc-dev
Alex Vakulenko [Tue, 4 Apr 2017 15:43:31 +0000 (15:43 +0000)]
Merge "pdx: Rework error reporting when transfering file and channel handles" into oc-dev
am:
93e3900ad3
Change-Id: I47723338f73266858e51e36090a2a2d4afbd6a2e
Alex Vakulenko [Tue, 4 Apr 2017 15:31:24 +0000 (15:31 +0000)]
Merge "pdx: Rework error reporting when transfering file and channel handles" into oc-dev
Jesse Hall [Mon, 20 Mar 2017 20:09:19 +0000 (13:09 -0700)]
vulkan: update Vulkan headers to 1.0.46
- Add VK_EXT_swapchain_colorspace
- Add VK_KHR_incremental_present
Test: build aosp_arm64-eng
Change-Id: I6cd81baa2870bf436abab6191a05ebfd60ccbc46
Merged-In: I70ffd56a63da39301cd9706b1b91cf3643aab916
Courtney Goeltzenleuchter [Tue, 4 Apr 2017 13:04:37 +0000 (13:04 +0000)]
Merge "Remove driver workaround" into oc-dev
am:
ac81f70b43
Change-Id: I24da8479b8e2a84425fe7d3860cf3c0ed73a288f
Courtney Goeltzenleuchter [Tue, 4 Apr 2017 12:59:41 +0000 (12:59 +0000)]
Merge "Remove driver workaround" into oc-dev
Daniel Nicoara [Mon, 27 Mar 2017 20:56:05 +0000 (16:56 -0400)]
VR: Move VR HWC DVR API to libdvr
Moved VR HWC API into a common API library.
Bug:
36050795
Test: Compiled
Change-Id: I1af32f4dedb7a6d4bb77a18d3c48cfbc8ea00a66
(cherry picked from commit
3d3fb3960f9c3956074496fd7fa1beb230ac1043)
Pyry Haulos [Tue, 4 Apr 2017 06:00:44 +0000 (06:00 +0000)]
Merge "Fix typo causing GL_EXT_debug_marker to disappear" into oc-dev
am:
8348f6d6d0
Change-Id: Ic4918d74375965dc18b8bd8e14c08090a4845d8c
TreeHugger Robot [Tue, 4 Apr 2017 05:57:05 +0000 (05:57 +0000)]
Merge "Fix typo causing GL_EXT_debug_marker to disappear" into oc-dev
Yifan Hong [Tue, 4 Apr 2017 05:51:29 +0000 (05:51 +0000)]
Merge changes from topic 'sensors_framework_hal' into oc-dev
am:
2d3349c9aa
Change-Id: I06a5e6a43d8841b464e794c7e9414de61b54e185
Yifan Hong [Tue, 4 Apr 2017 05:51:08 +0000 (05:51 +0000)]
android.frameworks.sensorservice@1.0: ashmem direct channel check sizes.
am:
8a420ed627
Change-Id: I95c0352822944f1859896a5aaccebd88518e4437
Yifan Hong [Tue, 4 Apr 2017 05:50:46 +0000 (05:50 +0000)]
android.frameworks.sensorservice@1.0: fix configureDirectChannel return positive integer.
am:
05fc8afc08
Change-Id: I79b7c4d2132693750ad7522eacd059e1d1dd0a15
Yifan Hong [Tue, 4 Apr 2017 05:50:25 +0000 (05:50 +0000)]
Implement android.frameworks.sensorservice@1.0::IEventQueue.
am:
95c7a06367
Change-Id: I09ceb59fc4fd6e44b64306766ac712ccbf27b5b7
Yifan Hong [Tue, 4 Apr 2017 05:50:11 +0000 (05:50 +0000)]
Renamed HIDL SensorManager::mManager -> mInternalManager.
am:
57d427735f
Change-Id: I8c2966e83f12715695d1fdd6ed5e1bd49854b047
TreeHugger Robot [Tue, 4 Apr 2017 05:43:52 +0000 (05:43 +0000)]
Merge changes from topic 'sensors_framework_hal' into oc-dev
* changes:
android.frameworks.sensorservice@1.0: make classes final
android.frameworks.sensorservice@1.0: ashmem direct channel check sizes.
android.frameworks.sensorservice@1.0: fix configureDirectChannel return positive integer.
Implement android.frameworks.sensorservice@1.0::IEventQueue.
Renamed HIDL SensorManager::mManager -> mInternalManager.
Jiwen 'Steve' Cai [Tue, 4 Apr 2017 04:42:01 +0000 (04:42 +0000)]
Merge "ANativeWindow_toSurface header" into oc-dev
am:
a44aa44dd2
Change-Id: I127309a6bf09f5437f37713e967f876a8256a796
TreeHugger Robot [Tue, 4 Apr 2017 04:30:11 +0000 (04:30 +0000)]
Merge "ANativeWindow_toSurface header" into oc-dev
Martijn Coenen [Tue, 4 Apr 2017 03:51:19 +0000 (03:51 +0000)]
Merge "vndservicemanager: load vendor service_contexts." into oc-dev
am:
42aca5a0d3
Change-Id: Icd22fb964cb05f17232b7637eaf86e3120d88897
Martijn Coenen [Tue, 4 Apr 2017 03:41:46 +0000 (03:41 +0000)]
Merge "vndservicemanager: load vendor service_contexts." into oc-dev
Jiwen 'Steve' Cai [Fri, 31 Mar 2017 18:19:37 +0000 (11:19 -0700)]
ANativeWindow_toSurface header
This enables the conversion from an ANativeWindow (created by NDK API
such as: AImageReader_create) to a Java Surface, so that developers can
hookup a Java Producer to a native buffer consumer.
Bug:
36862948
Test: android.media.cts.NativeImageReaderTest
Change-Id: I11962bc791680a62579e51c32f2d51911cac48f8
Yifan Hong [Mon, 3 Apr 2017 21:59:47 +0000 (14:59 -0700)]
android.frameworks.sensorservice@1.0: ashmem direct channel check sizes.
Test: VtsHalSensorManagerV1_0TargetTest
Change-Id: I18b87128da2607f82ffddb260bf440786c378010
Yifan Hong [Tue, 4 Apr 2017 02:08:16 +0000 (19:08 -0700)]
android.frameworks.sensorservice@1.0: make classes final
Make SensorManager and DirectReportChannel final.
Test: pass
Change-Id: Idc7f7fcacf1ad1ad6282a603538529ff99f88184
Yifan Hong [Mon, 3 Apr 2017 19:52:24 +0000 (12:52 -0700)]
android.frameworks.sensorservice@1.0: fix configureDirectChannel return positive integer.
SensorManager::configureDirectChannel can return a positive integer
as the token to indicate success. android.frameworks.sensorservice@1.0
doesn't care about the token.
Test: VtsHalSensorManagerV1_0TargetTest
Change-Id: I6bcbbe5dc747a0d93d2a0fd37f0b7187cb681101
Yifan Hong [Wed, 29 Mar 2017 02:07:17 +0000 (19:07 -0700)]
Implement android.frameworks.sensorservice@1.0::IEventQueue.
Test: pass
Bug:
35219747
Change-Id: I52ddd64db500c23db22768fc0603bce0cc14f8c6
Mathias Agopian [Tue, 4 Apr 2017 01:52:33 +0000 (01:52 +0000)]
Merge "Add VNDK API to access AHardwareBuffer from ANativeWindowBuffer" into oc-dev
am:
31ee0e6a6a
Change-Id: I3b3f6869f4977b37fbdcbe56808d0f7aebf34c9e
Daniel Nicoara [Tue, 4 Apr 2017 01:52:22 +0000 (01:52 +0000)]
VR: Update VR Window Manager to use the VR Hardware Composer service
am:
3db8412608
Change-Id: I3a9378c6612a5d2e698c0197d5813f06f96b32bb
Mathias Agopian [Tue, 4 Apr 2017 01:49:08 +0000 (01:49 +0000)]
Merge "Add VNDK API to access AHardwareBuffer from ANativeWindowBuffer" into oc-dev
Daniel Nicoara [Fri, 10 Mar 2017 18:02:09 +0000 (13:02 -0500)]
VR: Update VR Window Manager to use the VR Hardware Composer service
Decouples VR HWC from VR Window Manager.
Bug:
36051907
Test: Compiled and ran on device in VR mode.
Change-Id: Ifd76e742148765b3cf3e71b0cf538b920814eb7b
Pyry Haulos [Tue, 4 Apr 2017 01:22:58 +0000 (18:22 -0700)]
Fix typo causing GL_EXT_debug_marker to disappear
Android EGL wrapper is supposed to always insert GL_EXT_debug_marker
implementation. A small typo in recent refactoring broke this logic.
Bug:
36865892
Test: dEQP-GLES2.functional.debug_marker.supported
Yin-Chia Yeh [Tue, 4 Apr 2017 00:39:21 +0000 (00:39 +0000)]
Merge "Surface: add getRemovedBuffer API" into oc-dev
am:
0860434b11
Change-Id: I1ccd3818df2dff83c69be863603df768391be230
TreeHugger Robot [Tue, 4 Apr 2017 00:33:14 +0000 (00:33 +0000)]
Merge "Surface: add getRemovedBuffer API" into oc-dev
Keun-young Park [Mon, 3 Apr 2017 23:59:41 +0000 (23:59 +0000)]
Merge "add surfaceflinger and servicemanager to animation class" into oc-dev
am:
f60ab4119e
Change-Id: Ib85f6365b77709576023afadd9b5465cfc755e99
TreeHugger Robot [Mon, 3 Apr 2017 23:51:34 +0000 (23:51 +0000)]
Merge "add surfaceflinger and servicemanager to animation class" into oc-dev
Alex Vakulenko [Sat, 1 Apr 2017 01:06:19 +0000 (18:06 -0700)]
pdx: Rework error reporting when transfering file and channel handles
There is a lot of confusion about reporting errors when passing file
and channel handles over PDX transport between client and service.
Methods like Message::PushFileHandle return an integer which means
both a file handle reference value (if positive) and a possible error
code (if negative). But file handles could contain negative values too
(when they are empty). This is used frequently when passing buffer
fences around (when a fence is not being used, its fd is set to -1).
This results in a special case of when PushFileHandle is called with
a file handle with value of -1, the return value is actually "-errno"
which becomes dependent on a global state (errno is not set by
PushFileHandle itself in case file handle value is negative) and results
in unpredicted behavior (sometimes errno is 0, sometimes its >0).
Cleaned this all up by using Status<T> everywhere we used an int to
pass value payload along with possible error code.
Now the semantics of the calls are more clear.
Bug:
36866492
Test: `m -j32` for sailfish-eng succeeds
Ran unit tests on device (pdx_tests, libpdx_uds_tests, bufferhub_tests,
buffer_hub_queue-test, buffer_hub_queue_producer-test), all pass
Ran CubeSea, NativeTreasureHunt and Ithaca on Sailfish with vrflinger
enabled, was able to use controller and screen rendered correctly.
Change-Id: I0f40c3f356fcba8bc217d5219a0ddf9685e57fd7
Jiwen 'Steve' Cai [Mon, 3 Apr 2017 23:06:18 +0000 (23:06 +0000)]
Merge "Use gralloc1 usage in AHardwareBuffer_describe" into oc-dev
am:
b2a1ac9ee4
Change-Id: If0617be00de4cbcb74ad2016475cc365ce6f4d5a
Courtney Goeltzenleuchter [Mon, 3 Apr 2017 22:11:30 +0000 (16:11 -0600)]
Remove driver workaround
Appears that the workaround for bug #
34177594 is no longer
necessary, so removing.
Bug:
34177594
Test: Run Vulkan app
Change-Id: Id574760bdea775ac7541a9657b5a8124eb9064ef
TreeHugger Robot [Mon, 3 Apr 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Use gralloc1 usage in AHardwareBuffer_describe" into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 22:41:02 +0000 (16:41 -0600)]
Offer to "fixup" GIDs used for app data.
We recently started tracking cached app data using a per-app GID for
the "cache" and "code_cache" directories and their contents. For
upgraded devices, we ideally want to "fixup" the GIDs of any existing
data while the device is still showing the boot animation, instead of
blocking the user when they unlock the device.
Since all the information we need is available in metadata, we can
update GIDs before the user has unlocked data. We're pretty paranoid
and we only pivot between the normal app GID and the cache GID; any
other GID values are ignored.
This "fixup" method can also be used in the future to ensure
consistency of the files on disk. Also fix bug by always using
"fts_path" instead of "fts_accpath" which is based on racy chdir().
Test: /data/nativetest/installd_service_test/installd_service_test
Bug:
34201111,
35084485
Change-Id: Ia52694f3763cba09926082c08f0766477e03e39c
Mathias Agopian [Mon, 3 Apr 2017 22:34:13 +0000 (15:34 -0700)]
Add VNDK API to access AHardwareBuffer from ANativeWindowBuffer
this is to allow vendors to use AHardwareBuffer’s
lock/unlock on buffer dequeued from an
ANativeWindow.
Test: compiled
Bug:
36866217
Change-Id: If630105572ae0e57f6fda19c13e82150f415ed6b
Yin-Chia Yeh [Wed, 29 Mar 2017 02:07:39 +0000 (19:07 -0700)]
Surface: add getRemovedBuffer API
This allows clients to optionally sign up to track
buffers going out of Surface.
Test: compile
Bug:
34461678
Change-Id: I8696b304c169099c872bd9ba783015c0f0dad73a
Martijn Coenen [Fri, 31 Mar 2017 23:12:12 +0000 (16:12 -0700)]
vndservicemanager: load vendor service_contexts.
Also, don't crash when /dev/vndbinder is not
accessible.
Bug:
36052864
Test: loads vendor service contexts
Test: doesn't crash without /dev/vndbinder, works with it
Change-Id: Ida9dd94791206e14246348a8b8e66be09ed8fca7
Jiwen 'Steve' Cai [Fri, 24 Mar 2017 21:03:06 +0000 (14:03 -0700)]
Harden BufferHubQueueProducerTest
This is a test that covers our implementation of bufferhubqueue-based
IGraphicBufferProducer, which eventually enables VrCore/VrFlinger to
access buffers produced from other Android compontents. Note that the
gtest itself is a (slightly) modified version of
IGraphicBufferProducer_test.cpp.
This also improves BufferHubQueue in the following way to support more
features of android::BufferQueue.
1/ Supports more buffer queue parameters that we query.
2/ BufferHubQueue (the PDX client) now supports default width, height,
and format configuration.
3/ Change default max_dequeue_buffer_count to 1 (which is the same
behavior current android::BufferQueue adopts).
4/ Fill in |QueueBufferOutput| during |enqueueBuffer|.
Bug:
34197998
Bug:
36266201
Test: build and run buffer_hub_queue_producer-test
Change-Id: I9d3e8bb66dbfb66e67ab7b0e5093e49a3f374e9c
Yifan Hong [Wed, 29 Mar 2017 00:21:21 +0000 (17:21 -0700)]
Renamed HIDL SensorManager::mManager -> mInternalManager.
Use "Internal" to represent objects of the wrapped type.
Test: pass
Change-Id: I4f86bc2c7c272c9abb0c5b4c2837baccfdc2a748
Jeff Sharkey [Mon, 3 Apr 2017 17:28:06 +0000 (17:28 +0000)]
Merge "We really want f_frsize." into oc-dev
am:
623912183d
Change-Id: I735d29c3f09a3c8ebc44d11539aba836254502d6
Chia-I Wu [Tue, 21 Mar 2017 20:15:39 +0000 (13:15 -0700)]
libui: clean up GraphicBuffer interface
Other than transferring the ownership, some callers want to control
whether to register or to clone the handle when creating a
GraphicBuffer from a handle. Add a new constructor with
HandleWrapMethod for finer controls, to replace the one that has
only a boolean, keepOwnership.
The motivation is to enable users to construct GraphicBuffer without
fighting with GraphicBufferMapper::registerBuffer first. More
generally, GraphicBufferMapper::{registerBuffer,unregisterBuffer} is
tricky to use correctly. They should really be considered private
by most.
While at it, deprecate constructors that do not distinguish
producer/consumer usage. It turns out GraphicBuffer is used by some
proprietary libraries. I have to maintain the ABI and cannot remove
the deprecated constructors.
Bug:
36355756
Test: boots
Change-Id: Ieea618d8495f06a6233299d076fb821127cd6bf8
TreeHugger Robot [Mon, 3 Apr 2017 07:37:44 +0000 (07:37 +0000)]
Merge "We really want f_frsize." into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 05:50:12 +0000 (05:50 +0000)]
Merge "Define upper-bound disk quotas for all apps." into oc-dev
am:
c86462b7c0
Change-Id: I1ea5db7d8f556fbc04d300fcc4fe8532ea349610
TreeHugger Robot [Mon, 3 Apr 2017 05:46:04 +0000 (05:46 +0000)]
Merge "Define upper-bound disk quotas for all apps." into oc-dev
Jeff Sharkey [Mon, 3 Apr 2017 05:29:30 +0000 (23:29 -0600)]
We really want f_frsize.
It's confusing, but f_bsize is not the value you're looking for; the
real block size is f_frsize. Fix all those bugs.
Test: builds, boots
Bug:
36840579
Change-Id: I2846b8998c27f3e9a71dbf573a0a22158215a3bd
Jeff Sharkey [Mon, 3 Apr 2017 03:53:14 +0000 (21:53 -0600)]
Define upper-bound disk quotas for all apps.
Abusive or broken apps can go crazy and try allocating all of the
disk space on the device. To mitigate the impact on system health,
set hard limits to block any given app from using more than 90% of
disk blocks, or 50% of disk inodes.
Also define the hard limit for AID_MEDIA_RW to avoid filling up the
device via the SD card.
Kick QUOTAON when scanning devices, since ext4 doesn't toggle
DQUOT_LIMITS_ENABLED during initial mount.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsOsTestCases -t android.os.cts.EnvironmentTest#testSaneInodes
Bug:
36450358
Change-Id: Iaa2bc6a2f0bc9047ee54c1d1a49bbda92142457a
Cody Northrop [Sun, 2 Apr 2017 13:56:22 +0000 (13:56 +0000)]
Merge "surfaceflinger: Generate unique layer names" into oc-dev
am:
c3bae03442
Change-Id: Ic4eaacc2d01ff92403eadcf8e666b2892063bef7
Cody Northrop [Sun, 2 Apr 2017 13:52:40 +0000 (13:52 +0000)]
Merge "surfaceflinger: Generate unique layer names" into oc-dev
Fabien Sanglard [Sat, 1 Apr 2017 22:20:01 +0000 (22:20 +0000)]
Merge "[libadapter] Fix nullpointer in acceptchanges" into oc-dev
am:
041e0ad654
Change-Id: I2271e20a406d6278156437b9064efedcdb5ce315
TreeHugger Robot [Sat, 1 Apr 2017 22:15:50 +0000 (22:15 +0000)]
Merge "[libadapter] Fix nullpointer in acceptchanges" into oc-dev
Yin-Chia Yeh [Sat, 1 Apr 2017 22:00:59 +0000 (22:00 +0000)]
DO NOT MERGE: ConsumerBase: call freeBufferLocked when a slot is overwritten
am:
723c489872
Change-Id: I801da460d77c2d180bc92058db0c19b61171eb4a
Fabien Sanglard [Thu, 30 Mar 2017 23:27:02 +0000 (16:27 -0700)]
[libadapter] Fix nullpointer in acceptchanges
Check the layer still exists upon accepting changes.
Bug:
36205238
Test: AUPT
Change-Id: I8443265ecc7b8b0a12347439fd75b138d14c7e3a
Yin-Chia Yeh [Thu, 30 Mar 2017 20:13:36 +0000 (13:13 -0700)]
DO NOT MERGE: ConsumerBase: call freeBufferLocked when a slot is overwritten
Cherrypicked from master.
Test: the CL + camera service side fix pass ReprocessCaptureTest
Bug:
34461678
Change-Id: Ia7863321bcb46cba53532fc1570c5facd9280aaa
Chris Forbes [Sat, 1 Apr 2017 06:12:09 +0000 (06:12 +0000)]
Merge "vulkan: Dequeue the shared buffer again after presenting" into oc-dev
am:
f2e5430b95
Change-Id: I5ae7ff9a5ef0c090149240ccf2613238e48d6b93
TreeHugger Robot [Sat, 1 Apr 2017 06:08:37 +0000 (06:08 +0000)]
Merge "vulkan: Dequeue the shared buffer again after presenting" into oc-dev
Chris Forbes [Sat, 1 Apr 2017 05:53:08 +0000 (05:53 +0000)]
Merge "vulkan: Don't dequeue in AcquireNextImageKHR if in shared mode" into oc-dev
am:
fc812651f8
Change-Id: I118883870b127072f9a68e46d2c3fe82127f228b
TreeHugger Robot [Sat, 1 Apr 2017 05:46:12 +0000 (05:46 +0000)]
Merge "vulkan: Don't dequeue in AcquireNextImageKHR if in shared mode" into oc-dev
Alex Sakhartchouk [Sat, 1 Apr 2017 04:48:34 +0000 (04:48 +0000)]
Merge "Allow VirtualDisplay's to use hardware composer when in VR mode even if physical composer does not support them." into oc-dev
am:
a396414e05
Change-Id: Ie5a3ef84f7b3b8766d169dccd29e3b33b13788ce
TreeHugger Robot [Sat, 1 Apr 2017 04:45:36 +0000 (04:45 +0000)]
Merge "Allow VirtualDisplay's to use hardware composer when in VR mode even if physical composer does not support them." into oc-dev
Chris Forbes [Sat, 1 Apr 2017 04:38:34 +0000 (04:38 +0000)]
Merge changes I9ad4588e,I83a676fc,I749242c4,Idc0d3c23 into oc-dev
am:
10c51c70ea
Change-Id: I8defa286ce9cd0e4eed2fdc45a16d9027e239826
TreeHugger Robot [Sat, 1 Apr 2017 04:34:44 +0000 (04:34 +0000)]
Merge changes I9ad4588e,I83a676fc,I749242c4,Idc0d3c23 into oc-dev
* changes:
vulkan: Only cancel buffers during swapchain creation if not shared
vulkan: Set shared & auto refresh modes earlier
vulkan: Track whether in shared mode in Swapchain
vulkan: Always request at least 2 images for swapchain
Tony Mak [Sat, 1 Apr 2017 01:10:36 +0000 (01:10 +0000)]
Merge "Add UID in bugreport" into oc-dev
am:
42f1c7b9cb
Change-Id: Iaeae8f0b96fd472c696099de6743a7b7add11712
TreeHugger Robot [Sat, 1 Apr 2017 01:01:37 +0000 (01:01 +0000)]
Merge "Add UID in bugreport" into oc-dev
Jiwen 'Steve' Cai [Fri, 31 Mar 2017 23:34:45 +0000 (16:34 -0700)]
Use gralloc1 usage in AHardwareBuffer_describe
GraphicBuffer->getUsage() reports gralloc0 usage bits, convert it to
gralloc1 usage first then to AHardwareBuffer bits.
Bug:
35114769
Test: AImageReaderCts now passes with CPU_READ_OFTEN case.
Change-Id: Id461d9f9e98ccc1db8c4b4da79c61b9aedb417bf
Dan Stoza [Fri, 31 Mar 2017 22:56:22 +0000 (22:56 +0000)]
Merge "Add default .clang-format" into oc-dev
am:
b412406208
Change-Id: I9486743691139829a7ed53be1bf2eaf83451aa87
TreeHugger Robot [Fri, 31 Mar 2017 22:51:45 +0000 (22:51 +0000)]
Merge "Add default .clang-format" into oc-dev
Cody Northrop [Fri, 31 Mar 2017 18:00:08 +0000 (12:00 -0600)]
surfaceflinger: Generate unique layer names
Add a counter to layer names to make it clear when there are duplicates.
layer foo#0
layer foo#1
layer bar#0
layer bar#1
layer bar#2
Bug: b/
32543755
Test: Build, install, run game with duplicate layers, see unique names.
Change-Id: I915531d7adbdc506c429b86a685665fb6c56d25e
Alex Vakulenko [Fri, 31 Mar 2017 22:01:13 +0000 (22:01 +0000)]
bufferhubd: Fix an error on not closing post_fence explicitly.
am:
052f3aeb8c
Change-Id: I4d8f0951f31a62847b048be1db62603abe765c3a
Alex Vakulenko [Fri, 31 Mar 2017 22:01:03 +0000 (22:01 +0000)]
libbufferhub: Fix compiler warning with printf format mismatch
am:
a1336cf0de
Change-Id: Ie3b510a88b7ecdac194027d5761c0a9cc4a9a70b
Alex Vakulenko [Fri, 31 Mar 2017 22:00:53 +0000 (22:00 +0000)]
libpdx_uds: Improve client connection logic
am:
4782814b34
Change-Id: I9b1653020b4f619d9761a66886e73a962fc26777
Alex Vakulenko [Fri, 31 Mar 2017 22:00:44 +0000 (22:00 +0000)]
Remove unused dependency on libhardware from bufferhubd
am:
4ab4aa40eb
Change-Id: I8055ca59179a3097ec3b516b024800bc8c3acef8
Alex Vakulenko [Fri, 31 Mar 2017 22:00:35 +0000 (22:00 +0000)]
libbufferhubqueue: Fix syntax in Android.bp
am:
734c7ec57e
Change-Id: Idb0c63c51ad757ca9bd803d89e70d985abe889df
Keun-young Park [Thu, 23 Mar 2017 20:46:54 +0000 (13:46 -0700)]
add surfaceflinger and servicemanager to animation class
- necessary for running shutdown animation
bug:
36526187
Test: many reboots
Change-Id: Id26f5747a8903e91db8499093a489409dcafa129
Alex Vakulenko [Fri, 31 Mar 2017 16:10:43 +0000 (09:10 -0700)]
bufferhubd: Fix an error on not closing post_fence explicitly.
There is a typo in the code that instead of calling close() on a Post
fence, actually did get_fd() which is really a no-op.
Fixed by changing the call to call() explicitly.
Bug: None
Test: `m -j32` succeeds. Sailfish boots, CubeSea works.
Change-Id: If788aa8ea291317f0618724ecc35a4b355575772
Alex Vakulenko [Fri, 31 Mar 2017 15:29:28 +0000 (08:29 -0700)]
libbufferhub: Fix compiler warning with printf format mismatch
std::vector<bool>::at() does not return bool& but a special reference
proxy class. Passing this class on the stack for "%d" printf specifier
is unsafe.
Compiler throws a warning to indicate this problem:
format specifies type 'int' but the argument has type 'reference'
(aka '__bit_reference<std::__1::vector<bool, std::__1::allocator<bool>>>')
Fixed by explicitly casting to int before pushing the value onto the stack.
Bug: None
Test: `m -j32` = no more warning
Change-Id: I7b3bc4908e4932c25be60fc350e0e0b439842b66
Alex Vakulenko [Fri, 24 Mar 2017 00:44:58 +0000 (17:44 -0700)]
libpdx_uds: Improve client connection logic
Handle the case where the service created a socket file but not bound the
socket to it, or not listening for incoming requests yet. Also, if the service
has crashed and left the socket file behind, need to make sure we reconnect
once the service is restarted.
Bug: None
Test: `m -j32` succeeds, device boots and CubeSea app works on Sailfish
Change-Id: I2039cfca6faccd5d1d4b725e454075669484b880
(cherry picked from commit
d074fc416a7a90e76a0b28a870080c1dd30079a1)