OSDN Git Service
Robert Carr [Mon, 18 Apr 2016 18:40:59 +0000 (18:40 +0000)]
Add setOverrideScalingMode to SurfaceControl am:
c3574f7 am:
7a776ec
am:
7a9c441
* commit '
7a9c441a7c89887b496210714b0c46275bb4237b':
Add setOverrideScalingMode to SurfaceControl
Change-Id: Ief6b4204687e8f17bf2a535f13ad30490444dbe0
Robert Carr [Mon, 18 Apr 2016 18:29:45 +0000 (18:29 +0000)]
Add setOverrideScalingMode to SurfaceControl am:
c3574f7
am:
7a776ec
* commit '
7a776ec3717bfe45d48f1c03987c8657ad8a56d5':
Add setOverrideScalingMode to SurfaceControl
Change-Id: I3cf5a32dbbc9d6523733921b118523e0fe9d9de7
Robert Carr [Mon, 18 Apr 2016 18:24:14 +0000 (18:24 +0000)]
Add setOverrideScalingMode to SurfaceControl
am:
c3574f7
* commit '
c3574f7b0141c69fdca25ccafb80ff334462f9a3':
Add setOverrideScalingMode to SurfaceControl
Change-Id: I8752f95ed3d596c8648e5d527aae4cae00e171b9
Christopher Wiley [Mon, 18 Apr 2016 18:19:13 +0000 (18:19 +0000)]
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am:
dcc5575 am:
1c58569 am:
0cbee9f
am:
4ee55d0
* commit '
4ee55d0eb35b18468604f64c213146d6d654169f':
Revert "libbinder: Replace ScopedFd with base::unique_fd"
Change-Id: I28ba4fe837167f26a57276c028fecea9505a72ff
Christopher Wiley [Mon, 18 Apr 2016 18:07:30 +0000 (18:07 +0000)]
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am:
dcc5575 am:
1c58569
am:
0cbee9f
* commit '
0cbee9f0f87841e77f6c4b2449cdd1a472da2982':
Revert "libbinder: Replace ScopedFd with base::unique_fd"
Change-Id: If6b29b49e45dd4bab98f0d14da7f9bdc077e79d5
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 16:00:54 +0000 (16:00 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd" am:
747c0bb am:
7a07e39 am:
7f38c4b
am:
f8afa13
* commit '
f8afa13077e16f7d4e1acb74b67cdd8fc609ced9':
libbinder: Replace ScopedFd with base::unique_fd
Change-Id: I0e7ed42e7b3aca6a6d38bc45b3117bcc6425c017
Christopher Wiley [Mon, 18 Apr 2016 15:55:41 +0000 (15:55 +0000)]
Merge "libbinder: Replace ScopedFd with base::unique_fd" am:
747c0bb am:
7a07e39
am:
7f38c4b
* commit '
7f38c4b9d84c0aa84017b8e211de416d7467cbb6':
libbinder: Replace ScopedFd with base::unique_fd
Change-Id: Ibc37acd238de664feb8079acf20fe98d714b13cb
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"
Robert Carr [Thu, 24 Mar 2016 19:19:32 +0000 (12:19 -0700)]
Add setOverrideScalingMode to SurfaceControl
Provide an interface for the window manager to override
the client specified scaling mode. This makes it possible
for the window manager to force windows to be scaleable
for animations, etc, even when a resize is pending.
Bug:
27891386
Change-Id: Ic4aae9917bd6869ee0dbb425979b4e21c68342a3
TreeHugger Robot [Sat, 16 Apr 2016 04:51:44 +0000 (04:51 +0000)]
Merge "sensorservice: switch to use sp<> in sensor list" into nyc-dev am:
47babb8
am:
9c0f518
* commit '
9c0f518fddb935ea8bbee295d6061176ffbdfbad':
sensorservice: switch to use sp<> in sensor list
Change-Id: I23a1abc7f6908c7b064eb56dd8198b89026d3412
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:51:31 +0000 (23:51 +0000)]
Merge "Log when binder thread pool is starved" into nyc-dev am:
43dcac7
am:
249f373
* commit '
249f373defa993eb9c8358e4d2e0b620f2c10d57':
Log when binder thread pool is starved
Change-Id: If2ed40d530eccdbb6af49c7a2d70c1da06568c3e
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:42:10 +0000 (21:42 +0000)]
Merge "Adds spec for EGL_ANDROID_create_native_client_buffer." into nyc-dev am:
3d15899
am:
a96c583
* commit '
a96c58388554938d54a2d269cf816d6a4a535945':
Adds spec for EGL_ANDROID_create_native_client_buffer.
Change-Id: Ib1343f157aa4dcc0fee45161625382a7aaa46b87
Dan Stoza [Fri, 15 Apr 2016 21:42:10 +0000 (21:42 +0000)]
Merge "SF: Fix the delivery of visible and damage rects to HWC" into nyc-dev am:
12402e3
am:
f328bc4
* commit '
f328bc4ba5e44b6bec3cef2a216c83a18dbdca8b':
SF: Fix the delivery of visible and damage rects to HWC
Change-Id: Id28bcc75d1363d2faea0c51aa89bb8f44948f993
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
Tim Murray [Fri, 15 Apr 2016 21:00:25 +0000 (21:00 +0000)]
Merge "Revert "DispSync: Always resync after inactivity"" into nyc-dev am:
ccf8058
am:
6034c20
* commit '
6034c207c486ca79ce97f7afeb21491b30bf8443':
Revert "DispSync: Always resync after inactivity"
Change-Id: I6e82578f8f8299122b9768f5b05bb633b0a13bfd
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
Mika Isojarvi [Fri, 15 Apr 2016 20:50:38 +0000 (20:50 +0000)]
Merge "White list EGL_EXT_yuv_surface extension" into nyc-dev am:
7b05332
am:
e5c4f0a
* commit '
e5c4f0abaf437d907743420f475be94682f672c4':
White list EGL_EXT_yuv_surface extension
Change-Id: Iaf25ffb5edb95fa378d7ff2204a21c67635be16f
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
TreeHugger Robot [Fri, 15 Apr 2016 18:44:10 +0000 (18:44 +0000)]
Merge "SF: Don\'t pop pending state into mCurrentState" into nyc-dev am:
9eb286a
am:
6451ddb
* commit '
6451ddb8f107b2fd57c956e74935ac62b91c8a2d':
SF: Don't pop pending state into mCurrentState
Change-Id: I7c9a45fe372cc8d169719362b9ccedbcc42cce73
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: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
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: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
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: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
OSDN Git Service
