OSDN Git Service
Colin Cross [Wed, 28 Sep 2016 21:04:31 +0000 (21:04 +0000)]
Merge "Fix order of operations warning in libui" am:
73d4186757
am:
1b080b15aa
Change-Id: I959d837f06cfbc747261b92d7202b953ee2e15f1
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8cdcd15c38
am:
5c9421500e
Change-Id: I9f971b18ff7fa72241eb860a782c9a585f8e56f8
Colin Cross [Wed, 28 Sep 2016 21:02:00 +0000 (21:02 +0000)]
Merge "Fix order of operations warning in libui"
am:
73d4186757
Change-Id: Ib93a8ddcb912b05cd38db1dea7ac0ff21a788bcd
Colin Cross [Wed, 28 Sep 2016 20:59:31 +0000 (20:59 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8cdcd15c38
Change-Id: If6768b8a9468833f0fec5025f95c1796dc2869ca
Colin Cross [Wed, 28 Sep 2016 20:57:56 +0000 (20:57 +0000)]
Merge "Fix order of operations warning in libui"
Colin Cross [Tue, 27 Sep 2016 21:09:07 +0000 (14:09 -0700)]
Fix order of operations warning in libui
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I21f34567927125d3eeeecd8f00271a175f93af21
Colin Cross [Wed, 28 Sep 2016 20:53:15 +0000 (20:53 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Dimitry Ivanov [Wed, 28 Sep 2016 19:04:22 +0000 (19:04 +0000)]
Merge "Add missing liblog dependency" am:
c4dd0c3b83
am:
abd9a76f5e
Change-Id: Iff76ef4ef129b4e1e76786998a0cbf9acec08f3b
Dimitry Ivanov [Wed, 28 Sep 2016 19:01:21 +0000 (19:01 +0000)]
Merge "Add missing liblog dependency"
am:
c4dd0c3b83
Change-Id: I710f932670b8374e11a19fe96f2a53b622753468
Dimitry Ivanov [Wed, 28 Sep 2016 18:56:35 +0000 (18:56 +0000)]
Merge "Add missing liblog dependency"
Colin Cross [Mon, 26 Sep 2016 20:48:25 +0000 (13:48 -0700)]
Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: If2bae8b2fbc4238d6251cdd78bc7b5216684f99d
Dan Albert [Wed, 28 Sep 2016 08:57:12 +0000 (08:57 +0000)]
Merge "Include what we use." am:
be7fdfc2a1
am:
7e46950b9e
Change-Id: I898b65a7aafd46fe04dff729307c8a7532053f0c
Dan Albert [Wed, 28 Sep 2016 08:54:12 +0000 (08:54 +0000)]
Merge "Include what we use."
am:
be7fdfc2a1
Change-Id: Ifb6f3d6424dc3f1295a8c50a8773b58410b562d9
Treehugger Robot [Wed, 28 Sep 2016 08:50:27 +0000 (08:50 +0000)]
Merge "Include what we use."
Dan Albert [Wed, 28 Sep 2016 07:03:56 +0000 (00:03 -0700)]
Include what we use.
Test: make checkbuild
Bug: None
Change-Id: If803e761c6d7e0c6d043bbcd2ace47f373495db3
Colin Cross [Wed, 28 Sep 2016 03:58:45 +0000 (03:58 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f am:
132fb22957
am:
ab6e9c8664
Change-Id: I6e45359233ab789375c4493f06135e16a3934299
Colin Cross [Wed, 28 Sep 2016 03:58:38 +0000 (03:58 +0000)]
Fix constructor parameters shadowing member variables am:
382ecd3d63
am:
6c79fc7bec
Change-Id: I5bf56d1691c20cd7830f309e88f13064837c7ccf
Colin Cross [Wed, 28 Sep 2016 03:58:31 +0000 (03:58 +0000)]
Use uint32_t consistently for region op am:
8f279960c6
am:
19bf9a2f27
Change-Id: Ia4ed908c51a32ed3ad255b244609983399b7cc44
Colin Cross [Wed, 28 Sep 2016 03:58:23 +0000 (03:58 +0000)]
Fix trailing semicolon warnings am:
17576de056
am:
170ae8a510
Change-Id: Iad76ba1b19d0e74f98ac217d40fbc1afd09a014d
Colin Cross [Wed, 28 Sep 2016 03:51:56 +0000 (03:51 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
am:
132fb22957
Change-Id: Idb0a92939564554becffe4cfa7209f9c220176e6
Colin Cross [Wed, 28 Sep 2016 03:51:55 +0000 (03:51 +0000)]
Fix constructor parameters shadowing member variables
am:
382ecd3d63
Change-Id: I89fc7c1780eab42ab17e028997db2d125f59c2d8
Colin Cross [Wed, 28 Sep 2016 03:51:37 +0000 (03:51 +0000)]
Use uint32_t consistently for region op
am:
8f279960c6
Change-Id: Ibe726f674fc22ca69cd33242ff0059ac6dd70c48
Colin Cross [Wed, 28 Sep 2016 03:51:27 +0000 (03:51 +0000)]
Fix trailing semicolon warnings
am:
17576de056
Change-Id: I6bb34741553c12225d62fd4fdcde74e14502a15c
Dan Albert [Wed, 28 Sep 2016 03:43:03 +0000 (03:43 +0000)]
Merge "Migrate libandroid headers to ndk_headers." am:
fd9d1fb52b
am:
c356d61d00
Change-Id: I39d19a30d34b2c2f13a0be9609972e332a86c014
Colin Cross [Wed, 28 Sep 2016 03:37:50 +0000 (03:37 +0000)]
Merge changes I7748934f,I008ef537,I1027e87f
* changes:
Fix constructor parameters shadowing member variables
Use uint32_t consistently for region op
Fix trailing semicolon warnings
Dan Albert [Wed, 28 Sep 2016 03:37:33 +0000 (03:37 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
am:
fd9d1fb52b
Change-Id: I3762d8549bc449283c874f420d0fa72bda40f244
Treehugger Robot [Wed, 28 Sep 2016 03:32:56 +0000 (03:32 +0000)]
Merge "Migrate libandroid headers to ndk_headers."
Colin Cross [Mon, 26 Sep 2016 20:33:59 +0000 (13:33 -0700)]
Fix constructor parameters shadowing member variables
Using the same name for the constructor parameter and the member
variable causes a warning that was being hidden by the use of -isystem
to include frameworks/native/include. Prefix the parameter with an
underscore.
Bug:
31752268
Test: m -j
Change-Id: I7748934f1e9515176e2ae98d2c0e58d165a7a5c2
Colin Cross [Mon, 26 Sep 2016 20:08:16 +0000 (13:08 -0700)]
Use uint32_t consistently for region op
An implicit conversion warning was being hidden by the use of -isystem
to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I008ef537a24311d58816fae12ef8c4aeaba07547
Colin Cross [Mon, 26 Sep 2016 20:07:06 +0000 (13:07 -0700)]
Fix trailing semicolon warnings
Remove semicolons after inline function definitions. The warnings were
being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I1027e87f459c36a575cd04b3afb645736832b07b
Dimitry Ivanov [Tue, 27 Sep 2016 16:29:02 +0000 (09:29 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I01e7a0ca758308b5f85f2a08f34a9671eaa48b10
Dimitry Ivanov [Sat, 24 Sep 2016 22:19:45 +0000 (22:19 +0000)]
Merge "Add missing liblog dependency" am:
b32a59e797
am:
f12ea76ef3
Change-Id: I45aaf4f8f9ff72ce0f5ea37f750616abdd3fc138
Dimitry Ivanov [Sat, 24 Sep 2016 22:16:19 +0000 (22:16 +0000)]
Merge "Add missing liblog dependency"
am:
b32a59e797
Change-Id: I8ed998f6342914164f89ce8584bca61b8daa4244
Dimitry Ivanov [Sat, 24 Sep 2016 22:07:19 +0000 (22:07 +0000)]
Merge "Add missing liblog dependency"
Dimitry Ivanov [Sat, 24 Sep 2016 00:22:33 +0000 (17:22 -0700)]
Add missing liblog dependency
Bug: http://b/
31289077
Bug: http://b/
27171986
Test: remove liblog from libcutils and recompile
Change-Id: I5d6ded54613e8a29f20495d8f977064f0af2ffd6
David Pursell [Fri, 23 Sep 2016 23:54:04 +0000 (23:54 +0000)]
Merge "libgui: add a test for Sensor serialization." am:
01a0c92da0
am:
cca7f83210
Change-Id: Id8e064040f9d3a167bd3501fa16c3b5b4d4721d8
David Pursell [Fri, 23 Sep 2016 23:52:03 +0000 (23:52 +0000)]
Merge "libgui: add a test for Sensor serialization."
am:
01a0c92da0
Change-Id: Idac427f7e0fa170b1a70ad274f39994361fa452d
Treehugger Robot [Fri, 23 Sep 2016 23:44:11 +0000 (23:44 +0000)]
Merge "libgui: add a test for Sensor serialization."
Ajay Panicker [Fri, 23 Sep 2016 23:09:50 +0000 (23:09 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)" am:
d95b2eb2f6
am:
7821d52b4e
Change-Id: If0666e35c49942a980c538bf02d29010cfe70545
Ajay Panicker [Fri, 23 Sep 2016 23:07:50 +0000 (23:07 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
am:
d95b2eb2f6
Change-Id: Ida600de84569296a3c146ca54aba86f9b88a5816
Ajay Panicker [Fri, 23 Sep 2016 23:01:16 +0000 (23:01 +0000)]
Merge "Add btsnoop_hci.log to bugreport zip (1/2)"
Dan Albert [Fri, 23 Sep 2016 22:57:45 +0000 (15:57 -0700)]
Migrate libandroid headers to ndk_headers.
Test: make native
Bug: http://b/
30465923
Change-Id: I0ef0b3630670241c4efd22515b6ab13eb41a81b3
Ajay Panicker [Wed, 14 Sep 2016 19:26:46 +0000 (12:26 -0700)]
Add btsnoop_hci.log to bugreport zip (1/2)
Bug:
28672558
Test: Manual
Merged-In: I2995a9fd0e8be031c022ef8f275aae35265ba452
Change-Id: I2995a9fd0e8be031c022ef8f275aae35265ba452
David Pursell [Fri, 23 Sep 2016 16:08:26 +0000 (09:08 -0700)]
libgui: add a test for Sensor serialization.
On a few test boards we've hit a problem with Sensor serialization
causing a SIGBUS due to misaligned access. This is being fixed in
Flattenable.h, but adding a test here to verify the fix and detect
regression seems like a good idea.
Bug: http://b/
31671510
Test: adb shell /data/nativetest/libgui_test/libgui_test \
--gtest_filter=SensorTest.*
Change-Id: I233359b04789dabe2246b95051290e101e0bd2c1
Josh Gao [Wed, 21 Sep 2016 01:10:14 +0000 (01:10 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am:
f9f04003f5
am:
44bd6ca0d0
Change-Id: Ie664fd18862e404845b2702ff546719818190cd1
Josh Gao [Wed, 21 Sep 2016 01:07:32 +0000 (01:07 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset."
am:
f9f04003f5
Change-Id: I856ff1bdb5735a90e3b6c13d2f7a2deeff0388e0
Josh Gao [Wed, 21 Sep 2016 01:03:06 +0000 (01:03 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset."
Josh Gao [Mon, 19 Sep 2016 19:44:50 +0000 (12:44 -0700)]
Rename unique_fd::clear to unique_fd::reset.
Test: m checkbuild
Change-Id: I8cbf2b538c270d8ef50ab6fdcf4fecbcd65899a8
Jesse Hall [Mon, 19 Sep 2016 18:02:08 +0000 (18:02 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am:
75bb94fe7e
am:
f4171ecd58
Change-Id: I549bdd589575e505063de0ed4aa7fda97c481e32
Jesse Hall [Mon, 19 Sep 2016 17:58:39 +0000 (17:58 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries"
am:
75bb94fe7e
Change-Id: I0567dca837c6a56d0af14eb0ace73318386b444d
Jesse Hall [Mon, 19 Sep 2016 17:51:36 +0000 (17:51 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries"
Jesse Hall [Fri, 16 Sep 2016 04:26:01 +0000 (21:26 -0700)]
libvulkan: Fix count returned for incomplete wsi queries
When vkGetPhysicalDeviceSurfaceFormatsKHR,
vkGetPhysicalDevicePresentModesKHR, and vkGetSwapchainImagesKHR
returned VK_INCOMPLETE, they would overwrite the count parameter with
the number of available items, rather than the number of returned
items.
Change-Id: I6a736770f90b95ad15bfcfbe5afb4d2886817dcb
Fixes:
31490492
Test: https://gerrit.khronos.org/#/c/158/
Chih-hung Hsieh [Wed, 14 Sep 2016 18:04:49 +0000 (18:04 +0000)]
Merge "Fix google-explicit-constructor warnings in binder." am:
8b2d3da4c4
am:
e00f704122
Change-Id: I59fe3ed467d34c81e3082983da74466aad39b4b0
Dan Willemsen [Wed, 14 Sep 2016 18:04:49 +0000 (18:04 +0000)]
Merge "Convert libui to Android.bp" am:
f0346ab68e
am:
55ef158c5d
Change-Id: Id19e76f82b3b3154570e5963d2e2f4f943946db1
Chih-hung Hsieh [Wed, 14 Sep 2016 18:00:56 +0000 (18:00 +0000)]
Merge "Fix google-explicit-constructor warnings in binder."
am:
8b2d3da4c4
Change-Id: I3293141f444e547957df9579fe6d258df696bbe7
Dan Willemsen [Wed, 14 Sep 2016 18:00:55 +0000 (18:00 +0000)]
Merge "Convert libui to Android.bp"
am:
f0346ab68e
Change-Id: I1c38e092cc404510e038e246e8d67c9cd28faaed
Chih-hung Hsieh [Wed, 14 Sep 2016 17:53:45 +0000 (17:53 +0000)]
Merge "Fix google-explicit-constructor warnings in binder."
Treehugger Robot [Wed, 14 Sep 2016 17:48:13 +0000 (17:48 +0000)]
Merge "Convert libui to Android.bp"
Dan Willemsen [Fri, 26 Aug 2016 00:05:22 +0000 (17:05 -0700)]
Convert libui to Android.bp
Along with the libinput tests, which depend on libui. For more
information on Soong, see build/soong/README.md
Change-Id: Id4fbeb114d03e37556dca59a2c9f5c9abb0a1825
Merged-In: Id4fbeb114d03e37556dca59a2c9f5c9abb0a1825
(cherry picked from commit
871dda3d6485617bf3a1ea6c8236071212234433)
Peng Xu [Tue, 13 Sep 2016 19:36:11 +0000 (19:36 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive" am:
e6a4e9b04e
am:
33685d3a84
Change-Id: I9577b95776c7c2022ddc25ae5f59da0f8b5f47eb
Dan Stoza [Tue, 13 Sep 2016 19:36:10 +0000 (19:36 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375 am:
30fcc9fc7f
am:
3967e136b2
Change-Id: I274dfc359667b0396bab2e00ac2f0868a920e7d9
Dan Stoza [Tue, 13 Sep 2016 19:35:01 +0000 (19:35 +0000)]
Squashed: gralloc1/binder/requestor am:
f62eaf5994
am:
c76b6fb0c8
Change-Id: Ib81919fbddfb24d0429c12cc9fa1d516c195e5ac
Dan Stoza [Tue, 13 Sep 2016 19:35:01 +0000 (19:35 +0000)]
libui: Add Gralloc1On0Adapter and C++ shim am:
eb03fd3a8b
am:
e9a0705cf5
Change-Id: I5e67066454b265bf30f96be24e12ec22d4a0df13
Dan Stoza [Tue, 13 Sep 2016 19:34:49 +0000 (19:34 +0000)]
libagl: Switch from gralloc to GraphicBufferMapper am:
204240a88b
am:
3a37f21808
Change-Id: I6acf3bc3d2ccbc88653cefe2012346c619b533ae
Feng Yu [Tue, 13 Sep 2016 19:34:48 +0000 (19:34 +0000)]
Merge changes I1b74d58b,I38c6e8bc am:
9f41107732
am:
263f969ab9
Change-Id: I0c12ca4d1b51ccf02a27a97709d1963697bbacc8
Arve Hjnnevg [Tue, 13 Sep 2016 19:34:35 +0000 (19:34 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
6b9c6d23f6
am:
f84867654e
Change-Id: I24d5723689f41859edf73fdd3ce8d00f40ea28d0
Arve Hjnnevg [Tue, 13 Sep 2016 19:34:19 +0000 (19:34 +0000)]
ServiceManager: Restore basic uid check am:
5fa90a063f
am:
362687f1f4 -s ours
Change-Id: Id0b1cacaea12f53760ac8941a9bd321f8acee25f
Peng Xu [Tue, 13 Sep 2016 18:58:18 +0000 (18:58 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive"
am:
e6a4e9b04e
Change-Id: Ic5b3c3bb1856d70a0e12878f8ecdd2cf81868152
Peng Xu [Tue, 13 Sep 2016 18:52:47 +0000 (18:52 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive"
Dan Stoza [Tue, 13 Sep 2016 16:33:01 +0000 (16:33 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375
am:
30fcc9fc7f
Change-Id: If83104d4b621a6e29782f45f62d40d2899e480b5
Dan Stoza [Tue, 13 Sep 2016 16:33:00 +0000 (16:33 +0000)]
Squashed: gralloc1/binder/requestor
am:
f62eaf5994
Change-Id: Icc0f8ccf6ce1799ce83655cfc60eb5f5da0d9f12
Dan Stoza [Tue, 13 Sep 2016 16:32:49 +0000 (16:32 +0000)]
libui: Add Gralloc1On0Adapter and C++ shim
am:
eb03fd3a8b
Change-Id: I3bc1a4a54d4c9b7d8de0fb45140e7f3d8c194319
Dan Stoza [Tue, 13 Sep 2016 16:32:37 +0000 (16:32 +0000)]
libagl: Switch from gralloc to GraphicBufferMapper
am:
204240a88b
Change-Id: I9f43911878549a281050b86af9b4430a35b15c04
Dan Stoza [Tue, 13 Sep 2016 16:27:14 +0000 (16:27 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375
* changes:
Squashed: gralloc1/binder/requestor
libui: Add Gralloc1On0Adapter and C++ shim
libagl: Switch from gralloc to GraphicBufferMapper
Feng Yu [Tue, 13 Sep 2016 15:47:16 +0000 (15:47 +0000)]
Merge changes I1b74d58b,I38c6e8bc
am:
9f41107732
Change-Id: Ib1a09ccb5773c4f6c01ad1d39b43c6f85f16092d
Arve Hjnnevg [Tue, 13 Sep 2016 15:47:15 +0000 (15:47 +0000)]
ServiceManager: Allow system services running as secondary users to add services
am:
6b9c6d23f6
Change-Id: I556897757f0a1d019bbf269e8e32644d346119ba
Arve Hjnnevg [Tue, 13 Sep 2016 15:47:03 +0000 (15:47 +0000)]
ServiceManager: Restore basic uid check
am:
5fa90a063f
Change-Id: I64b3db319f75d1f07e8439e393e5c3c8d5b192e2
Feng Yu [Tue, 13 Sep 2016 15:39:04 +0000 (15:39 +0000)]
Merge changes I1b74d58b,I38c6e8bc
* changes:
ServiceManager: Allow system services running as secondary users to add services
ServiceManager: Restore basic uid check
Arve Hjønnevåg [Thu, 18 Aug 2016 22:42:35 +0000 (15:42 -0700)]
ServiceManager: Allow system services running as secondary users to add services
This should be reverted when all system services have been cleaned up to not
do this. A process looking up a service while running in the background will
see the service registered by the active user (assuming the service is
registered on every user switch), not the service registered by the user that
the process itself belongs to.
BUG:
30795333
Change-Id: I1b74d58be38ed358f43c163692f9e704f8f31dbe
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Dan Stoza [Thu, 2 Jun 2016 01:21:44 +0000 (18:21 -0700)]
Squashed: gralloc1/binder/requestor
This is a combination of the following three commits:
libui: Convert Allocator and Mapper to gralloc1
Converts GraphicBufferAllocator and GraphicBufferMapper to speak
gralloc 1.0 (via the C++ shim and optionally the 1On0 adapter) instead
of gralloc 0.x.
-----
Create graphic buffer using binder interfaces
Using binder interfaces rather than directly allocating the buffer prevents
SELinux warnings.
-----
Add requestor name to GraphicBuffer alloc metadata
Adds a requestor name (usually the BufferQueue consumer's name) to the
metadata that GraphicBufferAllocator stores on allocation so that
`dumpsys SurfaceFlinger` can attempt to attribute buffer usage to the
correct client.
Bug:
28401203
Bug:
29402015
Bug:
30776557
Dan Stoza [Mon, 11 Jan 2016 23:21:07 +0000 (15:21 -0800)]
libui: Add Gralloc1On0Adapter and C++ shim
Adds an adapter which provides the gralloc1 interface on top of a
gralloc 0.x device as well as a C++ shim which wraps a gralloc1 device
and provides a somewhat nicer interface to the rest of the system.
This has also been squashed with a later commit that added mutexes to
protect both the buffer list and the descriptor list from concurrent
access.
Bug:
28401203
Bug:
29420918
Change-Id: I0eeafc998b56e2e2fc39de6fad41e3ed2e19658a
Eino-Ville Talvala [Mon, 12 Sep 2016 19:25:44 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method
am:
8211047138 -s ours
Change-Id: Ia562e06473ec26b173d36f91fa39a427fabdf9b7
Chih-Hung Hsieh [Mon, 12 Sep 2016 19:02:10 +0000 (19:02 +0000)]
Merge "Fix google-explicit-constructor warnings in surfaceflinger." am:
5e703a6ad0
am:
101b4cc9d7
Change-Id: I02a49f1207899cf0153e1aa9649e105372117e25
Chih-Hung Hsieh [Mon, 12 Sep 2016 18:58:12 +0000 (18:58 +0000)]
Merge "Fix google-explicit-constructor warnings in surfaceflinger."
am:
5e703a6ad0
Change-Id: I758fe34b9d89c5d2c343830d6521b7b2217cdbde
Treehugger Robot [Mon, 12 Sep 2016 18:33:16 +0000 (18:33 +0000)]
Merge "Fix google-explicit-constructor warnings in surfaceflinger."
David Brazdil [Mon, 12 Sep 2016 15:09:22 +0000 (15:09 +0000)]
Merge "installd: Create VDEX files and pass their FDs to dex2oat" am:
a586216175
am:
6706170398
Change-Id: I60abfdacd6bdea959e168374c2e69eb13b5760e7
David Brazdil [Mon, 12 Sep 2016 15:05:51 +0000 (15:05 +0000)]
Merge "installd: Create VDEX files and pass their FDs to dex2oat"
am:
a586216175
Change-Id: I932037dce82d2b58f96b38318914497cf89df5b1
David Brazdil [Mon, 12 Sep 2016 14:57:19 +0000 (14:57 +0000)]
Merge "installd: Create VDEX files and pass their FDs to dex2oat"
Chih-Hung Hsieh [Sun, 11 Sep 2016 00:47:41 +0000 (00:47 +0000)]
Merge "Fix google-explicit-constructor warnings in dumpstate." am:
a70396971e
am:
347b6f4c35
Change-Id: Ib2b6733852c8087a1a0172c3f4399a622a313f50
Chih-Hung Hsieh [Sun, 11 Sep 2016 00:44:41 +0000 (00:44 +0000)]
Merge "Fix google-explicit-constructor warnings in dumpstate."
am:
a70396971e
Change-Id: I3f1a3e40e56070f18e7b62dea9b364724581cc3a
Treehugger Robot [Sun, 11 Sep 2016 00:38:09 +0000 (00:38 +0000)]
Merge "Fix google-explicit-constructor warnings in dumpstate."
Eino-Ville Talvala [Fri, 22 Jul 2016 00:06:58 +0000 (17:06 -0700)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method
This method releases all free buffers owned by the buffer queue,
in order to save memory (at the cost of potential future
reallocation of buffers).
Bug:
28695173
Change-Id: I458d10373e639e3144faf673af2ba01aca36e65a
Dan Stoza [Fri, 8 Jan 2016 18:52:16 +0000 (10:52 -0800)]
libagl: Switch from gralloc to GraphicBufferMapper
Removes all direct references to the gralloc module from libagl and
uses the GraphicBufferMapper class instead when locking and unlocking
buffers.
Also a couple of minor code cleanups to eliminate warnings.
Bug:
28401203
Change-Id: Ie982d375b3152d5f677ab54c2067179b8d34c06d
gaoshang [Fri, 9 Sep 2016 14:53:06 +0000 (14:53 +0000)]
Merge "redirect to call assignPointerIds if there is id < 0 case" am:
85598ce5ac
am:
cad6f2e83d
Change-Id: I94ecc3816efd211858cb356d292a9b9caa99ca96
gaoshang [Fri, 9 Sep 2016 14:49:36 +0000 (14:49 +0000)]
Merge "redirect to call assignPointerIds if there is id < 0 case"
am:
85598ce5ac
Change-Id: I7a00040cda005d72e6dbb80745e9c6fa7bc7077b
Treehugger Robot [Fri, 9 Sep 2016 14:44:30 +0000 (14:44 +0000)]
Merge "redirect to call assignPointerIds if there is id < 0 case"
David Brazdil [Thu, 8 Sep 2016 10:55:48 +0000 (11:55 +0100)]
installd: Create VDEX files and pass their FDs to dex2oat
ART now produces a new output file called VDEX, produced alongside the
existing OAT file. This patch updates installd to compute the VDEX's
path, open it and pass the file descriptor to dex2oat.
Bug:
30937355
Change-Id: Ib5c327f1f7a36cfa0b89084d5c01b6da9f8108f2
Peng Xu [Thu, 8 Sep 2016 21:36:07 +0000 (21:36 +0000)]
Merge "Fix google-explicit-constructor warnings in sensorservice." am:
215d7ab7d8
am:
341d12b107
Change-Id: Id5fea5988c2a3c0be0b87ad0267768bcc2af5ffe
Peng Xu [Thu, 8 Sep 2016 21:33:37 +0000 (21:33 +0000)]
Merge "Fix google-explicit-constructor warnings in sensorservice."
am:
215d7ab7d8
Change-Id: Ie27baf6308d8bb6f9bedcfc4eebbaee3117e5564