OSDN Git Service
Dan Stoza [Thu, 14 Apr 2016 23:51:05 +0000 (23:51 +0000)]
Merge "HWC2: Change version detection scheme" into nyc-dev am:
8bf556e
am:
e5fc916
* commit '
e5fc9167630372c7527f95debe3fd32e3e40a19c':
HWC2: Change version detection scheme
Change-Id: I4992cbe11ba759afd9edaf1a750f467d21208297
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
Chia-I Wu [Thu, 14 Apr 2016 22:50:15 +0000 (22:50 +0000)]
Merge changes I05c45303,I25b71570,I56ebc0ee into nyc-dev am:
87085d4
am:
2a93739
* commit '
2a937394df871cdd5c9d60465227f8933aa9bcce':
vulkan: fix vkGet*ProcAddr for un-enabled extensions
vulkan: do not query non-enabled WSI functions
vulkan: pass hal_extensions to InitDriverTable
Change-Id: Ic02ae3f612c27ea77f6fad472e8c01baf5e046f1
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:53:47 +0000 (21:53 +0000)]
Merge "HWC2: Check SidebandStream capability on load" into nyc-dev am:
d4797c2
am:
6bad200
* commit '
6bad200fba6b68fb0946c096c072ce985c18d12a':
HWC2: Check SidebandStream capability on load
Change-Id: Iff8ce2fb302f800474afc83e6fbed9a9f84e05bc
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:19:55 +0000 (21:19 +0000)]
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk am:
d89d29d -s ours am:
f42496c -s ours am:
0659765 -s ours
am:
c5af6ff -s ours
* commit '
c5af6ffe1b396f79ee94ea932658cd9a2ad78ed7':
DO NOT MERGE ANYWHERE Sensorservice, fix the over boundary risk
Change-Id: I2b63464c1b6da39f3bf881fb178b7677f1e6a32c
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
Andy Hung [Thu, 14 Apr 2016 21:12:59 +0000 (21:12 +0000)]
Merge "Unify dumped native stack traces" into nyc-dev am:
d74bcda
am:
e45be9d
* commit '
e45be9d7578ebff6bee57ce1c87772807d5d0cc7':
Unify dumped native stack traces
Change-Id: I158c5401b19be5b254faab7b30bf81b4049cff0a
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
Jorge Lucangeli Obes [Thu, 14 Apr 2016 20:22:20 +0000 (20:22 +0000)]
Merge "Run \'nativeperms\', remove Brillo #ifdef." am:
a7ba9d0 am:
f949746
am:
180cce9
* commit '
180cce95140f4b3ecb55dba38e3fa544ce4a519d':
Run 'nativeperms', remove Brillo #ifdef.
Change-Id: Ibc4f71b361ae03ea92724c09abeff711eeef78b0
Pablo Ceballos [Thu, 14 Apr 2016 20:22:18 +0000 (20:22 +0000)]
Merge "egl: add EGL_KHR_mutable_render_buffer" into nyc-dev am:
202e6e9
am:
83dd8e1
* commit '
83dd8e1158b70b5cbcbe6b98647041ce15bef63a':
egl: add EGL_KHR_mutable_render_buffer
Change-Id: Iab4b83b9001853edb354623b529c660d6ba0cc95
Michael Wright [Thu, 14 Apr 2016 20:22:16 +0000 (20:22 +0000)]
Merge "Add missing include to choreographer header." am:
e2e44dd am:
e5c89f3
am:
e653680
* commit '
e6536801065a618db10bc6421b3749a5d0a4bfc7':
Add missing include to choreographer header.
Change-Id: Ia14c88a75072b808643b45a294ff38bfeb4befbc
Michael Wright [Thu, 14 Apr 2016 20:22:14 +0000 (20:22 +0000)]
Merge "Add NDK Choreographer API headers" am:
78e7eb7 am:
920838f -s ours
am:
254f092
* commit '
254f092a1a97562d68f2c44cbea95da00c29ff80':
Add NDK Choreographer API headers
Change-Id: Ibf176fdd2865715929e4c3e1cbabf4cfc5fd3d99
Keun-young Park [Thu, 14 Apr 2016 20:22:10 +0000 (20:22 +0000)]
remove non-mandatory features from car_core am:
6979bb9
am:
2b92836
* commit '
2b92836b83ee2c7e809f6af4e36743312b652407':
remove non-mandatory features from car_core
Change-Id: Id3a421b114fa3492202b4c923c08a77039517cb3
Ralph Nathan [Thu, 14 Apr 2016 20:22:07 +0000 (20:22 +0000)]
Merge "libbinder: Remove templated binder::Status stream operator." am:
9e413e9 am:
9ed41a7
am:
0ed3ca3
* commit '
0ed3ca3780986ce3d1f819e9a20dbc449624f5d0':
libbinder: Remove templated binder::Status stream operator.
Change-Id: I8aa3d08c739e4ceb6e46be2a0bef1651ef03f243
TreeHugger Robot [Thu, 14 Apr 2016 20:22:02 +0000 (20:22 +0000)]
Merge changes I7389829a,I4f3f91e8 into nyc-dev am:
a0a4e0e
am:
9a71474
* commit '
9a71474a4aba54551b9ff36f4f27d79e17059243':
vulkan: pass VK_LAYER_FUNCTION_DATA_CALLBACK to layers
vulkan: update vk_layer_interface.h
Change-Id: Id8529bb3da039aa6dbc8ee284d224294687d0642
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
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:05:41 +0000 (23:05 +0000)]
Merge "Implement a stub permission server for Brillo tier 1." am:
941a290 am:
d0c163b
am:
90c72a8
* commit '
90c72a8b7ef57fb896bfe3a0b399a4baab8b9200':
Implement a stub permission server for Brillo tier 1.
Change-Id: I7a799ac4e41064911a4f9c561c8965625a6a1f1f
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:42:15 +0000 (22:42 +0000)]
Merge "Minor changes and cleanup to support EXT_protected_content." into nyc-dev am:
8506baf
am:
f15686f
* commit '
f15686f46c1cd3288fb00ffb4187986ff5e78411':
Minor changes and cleanup to support EXT_protected_content.
Change-Id: I308b1917185acc642e0c1e8fbe9bd03cc7d0492d
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 20:02:04 +0000 (20:02 +0000)]
Merge "Build target path before closedir()." into nyc-dev am:
da2a8ca
am:
0ed202e
* commit '
0ed202e375ae98bc9bbf847872411d0214dc4248':
Build target path before closedir().
Change-Id: I23570bfa9d8d53086b2dabd06f2551ef3154758a
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:28:36 +0000 (19:28 +0000)]
Merge "EGL: Ensure surfaces are disconnected when destroyed" into nyc-dev am:
b01334e
am:
8778a32
* commit '
8778a322c73b4739f2ab1ade8f86293e4713824f':
EGL: Ensure surfaces are disconnected when destroyed
Change-Id: Iba1983285868eaa18d9aa4d8d99b909977b48afa
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
Rob Carr [Wed, 13 Apr 2016 19:16:53 +0000 (19:16 +0000)]
Merge "Add Surface::waitForNextFrame" into nyc-dev am:
dc71beb
am:
63d6ca0
* commit '
63d6ca0bdcd152f0985df02f9a835900ca98f5b8':
Add Surface::waitForNextFrame
Change-Id: I35e750a7167e892ba75fe96c649e8284002016fa
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
TreeHugger Robot [Wed, 13 Apr 2016 18:42:11 +0000 (18:42 +0000)]
Merge "Added support for \'bugreport -z\'." into nyc-dev am:
ef1081f
am:
994d264
* commit '
994d264705b3de117608b636ad3a22ae69ef108b':
Added support for 'bugreport -z'.
Change-Id: I5125e51298c61871773244bbb0bed2610f0efe3a
Philip Cuadra [Wed, 13 Apr 2016 18:42:11 +0000 (18:42 +0000)]
Merge "Binder: add pid to thread name for binder threads." into nyc-dev am:
9b9fc47
am:
aefcad1
* commit '
aefcad150649c7974c8a2a8b1c724b6112fd354b':
Binder: add pid to thread name for binder threads.
Change-Id: I2df45847f0b8568e3abc683b21f25e369a15b99d
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:57:53 +0000 (14:57 +0000)]
Merge "Move dumpstate off mincrypt and over to BoringSSL." into nyc-dev-plus-aosp
am:
042ad79
* commit '
042ad795bf197ff85106d6dfec90e5292f3ee623':
Move dumpstate off mincrypt and over to BoringSSL.
Change-Id: I7a04eb4a96a420db0c4924b74b8a4ab830a3df4a
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:23:47 +0000 (02:23 +0000)]
Merge "Revert "Death to synchronous transactions (1/2)"" into nyc-dev am:
ad798d0
am:
329bf31
* commit '
329bf31be1a298ba078cef88805b9b77d8acb8a5':
Revert "Death to synchronous transactions (1/2)"
Change-Id: Ifa67afbba313d84ec73041dd30e5e18f85896013
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
Chia-I Wu [Wed, 13 Apr 2016 01:52:58 +0000 (01:52 +0000)]
Merge "vulkan: fix vkGetDeviceProcAddr for intercepted commands" into nyc-dev am:
a1d53fa
am:
859317b
* commit '
859317b779094f0ec1ac2debaac84732e19eb6d2':
vulkan: fix vkGetDeviceProcAddr for intercepted commands
Change-Id: I9c84d5cbe36207ec435173316c6286200c7cd14d
Nick Kralevich [Wed, 13 Apr 2016 01:52:58 +0000 (01:52 +0000)]
Drop compatibility with pre 2012 adb clients am:
a50117e
am:
61a66fc
* commit '
61a66fcfb010cb13ca5deaf0ef8d5d258629a53f':
Drop compatibility with pre 2012 adb clients
Change-Id: I4ef78f17f6bce49c793b1d2eab45adb5de78b144
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
Chia-I Wu [Tue, 12 Apr 2016 03:16:17 +0000 (11:16 +0800)]
vulkan: fix vkGetDeviceProcAddr for intercepted commands
This allows vulkan::api::DestroyDevice to properly unreference layers.
Bug:
28077754
Change-Id: I194925d29dee3489b63f4a44669c791d378afa39
Chia-I Wu [Tue, 12 Apr 2016 23:09:55 +0000 (23:09 +0000)]
vulkan: fix support for unknown extensions am:
1600e26
am:
77798e8
* commit '
77798e8b69f4967132155efe202c50a6713a549b':
vulkan: fix support for unknown extensions
Change-Id: I180120f59957fef004461295a7a80de07e4dace0
Chia-I Wu [Tue, 12 Apr 2016 22:42:21 +0000 (22:42 +0000)]
vulkan: fix support for unknown extensions
am:
1600e26
* commit '
1600e269dbf9f2cd818886c55b3e0933dfec7a86':
vulkan: fix support for unknown extensions
Change-Id: I9883289f8460fd9f8180520573855e457520abd8
Chia-I Wu [Tue, 12 Apr 2016 01:40:06 +0000 (09:40 +0800)]
vulkan: fix support for unknown extensions
Never set the bit ProcHook::EXTENSION_UNKNOWN, otherwise std::out_of_range
will be thrown.
Change-Id: I0a1343079647162bf17494acaaa69f1fa26b72f8
Jesse Hall [Tue, 12 Apr 2016 00:53:44 +0000 (00:53 +0000)]
Merge "libvulkan: Use a stub HAL when no real Vulkan HAL is present" into nyc-dev am:
9ffa1a4
am:
254ceec
* commit '
254ceec865b37c929625bd607f070cc943585c87':
libvulkan: Use a stub HAL when no real Vulkan HAL is present
Change-Id: Icbfc6bca7f9c0a45226b1df94fab010f8233a3f1