OSDN Git Service
Christopher Wiley [Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)]
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am:
dcc5575
am:
1c58569
* commit '
1c585692a37eef2d28e01db451879f7f53dc97a1':
Revert "libbinder: Replace ScopedFd with base::unique_fd"
Change-Id: Iae20ab4fac161b0785b011b42353ebf46de1c59a
Christopher Wiley [Mon, 18 Apr 2016 17:52:11 +0000 (17:52 +0000)]
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd""
am:
dcc5575
* commit '
dcc5575f9bb028ef3e64be52190b7f1abbbdf459':
Revert "libbinder: Replace ScopedFd with base::unique_fd"
Change-Id: I97e6ec2cb96f511a4dcf9fadec6e9567fc053f0c
Christopher Wiley [Mon, 18 Apr 2016 17:42:06 +0000 (17:42 +0000)]
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd""
Christopher Wiley [Mon, 18 Apr 2016 17:40:56 +0000 (17:40 +0000)]
Revert "libbinder: Replace ScopedFd with base::unique_fd"
This reverts commit
b12c5a67f9cf5a55f67c08bef898c48cefa9d03d.
Change-Id: I13ab8151376bc3bda7f96b92db7934720dc62215
Treehugger Robot [Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd" am:
747c0bb
am:
7a07e39
* commit '
7a07e39801a6bf1d4c1e35017da80a44ee4a343f':
libbinder: Replace ScopedFd with base::unique_fd
Change-Id: I88b06c3e6d86278024e135697a1a024d56ba86ee
Christopher Wiley [Mon, 18 Apr 2016 15:45:08 +0000 (15:45 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd"
am:
747c0bb
* commit '
747c0bb826190c4314b80c4f3d52b70e2c608ecb':
libbinder: Replace ScopedFd with base::unique_fd
Change-Id: Idfc993fe6805cb776b5c18e7967f409e58287a17
Treehugger Robot [Mon, 18 Apr 2016 15:35:30 +0000 (15:35 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd"
Peng Xu [Sat, 16 Apr 2016 04:48:47 +0000 (04:48 +0000)]
Merge "sensorservice: switch to use sp<> in sensor list" into nyc-dev
am:
47babb8
* commit '
47babb84bcd2dcf4943687e33595ba58dc0dbe28':
sensorservice: switch to use sp<> in sensor list
Change-Id: I14fa40721296f2937cd8df9b62e32874f0ddfe09
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:49:07 +0000 (23:49 +0000)]
Merge "Log when binder thread pool is starved" into nyc-dev
am:
43dcac7
* commit '
43dcac7500833c465c417805adc4693c60c3bb5e':
Log when binder thread pool is starved
Change-Id: I420d31273aec69eab9d8e4faa10001ef48b17aa8
Colin Cross [Fri, 15 Apr 2016 23:46:06 +0000 (23:46 +0000)]
Merge "Log when binder thread pool is starved" into nyc-dev
Craig Donner [Fri, 15 Apr 2016 21:34:02 +0000 (21:34 +0000)]
Merge "Adds spec for EGL_ANDROID_create_native_client_buffer." into nyc-dev
am:
3d15899
* commit '
3d158998fb2fb911f01dd478311435762bc0c3c5':
Adds spec for EGL_ANDROID_create_native_client_buffer.
Change-Id: Ia1d5a32087f38e4c6e1726d6ca8b050bdef1da2f
Gary Smith [Fri, 15 Apr 2016 21:34:01 +0000 (21:34 +0000)]
Merge "SF: Fix the delivery of visible and damage rects to HWC" into nyc-dev
am:
12402e3
* commit '
12402e34ad453f58e2c9d39fa65772f6cb09a0b6':
SF: Fix the delivery of visible and damage rects to HWC
Change-Id: I04fea542af9f217625c1e06e3efb4fefeea19551
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
Dan Stoza [Fri, 15 Apr 2016 20:56:20 +0000 (20:56 +0000)]
Merge "Revert "DispSync: Always resync after inactivity"" into nyc-dev
am:
ccf8058
* commit '
ccf8058396c3ac8d1e296b9c0ba5f6317cc90661':
Revert "DispSync: Always resync after inactivity"
Change-Id: I5bf3facc0f80feb4f7b994054a5fb812a84ffda8
Tim Murray [Fri, 15 Apr 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Revert "DispSync: Always resync after inactivity"" into nyc-dev
Mika Isojärvi [Fri, 15 Apr 2016 20:47:11 +0000 (20:47 +0000)]
Merge "White list EGL_EXT_yuv_surface extension" into nyc-dev
am:
7b05332
* commit '
7b05332fb6df7f6c7495890f108f78d4b0b408aa':
White list EGL_EXT_yuv_surface extension
Change-Id: I028f9ba9f60d621347fbce2c8c976edcc17557fd
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
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
Pablo Ceballos [Fri, 15 Apr 2016 18:38:04 +0000 (18:38 +0000)]
Merge "SF: Don\'t pop pending state into mCurrentState" into nyc-dev
am:
9eb286a
* commit '
9eb286a074a8b2764b69339b0958dc5b176f1a8d':
SF: Don't pop pending state into mCurrentState
Change-Id: Ieb6b0f2a24a00b4c54b0a544b81fc72899305036
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
Dan Stoza [Thu, 14 Apr 2016 23:47:37 +0000 (23:47 +0000)]
Merge "HWC2: Change version detection scheme" into nyc-dev
am:
8bf556e
* commit '
8bf556ec85af8d4d47aad5a19a0633cf8b0fa17e':
HWC2: Change version detection scheme
Change-Id: Id81873cee64b8bae46d1722970179d0a183d60a6
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:46:36 +0000 (22:46 +0000)]
Merge changes I05c45303,I25b71570,I56ebc0ee into nyc-dev
am:
87085d4
* commit '
87085d4f302d80cfe4fe5c5ef034608f206a1d16':
vulkan: fix vkGet*ProcAddr for un-enabled extensions
vulkan: do not query non-enabled WSI functions
vulkan: pass hal_extensions to InitDriverTable
Change-Id: I7a7246ca5f2ad3343543f79f41b415f206d715b1
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:50:31 +0000 (21:50 +0000)]
Merge "HWC2: Check SidebandStream capability on load" into nyc-dev
am:
d4797c2
* commit '
d4797c2f3f91474baef2653ed1221aa595cc96f3':
HWC2: Check SidebandStream capability on load
Change-Id: I76dcda5b00f9a965ac5eaf20a7295b61c523f6d3
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:13:08 +0000 (21:13 +0000)]
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk am:
d89d29d -s ours am:
f42496c -s ours
am:
0659765 -s ours
* commit '
0659765e79768906a7d26a3d49548bd31733a30f':
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk
Change-Id: I72fe069a95c9105d2005cfb272b9bfd39f472f26
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
Andy Hung [Thu, 14 Apr 2016 21:06:33 +0000 (21:06 +0000)]
Merge "Unify dumped native stack traces" into nyc-dev
am:
d74bcda
* commit '
d74bcdae53a9547fc6dea81055e8c3cf166d2909':
Unify dumped native stack traces
Change-Id: Ida78895baf045a86fcc9952074f5caa2519a3bc7
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>
Jorge Lucangeli Obes [Thu, 14 Apr 2016 17:21:05 +0000 (17:21 +0000)]
Merge "Run \'nativeperms\', remove Brillo #ifdef." am:
a7ba9d0
am:
f949746
* commit '
f949746cc4a6ce34b227fda53732ca8aa620499c':
Run 'nativeperms', remove Brillo #ifdef.
Change-Id: I97b63439e6ea55db2d5b7bde7cde514666e6d556
Pablo Ceballos [Thu, 14 Apr 2016 17:20:55 +0000 (17:20 +0000)]
Merge "egl: add EGL_KHR_mutable_render_buffer" into nyc-dev
am:
202e6e9
* commit '
202e6e932cfd9bd97053681da438146d151286cc':
egl: add EGL_KHR_mutable_render_buffer
Change-Id: I93c8be671d336f4d2f2341c8b5b11761f23c2800
Jorge Lucangeli Obes [Thu, 14 Apr 2016 17:17:51 +0000 (17:17 +0000)]
Merge "Run \'nativeperms\', remove Brillo #ifdef."
am:
a7ba9d0
* commit '
a7ba9d0abc640e28874b2bc3a2c184603cb91167':
Run 'nativeperms', remove Brillo #ifdef.
Change-Id: I53e34de00b5bd14e34081247be55afccba2b9260
Jorge Lucangeli Obes [Thu, 14 Apr 2016 17:10:50 +0000 (17:10 +0000)]
Merge "Run 'nativeperms', remove Brillo #ifdef."
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
Martijn Coenen [Thu, 14 Apr 2016 10:07:49 +0000 (10:07 +0000)]
Merge "Add missing include to choreographer header." am:
e2e44dd
am:
e5c89f3
* commit '
e5c89f334667a2fbecd87561ed6adba29227d5ac':
Add missing include to choreographer header.
Change-Id: Id1e0cbdfbe6220e955b39975ccbb7d039e0f5a83
Michael Wright [Thu, 14 Apr 2016 10:02:13 +0000 (10:02 +0000)]
Merge "Add missing include to choreographer header."
am:
e2e44dd
* commit '
e2e44ddc6b0830d03f55e1388c96ef66d1d00ed2':
Add missing include to choreographer header.
Change-Id: I4a1c74e32a587f063ee921dc6fa82cfe7dea6e83
Martijn Coenen [Thu, 14 Apr 2016 09:56:37 +0000 (09:56 +0000)]
Merge "Add NDK Choreographer API headers" am:
78e7eb7
am:
920838f -s ours
* commit '
920838f53eb73e0133b07098633357f7a2c2bad6':
Add NDK Choreographer API headers
Change-Id: Ic7bb76555186306c43e593a585f066bf3b72c6c7
Martijn Coenen [Thu, 14 Apr 2016 09:52:26 +0000 (09:52 +0000)]
Merge "Add missing include to choreographer header."
Michael Wright [Thu, 14 Apr 2016 08:19:10 +0000 (08:19 +0000)]
Merge "Add NDK Choreographer API headers"
am:
78e7eb7
* commit '
78e7eb71527dffd0d3fde4ee8109de812c79586a':
Add NDK Choreographer API headers
Change-Id: Icbffe174f0ed07f049ae844816ff25ae556bcb07
Michael Wright [Wed, 27 Jan 2016 00:05:54 +0000 (16:05 -0800)]
Add missing include to choreographer header.
Change-Id: Id497f3a505211309a08e100b369300e81f84b13b
Martijn Coenen [Thu, 14 Apr 2016 08:11:45 +0000 (08:11 +0000)]
Merge "Add NDK Choreographer API headers"
Andy Hung [Thu, 14 Apr 2016 02:35:34 +0000 (19:35 -0700)]
Unify dumped native stack traces
Bug:
28179196
Change-Id: Ie728ceace7aaf38389dd9684342e351feed6e5a7
Keun-young Park [Thu, 14 Apr 2016 01:41:35 +0000 (01:41 +0000)]
remove non-mandatory features from car_core
am:
6979bb9
* commit '
6979bb988915d22b3463aacdf4d86c5c8ab3b2ac':
remove non-mandatory features from car_core
Change-Id: I71bcb617139691b6c162e79919dc3e18cb73870f
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:59:51 +0000 (23:59 +0000)]
Merge "libbinder: Remove templated binder::Status stream operator." am:
9e413e9
am:
9ed41a7
* commit '
9ed41a7ee40d5d653d7cd632eab2830060ba0dbf':
libbinder: Remove templated binder::Status stream operator.
Change-Id: I82704846becfdcc5e1d9dabf6c369648e8971ec0
Ralph Nathan [Wed, 13 Apr 2016 23:57:38 +0000 (23:57 +0000)]
Merge "libbinder: Remove templated binder::Status stream operator."
am:
9e413e9
* commit '
9e413e9f1306b6160fff7e80086014965231fd06':
libbinder: Remove templated binder::Status stream operator.
Change-Id: Iba6064941ac6ff070eeb569b807705f9b77221b5
Treehugger Robot [Wed, 13 Apr 2016 23:53:25 +0000 (23:53 +0000)]
Merge "libbinder: Remove templated binder::Status stream operator."
Chia-I Wu [Wed, 13 Apr 2016 23:53:03 +0000 (23:53 +0000)]
Merge changes I7389829a,I4f3f91e8 into nyc-dev
am:
a0a4e0e
* commit '
a0a4e0ee2c4e4c2b186c180ba0970931e24c1d66':
vulkan: pass VK_LAYER_FUNCTION_DATA_CALLBACK to layers
vulkan: update vk_layer_interface.h
Change-Id: Id069248575f0542c1469639310cf0f9d88a8da48
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
Jorge Lucangeli Obes [Wed, 13 Apr 2016 23:42:34 +0000 (16:42 -0700)]
Run 'nativeperms', remove Brillo #ifdef.
Bug:
25663983
Change-Id: I5b9f9747695d75f84bdfb61f90d28e0e5fee612c
Jorge Lucangeli Obes [Wed, 13 Apr 2016 23:01:48 +0000 (23:01 +0000)]
Merge "Implement a stub permission server for Brillo tier 1." am:
941a290
am:
d0c163b
* commit '
d0c163be39cdbe6fc189f0b84e70abb1f7ac8f69':
Implement a stub permission server for Brillo tier 1.
Change-Id: If10655bd3bb964b5bfc6f11a2ad63d62ab9e2606
Jorge Lucangeli Obes [Wed, 13 Apr 2016 22:58:12 +0000 (22:58 +0000)]
Merge "Implement a stub permission server for Brillo tier 1."
am:
941a290
* commit '
941a2907853a2252f303cae84c0745b84d716e67':
Implement a stub permission server for Brillo tier 1.
Change-Id: Ib2bd60773dff6c74c36384849d2eb45b4b8c1e71
Jorge Lucangeli Obes [Wed, 13 Apr 2016 22:45:19 +0000 (22:45 +0000)]
Merge "Implement a stub permission server for Brillo tier 1."
Craig Donner [Wed, 13 Apr 2016 22:30:05 +0000 (22:30 +0000)]
Merge "Minor changes and cleanup to support EXT_protected_content." into nyc-dev
am:
8506baf
* commit '
8506bafe56de56cbfe5880c08ea45109c88ffe71':
Minor changes and cleanup to support EXT_protected_content.
Change-Id: Ie64cf865e6d8ce3f1436d6cb5d4aa340bdacce58
Jorge Lucangeli Obes [Wed, 13 Apr 2016 18:01:25 +0000 (11:01 -0700)]
Implement a stub permission server for Brillo tier 1.
This will allow removing some existing hardcoded checks, like
https://cs.corp.google.com/android/frameworks/native/libs/binder/IServiceManager.cpp?l=70
Also add a .clang-format file for Android Framework C++ style.
Bug:
25663983
Change-Id: Icc4473a6f7b8c7395cdb167dc3fdbb2f076e5960
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
Jeff Sharkey [Wed, 13 Apr 2016 19:58:37 +0000 (19:58 +0000)]
Merge "Build target path before closedir()." into nyc-dev
am:
da2a8ca
* commit '
da2a8ca00636f63c8cec6135a5d5675a71c505f1':
Build target path before closedir().
Change-Id: I1a66d782f3d6831c720efdd7ce9df0772513c1f0
Jeff Sharkey [Wed, 13 Apr 2016 19:51:51 +0000 (19:51 +0000)]
Merge "Build target path before closedir()." into nyc-dev
Ralph Nathan [Wed, 13 Apr 2016 19:42:06 +0000 (12:42 -0700)]
libbinder: Remove templated binder::Status stream operator.
The templated binder::Status stream operator doesn't work with gmock
because of ambiguous operator overloading. Limiting the stream operator
to just std::stringstream allows it to be used with gmock.
BUG=
28171901
TEST=Compiles with gmock and CameraBinderTests
Change-Id: Ia674b68cbff4911b3f5cc3d8ee57d04a1d6cf6bf
Jeff Sharkey [Wed, 13 Apr 2016 19:45:47 +0000 (13:45 -0600)]
Build target path before closedir().
Otherwise ent->d_name could be cleared out, and we'd aim at the
top-level data directory, which has disastrous results when clearing
app data.
Bug:
28155330
Change-Id: Icf7df835d76816dfbe2894fdae708033df983825
Pablo Ceballos [Wed, 13 Apr 2016 19:25:12 +0000 (19:25 +0000)]
Merge "EGL: Ensure surfaces are disconnected when destroyed" into nyc-dev
am:
b01334e
* commit '
b01334e6a2f20eeded55e938d18e8e664dcfdf6e':
EGL: Ensure surfaces are disconnected when destroyed
Change-Id: Iafc5e10e5f5faeaff28ca1814fd24dd01761667d
Pablo Ceballos [Wed, 13 Apr 2016 19:10:50 +0000 (19:10 +0000)]
Merge "EGL: Ensure surfaces are disconnected when destroyed" into nyc-dev
Robert Carr [Wed, 13 Apr 2016 19:10:39 +0000 (19:10 +0000)]
Merge "Add Surface::waitForNextFrame" into nyc-dev
am:
dc71beb
* commit '
dc71bebc3d65918ec5c1c7cea1dae0a0af5468d7':
Add Surface::waitForNextFrame
Change-Id: I348c555c1ff80588fffffbe804f6d3a7ee0e15c0
Rob Carr [Wed, 13 Apr 2016 18:58:42 +0000 (18:58 +0000)]
Merge "Add Surface::waitForNextFrame" into nyc-dev
Felipe Leme [Wed, 13 Apr 2016 18:38:34 +0000 (18:38 +0000)]
Merge "Added support for \'bugreport -z\'." into nyc-dev
am:
ef1081f
* commit '
ef1081f96d3c3915fe84c505674fbd70170ed284':
Added support for 'bugreport -z'.
Change-Id: I437206ba9cd03e7b9cea4a74f2c25f83774b180a
Philip Cuadra [Wed, 13 Apr 2016 18:38:34 +0000 (18:38 +0000)]
Merge "Binder: add pid to thread name for binder threads." into nyc-dev
am:
9b9fc47
* commit '
9b9fc47133756806e02bf2d0c8798b98be3ad968':
Binder: add pid to thread name for binder threads.
Change-Id: I2b9137cfbe6db90064d2b0bd61e8f516e182fcd2
TreeHugger Robot [Wed, 13 Apr 2016 18:28:19 +0000 (18:28 +0000)]
Merge "Added support for 'bugreport -z'." into nyc-dev
Philip Cuadra [Wed, 13 Apr 2016 18:27:59 +0000 (18:27 +0000)]
Merge "Binder: add pid to thread name for binder threads." into nyc-dev
Pablo Ceballos [Wed, 13 Apr 2016 18:17:32 +0000 (11:17 -0700)]
egl: add EGL_KHR_mutable_render_buffer
- Allow drivers to support it and applications to query for it.
- Add it to the platform header.
Bug
27129258
Change-Id: I7ce762f03889027d67803ba2da85a43584f3cf79
Craig Donner [Tue, 12 Apr 2016 23:54:03 +0000 (16:54 -0700)]
Minor changes and cleanup to support EXT_protected_content.
Bug:
22775237
Change-Id: I809b62597ca439e5183c32711866efa71e06467e
Philip Cuadra [Fri, 8 Apr 2016 17:29:14 +0000 (10:29 -0700)]
Binder: add pid to thread name for binder threads.
Including the pid in the binder thread name improves attribution of
binder time in systraces.
Change-Id: I40461b6f98c51c6e5f0acc1c24d443d0e7109b69
Felipe Leme [Tue, 12 Apr 2016 23:36:51 +0000 (16:36 -0700)]
Added support for 'bugreport -z'.
Dumpstate now supports zipped bugreport, whose output is more complete
than the flat-file bugreports provided prior to N.
The whole workflow is split in different components:
- adb supports a 'bugreport -z <ZIP_FILE>' option, which calls a
bugreportz binary.
- bugreportz starts the dumpstatez service.
- dumpstatez starts dumpstate with some flags that opens a socket for
control (not output).
- Once dumpstate is finished, it prints the bugreport location to
stdout.
- adb pulls the zip file and renames according to the command-line
argument.
- bugreport prints a deprecation message.
The reason for a new binary (bugreportz) instead of passing arguments to
bugreport (like -z) is backward compatibility: pre-N versions of
bugreport would ignore such argument and generate a text bugreport,
which is not what adb would be expecting.
BUG:
27653204
Change-Id: I47f6f677eba11d5fb54818ae5a0b3cab069776ee
Elliott Hughes [Wed, 13 Apr 2016 14:48:41 +0000 (14:48 +0000)]
Merge "Move dumpstate off mincrypt and over to BoringSSL." into nyc-dev-plus-aosp
Chia-I Wu [Wed, 13 Apr 2016 01:32:24 +0000 (09:32 +0800)]
vulkan: update vk_layer_interface.h
Update to match vk_layer.h in Vulkan-LoaderAndValidationLayers.
Specifically,
- VK_LAYER_FUNCTION_DEVICE is removed
- VK_LAYER_FUNCTION_INSTANCE is removed
- VK_LAYER_FUNCTION_DATA_CALLBACK is added
We do not use VK_LAYER_FUNCTION_DEVICE and VK_LAYER_FUNCTION_INSTANCE
anymore. They were internal to the desktop loader as well. Hopefully no
layer ever uses them.
Bug:
28015368
Change-Id: I4f3f91e8224eb943caca4792d74b63aef0b23ad2
Robert Carr [Mon, 11 Apr 2016 18:15:32 +0000 (11:15 -0700)]
Add Surface::waitForNextFrame
We can use this for cases like SurfaceView
where one thread (e.g. the framework code)
wants to wait for an unknown client thread
to render a frame in to the surface before
we report it as shown to the window manager.
Bug:
22207948
Change-Id: I9d3344aa1c0ab0f0efd9df24e90ce0410d5f2e22
Jorim Jaggi [Wed, 13 Apr 2016 02:16:10 +0000 (02:16 +0000)]
Merge "Revert "Death to synchronous transactions (1/2)"" into nyc-dev
am:
ad798d0
* commit '
ad798d03beb54e575abb693f3790c4e3855f32d4':
Revert "Death to synchronous transactions (1/2)"
Change-Id: I516d29a73391e8a2c43c817ec2a9e7ac5297c949
Jorim Jaggi [Wed, 13 Apr 2016 02:06:48 +0000 (02:06 +0000)]
Merge "Revert "Death to synchronous transactions (1/2)"" into nyc-dev
Jorim Jaggi [Wed, 13 Apr 2016 01:40:35 +0000 (01:40 +0000)]
Revert "Death to synchronous transactions (1/2)"
This reverts commit
c6a607aa7ab96f6b1bac487cffd1899e1f1cdcf5.
It causes issues when resizing: default buffer size on the consumer side
only gets set when the transaction actually executes. But because
consumer is not blocked on SF over WM anymore, it gets the default
buffer size before the surface is resized, and thus uses wrong bounds
for the buffer to be drawn, and never submits another one.
This needs a more involved fix.
Bug:
28122036
Bug:
28128613
Change-Id: I0e738f99e43fc9ea25426e9e6e607e01413d3bb7
Chia-I Wu [Wed, 13 Apr 2016 00:22:14 +0000 (00:22 +0000)]
Merge "vulkan: fix vkGetDeviceProcAddr for intercepted commands" into nyc-dev
am:
a1d53fa
* commit '
a1d53fa7c98db0f830782960e48736a3ea2d8da4':
vulkan: fix vkGetDeviceProcAddr for intercepted commands
Change-Id: I75ba449c6f774a62a485776a29d38fc04fca153a
Chia-I Wu [Wed, 13 Apr 2016 00:14:07 +0000 (00:14 +0000)]
Merge "vulkan: fix vkGetDeviceProcAddr for intercepted commands" into nyc-dev
Nick Kralevich [Tue, 12 Apr 2016 23:55:51 +0000 (23:55 +0000)]
Drop compatibility with pre 2012 adb clients
am:
a50117e
* commit '
a50117e54a97aea5b3b2c279fb5643704c460b05':
Drop compatibility with pre 2012 adb clients
Change-Id: Ifdb0e9f2d869284a20fa5f064260f5a17c2391c2
Nick Kralevich [Tue, 12 Apr 2016 23:32:33 +0000 (16:32 -0700)]
Drop compatibility with pre 2012 adb clients
On very old versions of adb, when "adb bugreport" was executed,
the command "adb shell dumpstate" was run. This was later changed
to "adb shell bugreport". Change
1e339878c128ef47271278779c2685a8dfa49cd1 added a backwards
compatibility hack (see bug
6391938).
It turns out that nobody has been able to execute
/system/bin/dumpstate as a non-root user for 2 releases now due
to SELinux restrictions, so maintaining the code bloat to support
this workaround is pointless.
Delete the code.
Bug:
6391938
Change-Id: I49eebcca1fcec5a39593c53e2e6d23ec87f65a35
Elliott Hughes [Tue, 12 Apr 2016 23:28:31 +0000 (16:28 -0700)]
Move dumpstate off mincrypt and over to BoringSSL.
Bug: http://b/
27287913
Change-Id: I2104e3f963c62e2f9dd0b216010dbc457c6e5857