OSDN Git Service
Robert Carr [Tue, 7 Jun 2016 20:49:50 +0000 (20:49 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am:
c3da482bb8
am:
34703b94e1
* commit '
34703b94e1a9f97f5b225c1b35433a90f8686e38':
SurfaceFlinger: Add mode to apply position with resize.
Change-Id: I403895e6e6367377c88b5767e10703d3cb6a5d05
Robert Carr [Tue, 7 Jun 2016 20:47:01 +0000 (20:47 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
am:
c3da482bb8
* commit '
c3da482bb8081ee2c19b5965585267b8e21cfc7e':
SurfaceFlinger: Add mode to apply position with resize.
Change-Id: Ic185f162bdb765dfdd19ce35f3dd94e29bb8dea3
TreeHugger Robot [Tue, 7 Jun 2016 20:42:03 +0000 (20:42 +0000)]
Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev
Android Build Merger (Role) [Tue, 7 Jun 2016 19:31:01 +0000 (19:31 +0000)]
Merge "Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am:
0950fb3d20 am:
eaaa9ae321" into nyc-mr1-dev-plus-aosp
Janis Danisevskis [Tue, 7 Jun 2016 19:30:49 +0000 (19:30 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am:
0950fb3d20
am:
2781021734
* commit '
2781021734fe254bedca87adb90c2313459ecf6a':
Fix Parcelable::readParcelableVector<T>
Change-Id: I06a0508bfa9e12b0559caa9986eb111c649676b4
Janis Danisevskis [Tue, 7 Jun 2016 19:30:49 +0000 (19:30 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev am:
0950fb3d20
am:
eaaa9ae321
* commit '
eaaa9ae3212ebe9b3d2b9a592a7958afb15bf7d7':
Fix Parcelable::readParcelableVector<T>
Change-Id: I254056ea16b3ffdb16bf0d9f46fb046f4e563dec
Janis Danisevskis [Tue, 7 Jun 2016 19:28:25 +0000 (19:28 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
am:
0950fb3d20
* commit '
0950fb3d20d100f62961db1cc3eff51b51f9ca6b':
Fix Parcelable::readParcelableVector<T>
Change-Id: I4fd443663515eec05d992bf42263fea7d9bdc7c4
Janis Danisevskis [Tue, 7 Jun 2016 19:28:25 +0000 (19:28 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
am:
0950fb3d20
* commit '
0950fb3d20d100f62961db1cc3eff51b51f9ca6b':
Fix Parcelable::readParcelableVector<T>
Change-Id: I892d88cfe9fe2df69bf390ce0618c03980b52753
Janis Danisevskis [Tue, 7 Jun 2016 19:23:45 +0000 (19:23 +0000)]
Merge "Fix Parcelable::readParcelableVector<T>" into nyc-dev
Robert Carr [Sun, 15 May 2016 18:27:47 +0000 (11:27 -0700)]
SurfaceFlinger: Add mode to apply position with resize.
For some cases, like scaled windows with shadows,
we need to be able to apply the position concurrent with
window resize. This is because the scaling of the shadows causes
the top left coordinate of the non shadow surface content
to change before and after the resize.
Bug:
28899837
Change-Id: I522eacfbbcd79707dc1e5ab71901a263b3004ba9
Android Build Merger (Role) [Mon, 6 Jun 2016 20:24:15 +0000 (20:24 +0000)]
Merge "Merge "Enable profman pretty printing" into nyc-dev am:
572e23d761 am:
09c6c75d24" into nyc-mr1-dev-plus-aosp
David Sehr [Mon, 6 Jun 2016 20:23:50 +0000 (20:23 +0000)]
Merge "Enable profman pretty printing" into nyc-dev am:
572e23d761
am:
09c6c75d24
* commit '
09c6c75d24994fff62252e98b7d27e5ef0df9158':
Enable profman pretty printing
Change-Id: I41a489fea66d05299acb1a22391ff8c2fed69fe2
David Sehr [Mon, 6 Jun 2016 20:23:49 +0000 (20:23 +0000)]
Merge "Enable profman pretty printing" into nyc-dev am:
572e23d761
am:
1ddf4d8d51
* commit '
1ddf4d8d51ba79b4efa6fe2575c6813fd619c04f':
Enable profman pretty printing
Change-Id: I401f2db6b29f66b27c71591f6335a297b3bd01cb
David Sehr [Mon, 6 Jun 2016 20:21:16 +0000 (20:21 +0000)]
Merge "Enable profman pretty printing" into nyc-dev
am:
572e23d761
* commit '
572e23d7614485a06102b00667d003b21b874bf9':
Enable profman pretty printing
Change-Id: Ib2e450b89b2805de265c44b670ab414af1b8e6ac
David Sehr [Mon, 6 Jun 2016 20:21:15 +0000 (20:21 +0000)]
Merge "Enable profman pretty printing" into nyc-dev
am:
572e23d761
* commit '
572e23d7614485a06102b00667d003b21b874bf9':
Enable profman pretty printing
Change-Id: I9ab3bbb8b940b83b3d5911932776cbdcb47f7cff
David Sehr [Mon, 6 Jun 2016 20:16:10 +0000 (20:16 +0000)]
Merge "Enable profman pretty printing" into nyc-dev
Android Build Merger (Role) [Mon, 6 Jun 2016 19:42:47 +0000 (19:42 +0000)]
Merge "Merge "SF: Also edit currentState in doTransaction" into nyc-dev am:
d224e6111b am:
d21cb6d2d9" into nyc-mr1-dev-plus-aosp
Pablo Ceballos [Mon, 6 Jun 2016 19:42:36 +0000 (19:42 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev am:
d224e6111b
am:
12863b2a1d
* commit '
12863b2a1d7c97e99b7201ae6209f5c861fd46a7':
SF: Also edit currentState in doTransaction
Change-Id: Ia1367baa3da6415e46caccc1ec75c8ac9026d131
Pablo Ceballos [Mon, 6 Jun 2016 19:42:36 +0000 (19:42 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev am:
d224e6111b
am:
d21cb6d2d9
* commit '
d21cb6d2d9a5819c3427df1be4470bcc8baf3c6a':
SF: Also edit currentState in doTransaction
Change-Id: Ibdd0b9d5ca307c0bbc59b5be5d1f47cf51e67e5f
Pablo Ceballos [Mon, 6 Jun 2016 19:37:38 +0000 (19:37 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am:
d224e6111b
* commit '
d224e6111bf4532fb1c1fc021c20285b38bc80ec':
SF: Also edit currentState in doTransaction
Change-Id: I6bcd675d033cc1ef46d3498174b2bc52a0072f99
Pablo Ceballos [Mon, 6 Jun 2016 19:37:38 +0000 (19:37 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
am:
d224e6111b
* commit '
d224e6111bf4532fb1c1fc021c20285b38bc80ec':
SF: Also edit currentState in doTransaction
Change-Id: I30b6170c8f41a7e330511ad70abd2257a34bdee2
Pablo Ceballos [Mon, 6 Jun 2016 19:32:15 +0000 (19:32 +0000)]
Merge "SF: Also edit currentState in doTransaction" into nyc-dev
David Sehr [Thu, 2 Jun 2016 17:42:12 +0000 (10:42 -0700)]
Enable profman pretty printing
Bug:
28748264
Change-Id: Ia625a7976d9b95ec3b7e1d03af39af9f39015f3b
Android Build Merger (Role) [Mon, 6 Jun 2016 16:35:13 +0000 (16:35 +0000)]
Merge "Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev am:
09e5f59bc9 am:
fc06a1a55b" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 6 Jun 2016 16:35:12 +0000 (16:35 +0000)]
Merge "Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev am:
09e5f59bc9 am:
fbcc332c85" into nyc-mr1-dev-plus-aosp
Mike Stroyan [Mon, 6 Jun 2016 16:35:02 +0000 (16:35 +0000)]
Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev am:
09e5f59bc9
am:
fc06a1a55b
* commit '
fc06a1a55b5577d9e7269e640a062edd81867bcb':
libgui: Check result in hook_dequeueBuffer_DEPRECATED
Change-Id: Ifab75cd0a3daee5bcbbb38c533baccf0c3fdddf3
Craig Donner [Mon, 6 Jun 2016 16:35:01 +0000 (16:35 +0000)]
Merge "Allow setting alpha to 0 when creating native client buffers." into nyc-dev am:
02afa28ccd
am:
720a7662ba
* commit '
720a7662babebd5ffca4f7e72b0239b4192f2056':
Change-Id: I69fb326cc78e85865f6245952d3f9231664d442b
Mike Stroyan [Mon, 6 Jun 2016 16:35:01 +0000 (16:35 +0000)]
Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev am:
09e5f59bc9
am:
fbcc332c85
* commit '
fbcc332c85cb856633d72088a65f55277f5fee23':
libgui: Check result in hook_dequeueBuffer_DEPRECATED
Change-Id: Ia801cc60607c0b5e01bc0a28e1ad8d9e81347615
Mike Stroyan [Mon, 6 Jun 2016 16:32:32 +0000 (16:32 +0000)]
Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev
am:
09e5f59bc9
* commit '
09e5f59bc9a371c7b83153bb51543ec759684227':
libgui: Check result in hook_dequeueBuffer_DEPRECATED
Change-Id: If91c49dfef52a64c3721da737658cf4645c13fc1
Mike Stroyan [Mon, 6 Jun 2016 16:32:32 +0000 (16:32 +0000)]
Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev
am:
09e5f59bc9
* commit '
09e5f59bc9a371c7b83153bb51543ec759684227':
libgui: Check result in hook_dequeueBuffer_DEPRECATED
Change-Id: I2364a946b82e4f87ec035fca331746bac92d85ee
Craig Donner [Mon, 6 Jun 2016 16:32:32 +0000 (16:32 +0000)]
Merge "Allow setting alpha to 0 when creating native client buffers." into nyc-dev am:
02afa28ccd
am:
79b4cee9e9
* commit '
79b4cee9e9ec74ed0159096c342f16c22503a621':
Allow setting alpha to 0 when creating native client buffers.
Change-Id: Iaae5b2e85b94c22e53c647a08adb52ec115f8cfd
Craig Donner [Mon, 6 Jun 2016 16:30:11 +0000 (16:30 +0000)]
Merge "Allow setting alpha to 0 when creating native client buffers." into nyc-dev
am:
02afa28ccd
* commit '
02afa28ccdb2cd82a51f938777944c2c8cf857ce':
Allow setting alpha to 0 when creating native client buffers.
Change-Id: I9734162b72ece7870c7722143eaa2e14416dd807
Craig Donner [Mon, 6 Jun 2016 16:30:11 +0000 (16:30 +0000)]
Merge "Allow setting alpha to 0 when creating native client buffers." into nyc-dev
am:
02afa28ccd
* commit '
02afa28ccdb2cd82a51f938777944c2c8cf857ce':
Allow setting alpha to 0 when creating native client buffers.
Change-Id: I811af889ed50ebd0b6dd0a676f106a2b78589f26
Mike Stroyan [Mon, 6 Jun 2016 16:29:41 +0000 (16:29 +0000)]
Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev
Craig Donner [Mon, 6 Jun 2016 16:18:23 +0000 (16:18 +0000)]
Merge "Allow setting alpha to 0 when creating native client buffers." into nyc-dev
Mike Stroyan [Fri, 3 Jun 2016 18:43:26 +0000 (12:43 -0600)]
libgui: Check result in hook_dequeueBuffer_DEPRECATED
Surface::hook_dequeueBuffer_DEPRECATED calls c->dequeueBuffer without
checking the returned result value. It should check for failing
result and return on error without using the values that
c->dequeueBuffer did not set.
Bug:
28692406
Change-Id: I10f9a23ad1052c5149040124366e0eb91b616267
Android Build Merger (Role) [Sat, 4 Jun 2016 02:53:55 +0000 (02:53 +0000)]
Merge "libvulkan: reduce log level for swapchain usage errors am:
42a9eecb23 am:
b3f21e4359" into nyc-mr1-dev-plus-aosp
Jesse Hall [Sat, 4 Jun 2016 02:53:44 +0000 (02:53 +0000)]
libvulkan: reduce log level for swapchain usage errors am:
42a9eecb23
am:
efe5eeace0
* commit '
efe5eeace0fb6c1681ff8db1f40f6f5df8202931':
libvulkan: reduce log level for swapchain usage errors
Change-Id: Ia2acf2de482efd244d7170e5c9187b1b1ab4e41e
Jesse Hall [Sat, 4 Jun 2016 02:53:44 +0000 (02:53 +0000)]
libvulkan: reduce log level for swapchain usage errors am:
42a9eecb23
am:
b3f21e4359
* commit '
b3f21e43595d24066111635a0ca79fffd5e8f297':
libvulkan: reduce log level for swapchain usage errors
Change-Id: I11957e49a5022eca6d994af6929a7fbe237fa567
Jesse Hall [Sat, 4 Jun 2016 02:51:22 +0000 (02:51 +0000)]
libvulkan: reduce log level for swapchain usage errors
am:
42a9eecb23
* commit '
42a9eecb23c0b72bbee1eb2ef6b0d6586159d1c3':
libvulkan: reduce log level for swapchain usage errors
Change-Id: I5ebde0083399bc42cdef39177f63a0d0bffcb8f0
Jesse Hall [Sat, 4 Jun 2016 02:51:22 +0000 (02:51 +0000)]
libvulkan: reduce log level for swapchain usage errors
am:
42a9eecb23
* commit '
42a9eecb23c0b72bbee1eb2ef6b0d6586159d1c3':
libvulkan: reduce log level for swapchain usage errors
Change-Id: I8b053f14678f9e03497ac2b621e117df581d9779
Pablo Ceballos [Fri, 3 Jun 2016 00:46:05 +0000 (17:46 -0700)]
SF: Also edit currentState in doTransaction
Bug
28899837
Change-Id: I46c8301549c627c5d1c7efa661055aba787a33d6
Craig Donner [Sat, 4 Jun 2016 00:54:25 +0000 (17:54 -0700)]
Allow setting alpha to 0 when creating native client buffers.
Note that RGBA sizes are checked later in the function anyway, so there was no
reason to disallow 0, but it did preclude setting alpha to 0 for 565 buffers.
Fixes:
29126799
Change-Id: Iba11649976221ab385227fc022ae74b14c342203
Janis Danisevskis [Fri, 20 May 2016 17:10:04 +0000 (18:10 +0100)]
Fix Parcelable::readParcelableVector<T>
Parcelable::readParcelableVector<T> was apparently never
used. It now is and needed some adjustments to actually
work.
Bug:
22914603
Change-Id: I58ead3b3956299d549cff245588f56f3220563d3
Jesse Hall [Fri, 3 Jun 2016 19:39:49 +0000 (12:39 -0700)]
libvulkan: reduce log level for swapchain usage errors
Bug:
26927424
Change-Id: Id9346356436663db83a2d6fa8fefc4ea24d7854b
Andreas Gampe [Fri, 3 Jun 2016 15:43:41 +0000 (15:43 +0000)]
Merge "Otapreopt: Fix after shared-library work" into nyc-mr1-dev
am:
3dfafe3891
* commit '
3dfafe38915b9251eb2cc597be3efe60807c0e43':
Otapreopt: Fix after shared-library work
Change-Id: Ie2e78d48f4766dd8b103c3d40b6b78a1ea42fbae
Andreas Gampe [Fri, 3 Jun 2016 15:29:20 +0000 (15:29 +0000)]
Merge "Otapreopt: Fix after shared-library work" into nyc-mr1-dev
Andreas Gampe [Fri, 3 Jun 2016 00:56:45 +0000 (17:56 -0700)]
Otapreopt: Fix after shared-library work
Commit
b63d91fd2737680351876406277b6c759f4db33c broke the installd
to otapreopt connection. Fix this. Also refactor a bit to make an
inadvertant break harder.
Bug:
25612095
Change-Id: I8e7b944ecbd5457e4ac4d6ffffdb0468618cf65f
Jesse Hall [Fri, 3 Jun 2016 00:14:47 +0000 (00:14 +0000)]
Merge "libvulkan: Slightly better handling of swapchain re-creation" into nyc-dev am:
b2dcc3a122
am:
f42c82079b
* commit '
f42c82079b19fc0a2f75a95c335e6d70d9d4f740':
Change-Id: I3716545ec9b61d44457d3df6b0234cebdc172437
Jesse Hall [Fri, 3 Jun 2016 00:12:51 +0000 (00:12 +0000)]
Merge "libvulkan: Slightly better handling of swapchain re-creation" into nyc-dev am:
b2dcc3a122
am:
0b3e948c7d
* commit '
0b3e948c7d8e210edf23640bc2976229176565f3':
libvulkan: Slightly better handling of swapchain re-creation
Change-Id: Ib1e551884b040fbffa0f65bead58ca928538e887
Jesse Hall [Fri, 3 Jun 2016 00:12:50 +0000 (00:12 +0000)]
Merge "libvulkan: Slightly better handling of swapchain re-creation" into nyc-dev
am:
b2dcc3a122
* commit '
b2dcc3a1220ea5ef6acb5a63659da3c34b1a295a':
libvulkan: Slightly better handling of swapchain re-creation
Change-Id: I0f66b9e5521388eaf95ce29f5c1f44817780a7b9
Jesse Hall [Fri, 3 Jun 2016 00:05:07 +0000 (00:05 +0000)]
Merge "libvulkan: Slightly better handling of swapchain re-creation" into nyc-dev
am:
b2dcc3a122
* commit '
b2dcc3a1220ea5ef6acb5a63659da3c34b1a295a':
libvulkan: Slightly better handling of swapchain re-creation
Change-Id: Id0b2f616da6eae1c0be4bcdb1518721dd95fb0cf
Jesse Hall [Thu, 2 Jun 2016 23:57:02 +0000 (23:57 +0000)]
Merge "libvulkan: Slightly better handling of swapchain re-creation" into nyc-dev
Chia-I Wu [Thu, 2 Jun 2016 23:00:00 +0000 (23:00 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev am:
691fcb9603
am:
b7f89faca4
* commit '
b7f89faca430dfb048c3339dc6d5a7d3905eb401':
Change-Id: I48f6f0f810c88a5fb287dd11be896ff1cab8681e
Chia-I Wu [Thu, 2 Jun 2016 22:52:05 +0000 (22:52 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev am:
691fcb9603
am:
f05cb26281
* commit '
f05cb2628178098243af7d3047f936364e261b64':
vulkan: remove EnumerateDeviceLayerProperties internally
Change-Id: Ib54b022f4d9245ea8a00d4c413ef0224a873c76f
Chia-I Wu [Thu, 2 Jun 2016 22:49:38 +0000 (22:49 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev
am:
691fcb9603
* commit '
691fcb96033db2f09030e8c71e86dad7e2fbfd43':
vulkan: remove EnumerateDeviceLayerProperties internally
Change-Id: I4678a10c62147c7c69bf0f0e81e6e447ed819b2c
Chia-I Wu [Thu, 2 Jun 2016 22:49:38 +0000 (22:49 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev
am:
691fcb9603
* commit '
691fcb96033db2f09030e8c71e86dad7e2fbfd43':
vulkan: remove EnumerateDeviceLayerProperties internally
Change-Id: I6121447ccfc7794e4b716280c3180e3ef0033a2a
Chia-I Wu [Thu, 2 Jun 2016 22:36:26 +0000 (22:36 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev
Android Build Merger (Role) [Thu, 2 Jun 2016 18:21:20 +0000 (18:21 +0000)]
Merge "Merge "Camera: Add media/camera NDK documents" into nyc-dev am:
470241b168 am:
951dbcce95" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:29 +0000 (18:20 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev am:
470241b168
am:
951dbcce95
* commit '
951dbcce950b2fb06c85ff3724f673e3c997d2fc':
Camera: Add media/camera NDK documents
Change-Id: If46a7059f298d08efccd0c02a2ff038106e9f198
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:28 +0000 (18:20 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev am:
470241b168
am:
1212e59d1a
* commit '
1212e59d1a4c50e5edb9d6a1b2560f7e047b52a9':
Camera: Add media/camera NDK documents
Change-Id: I79ff714fe781cd40cfea574f76ebe5626be05505
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev
am:
470241b168
* commit '
470241b168a9db7514bc0df775109db591836d4b':
Camera: Add media/camera NDK documents
Change-Id: Id7dbb10ea403f8210c003b8ba83f9ae65106c73f
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:37 +0000 (18:17 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev
am:
470241b168
* commit '
470241b168a9db7514bc0df775109db591836d4b':
Camera: Add media/camera NDK documents
Change-Id: Ib66856fba84301834a81f0c361f5244bd152eeb3
Yin-Chia Yeh [Thu, 2 Jun 2016 18:12:21 +0000 (18:12 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev
Jesse Hall [Tue, 31 May 2016 05:40:14 +0000 (22:40 -0700)]
libvulkan: Slightly better handling of swapchain re-creation
Previously we would fail vkCreateSwapchainKHR if
VkSwapchainCreateInfo::oldSwapchain was used, because we were unable
to dequeue all buffers for the new swapchain from an already-used
native window.
Now we disconnect and re-connect to the native window in order to
fully reset state, and allow us to dequeue all buffers. Additionally,
we tag the old swapchain as out-of-date, so future image acquires and
presents will fail with VK_ERROR_OUT_OF_DATE_KHR on that swapchain.
This is less than ideal, but better than what we had, and the best we
have time to do for N.
Bug:
26927424
Change-Id: Ifaa5048376f72a63ecb1dca3d1ff85dbee2c24d0
Pablo Ceballos [Thu, 2 Jun 2016 17:25:27 +0000 (17:25 +0000)]
Merge "SF: Re-enable fence tracker by default" into nyc-mr1-dev
am:
30689c9e4c
* commit '
30689c9e4c7cbcfb1f537f224ab1b50f5fe0efa6':
SF: Re-enable fence tracker by default
Change-Id: I503b5724f8362df99305f9ca9f622a61b329826d
Android Build Merger (Role) [Thu, 2 Jun 2016 17:23:11 +0000 (17:23 +0000)]
Merge "Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am:
eb6377eb13 am:
217b5d19a6" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 17:23:07 +0000 (17:23 +0000)]
Merge "Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am:
08588dd760 am:
46e5b65075" into nyc-mr1-dev-plus-aosp
Pablo Ceballos [Thu, 2 Jun 2016 17:22:49 +0000 (17:22 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am:
eb6377eb13
am:
217b5d19a6
* commit '
217b5d19a6aa4e633214b5038ef5d74813ef336d':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: I9aa88cb2264ad95ff9e12db011a7aa957617c705
Pablo Ceballos [Thu, 2 Jun 2016 17:22:49 +0000 (17:22 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am:
08588dd760
am:
46e5b65075
* commit '
46e5b6507587ef5223d3a108275a69a533abed64':
Push empty sync transaction before taking screenshot in tests
Change-Id: I84f9eb94abee0d693507682c949aaba6e8371d4b
Pablo Ceballos [Thu, 2 Jun 2016 17:22:44 +0000 (17:22 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am:
eb6377eb13
am:
907e94d3da
* commit '
907e94d3da1215328fe3a5020cd5005e42499eba':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: I1a2dbf037ada7477838b3935d3084d1fea6bd09c
Pablo Ceballos [Thu, 2 Jun 2016 17:22:43 +0000 (17:22 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am:
08588dd760
am:
161a5bac18
* commit '
161a5bac18d7eca64b639f51cd9c78c51c2bf1a4':
Push empty sync transaction before taking screenshot in tests
Change-Id: Id8707fae4898b0108cf370949899aee4bf42fa97
Pablo Ceballos [Thu, 2 Jun 2016 17:21:42 +0000 (17:21 +0000)]
Merge "SF: Re-enable fence tracker by default" into nyc-mr1-dev
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev
am:
eb6377eb13
* commit '
eb6377eb133f902e737fab370df7679430a1d8d1':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: Ie66de8e99600c6c69ad1c5bb62c8adaaf3d43a71
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev
am:
08588dd760
* commit '
08588dd76073a8635aa4175d5b98fc5db86afec4':
Push empty sync transaction before taking screenshot in tests
Change-Id: Iad404364ca17d6a23ceca928d342d3931b2418f2
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev
am:
eb6377eb13
* commit '
eb6377eb133f902e737fab370df7679430a1d8d1':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: Ieb075d9598edcaec542ee06663aa292111968474
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev
am:
08588dd760
* commit '
08588dd76073a8635aa4175d5b98fc5db86afec4':
Push empty sync transaction before taking screenshot in tests
Change-Id: Id7648a55288f3f8962e6e314584c9690c3f27854
Pablo Ceballos [Thu, 2 Jun 2016 17:14:00 +0000 (17:14 +0000)]
Merge "BQ: Don't return fences from dequeue in shared buffer mode" into nyc-dev
Pablo Ceballos [Thu, 2 Jun 2016 17:10:06 +0000 (17:10 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev
Calin Juravle [Thu, 2 Jun 2016 10:57:34 +0000 (10:57 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev am:
d25aab3ce8
am:
11eff20096
* commit '
11eff20096c116fad518027d484af1e55a8aa6a9':
Change-Id: I87fd3dbdd02d119eea1e28fb346e8c22de155eba
Calin Juravle [Thu, 2 Jun 2016 10:36:56 +0000 (10:36 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev am:
d25aab3ce8
am:
8b31d72e90
* commit '
8b31d72e90a63c9f3dcc8bb1da2507c2cd6b684e':
Create primary profile file together with app data folders
Change-Id: Ice0f13c56d98fab704516b8974521cfd4f7ff54f
Calin Juravle [Thu, 2 Jun 2016 10:21:30 +0000 (10:21 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev
am:
d25aab3ce8
* commit '
d25aab3ce8aab1b95ac60922981c87c6963a0a6b':
Create primary profile file together with app data folders
Change-Id: I6f1febd72495ce95d657a79d0cf3454be50ccef5
Calin Juravle [Thu, 2 Jun 2016 10:21:26 +0000 (10:21 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev
am:
d25aab3ce8
* commit '
d25aab3ce8aab1b95ac60922981c87c6963a0a6b':
Create primary profile file together with app data folders
Change-Id: Id186b701d0cc755be0093c704ccd2aa8e0899611
Calin Juravle [Thu, 2 Jun 2016 10:10:35 +0000 (10:10 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev
Chia-I Wu [Thu, 2 Jun 2016 03:25:47 +0000 (11:25 +0800)]
vulkan: remove EnumerateDeviceLayerProperties internally
We never use it. Since it is also deprecated, we will never need it.
Bug:
27910383
Change-Id: If4e556bb69890153be2987b165482e43ab06a890
Pablo Ceballos [Thu, 2 Jun 2016 01:53:40 +0000 (18:53 -0700)]
Push empty sync transaction before taking screenshot in tests
Because of ag/
1043009 it's now necessary to push an empty sync
transaction before taking a screenshot to ensure that all transactions
have been applied.
Bug
29074285
Change-Id: I9f1b4a5b6b1f39e1ff26d536817aef6f40865177
David Sehr [Thu, 2 Jun 2016 00:11:51 +0000 (00:11 +0000)]
installd support for profman --dump-info-for am:
6727c2d0bf
am:
8e0965d0d4
* commit '
8e0965d0d465be5e711f92eab452cff75badfad6':
Change-Id: I7e7a560e8507d50af965be45659e23238cbcf951
Pablo Ceballos [Wed, 18 May 2016 00:52:08 +0000 (17:52 -0700)]
SF: Re-enable fence tracker by default
- Don't check whether the fences have completed or not unless the data
has been requested.
Bug
22431447
Change-Id: Id4cb8bfba38547884849ef23c9b6f42f0d4d0750
David Sehr [Wed, 1 Jun 2016 23:25:47 +0000 (23:25 +0000)]
installd support for profman --dump-info-for am:
6727c2d0bf
am:
eed4df8068
* commit '
eed4df806856e77d9d55d8209d7178e4b5c945e8':
installd support for profman --dump-info-for
Change-Id: I5b4a465e394b40370731d8350196d8d66f8e649a
David Sehr [Wed, 1 Jun 2016 23:09:26 +0000 (23:09 +0000)]
installd support for profman --dump-info-for
am:
6727c2d0bf
* commit '
6727c2d0bfc876c62d6ee60d8a05d26bef1d56ef':
installd support for profman --dump-info-for
Change-Id: I2289ea8e788f65deb158f422b1c3b4feb93b9477
David Sehr [Wed, 1 Jun 2016 23:09:19 +0000 (23:09 +0000)]
installd support for profman --dump-info-for
am:
6727c2d0bf
* commit '
6727c2d0bfc876c62d6ee60d8a05d26bef1d56ef':
installd support for profman --dump-info-for
Change-Id: I3df4eee3cb34f6c163e73351180b227b8d6864e8
Pablo Ceballos [Wed, 1 Jun 2016 22:03:21 +0000 (15:03 -0700)]
BQ: Don't return fences from dequeue in shared buffer mode
Bug
29007505
Change-Id: I112ae6bd64ddc9a923ad9080e85a71adb96146af
David Sehr [Tue, 17 May 2016 23:06:22 +0000 (16:06 -0700)]
installd support for profman --dump-info-for
Bug:
28748264
Change-Id: Idcd3ed86294c1d0c75c26ca938b88744a25e387a
Android Build Merger (Role) [Tue, 31 May 2016 20:03:02 +0000 (20:03 +0000)]
Merge "Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am:
e4ecdb66d5 am:
134ef03161" into nyc-mr1-dev-plus-aosp
Mark Salyzyn [Tue, 31 May 2016 20:02:52 +0000 (20:02 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am:
e4ecdb66d5
am:
5e91795065
* commit '
5e91795065d3c7e42de3f3853919cbc9c730c78c':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: I7ac169f6b366b482554bb053092863fdfc660e91
Mark Salyzyn [Tue, 31 May 2016 20:02:52 +0000 (20:02 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am:
e4ecdb66d5
am:
134ef03161
* commit '
134ef03161e51f7ba19c66f2dc823fb46189b4f3':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: I03076ba93ddfd612183afe2fcc8446796aeb4595
Mark Salyzyn [Tue, 31 May 2016 19:59:24 +0000 (19:59 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev
am:
e4ecdb66d5
* commit '
e4ecdb66d5c2eed64cbd5b267e0621cab7b8a63b':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: Id062b1b3998ab018654bc7830f275d1ac6d64f6d
Mark Salyzyn [Tue, 31 May 2016 19:59:23 +0000 (19:59 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev
am:
e4ecdb66d5
* commit '
e4ecdb66d5c2eed64cbd5b267e0621cab7b8a63b':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: I79d2d5ed2e742cf2923534e4f50a637b8edb1fff
Mark Salyzyn [Tue, 31 May 2016 19:44:18 +0000 (19:44 +0000)]
Merge "svcmgr: don't send reply to one-way txn (part deux)" into nyc-dev
Erik Kline [Tue, 31 May 2016 05:07:24 +0000 (05:07 +0000)]
Use explicit path for /vendor/xbin/wlutil am:
0816520c5c
am:
44d884b428
* commit '
44d884b428f3af89bdcac1950840fc94cd3b8af0':
Change-Id: Ic8ced92c2df57a8cb64547503ef8fba8f32f29d3
OSDN Git Service
