OSDN Git Service
Jeff Sharkey [Thu, 22 Sep 2016 23:32:08 +0000 (23:32 +0000)]
Recursively restorecon when SELinux label changes. am:
993de79607
am:
59d31b669b
Change-Id: I51739d604afa86b993123bd8cc6d46c6743618a2
Jeff Sharkey [Thu, 22 Sep 2016 22:41:00 +0000 (22:41 +0000)]
Recursively restorecon when SELinux label changes.
am:
993de79607
Change-Id: Ibf9b6beaa58e7e6c2f006e8c6f064330624eb29f
Wei Liu [Thu, 22 Sep 2016 20:04:16 +0000 (20:04 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
am:
64076bac3f
Change-Id: Ia1f4644556e9f5632b5ce23b6379a43a2d1cba1c
Wei Liu [Thu, 22 Sep 2016 19:02:08 +0000 (19:02 +0000)]
Dumpstate should hold a wakelock to save bug report time.
am:
f87959e007
Change-Id: I43fe43f8142e3084d69f336414c19a079dfb9ebc
Wei Liu [Thu, 22 Sep 2016 18:37:22 +0000 (18:37 +0000)]
Merge "Dumpstate should hold a wakelock to save bug report time." into cw-f-dev
Jeff Sharkey [Wed, 21 Sep 2016 00:21:42 +0000 (18:21 -0600)]
Recursively restorecon when SELinux label changes.
PackageManager has been pretty aggressive about asking installd to
restorecon over app data when it thinks something might have
changed. However, in the vast majority of cases these are no-op
requests, and we waste a bunch of time recursively walking all
private data, easily costing 60+ seconds on dogfooder devices.
This change updates the initial "create_app_data" command to kick off
a recursive restorecon if it detects that the top-level SELinux label
on the app private data directory changes. The "create_app_data"
command is designed to ensure that an app's storage is ready, so
PackageManager always calls it at least once per boot before apps
can run. (This change means that PackageManager no longer needs to
make separate "restorecon_app_data" calls.)
Test: booted, verified that a label change triggered restorecon
Bug:
30768146
Change-Id: I0c8d4018cf8ff888d0ae07a82adc3d61a6002aad
Ashutosh Joshi [Wed, 21 Sep 2016 19:25:16 +0000 (19:25 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev
am:
ee36adbde7
Change-Id: I755533dbff110702bbf851c8e0a6ec2035fa28c2
Peng Xu [Wed, 21 Sep 2016 19:25:15 +0000 (19:25 +0000)]
Show masked value for sensor with permission
am:
fba3c11b5e
Change-Id: If4b9fd323d0f8333cd1d1dea8c1d801b43c7e157
Ashutosh Joshi [Wed, 21 Sep 2016 19:16:55 +0000 (19:16 +0000)]
Merge "Show masked value for sensor with permission" into cw-f-dev
Josh Gao [Wed, 21 Sep 2016 01:12:46 +0000 (01:12 +0000)]
Merge "Rename unique_fd::clear to unique_fd::reset." am:
f9f04003f5 am:
44bd6ca0d0
am:
d1a3db64c5
Change-Id: Ica8691bfa5ff84dabe9e026dfae46e8093cf4fb4
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:05:10 +0000 (18:05 +0000)]
Merge "libvulkan: Fix count returned for incomplete wsi queries" am:
75bb94fe7e am:
f4171ecd58
am:
7f3fdaa059
Change-Id: I731446903759e0acefa6cd453d6d25e2c2011fd3
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/
Dan Stoza [Fri, 16 Sep 2016 19:47:02 +0000 (19:47 +0000)]
HWC2On1: Fall back to GLES for SolidColor am:
5df47cb648
am:
d946ae67c2
Change-Id: I9c866a4cbf23f4e8dcdaf922063c4a26f7da7c51
Dan Stoza [Fri, 16 Sep 2016 19:45:01 +0000 (19:45 +0000)]
HWC2On1: Fall back to GLES for SolidColor
am:
5df47cb648
Change-Id: I485ae0aa189b5338f6f98dd3c716dd87dac60ab1
Dan Stoza [Thu, 15 Sep 2016 23:38:42 +0000 (16:38 -0700)]
HWC2On1: Fall back to GLES for SolidColor
Even though SolidColor layers map cleanly to HWC_BACKGROUND composition
in HWC1, SurfaceFlinger never used HWC_BACKGROUND, so we can't trust
that HWC1 devices implemented it correctly. To preserve backwards
compatibility, this changes the behavior to fall back to client
composition to minimize incompatibilities with existing devices.
Bug:
30479781
Change-Id: I638339062e03f2c057b3e1624e7157587ddee7ec
Wei Liu [Fri, 26 Aug 2016 21:51:42 +0000 (14:51 -0700)]
Dumpstate should hold a wakelock to save bug report time.
b/
30832947
Change-Id: I0a4b1fcce91caa96ccbc4e890d9968e3033487de
Chih-hung Hsieh [Wed, 14 Sep 2016 18:07:20 +0000 (18:07 +0000)]
Merge "Fix google-explicit-constructor warnings in binder." am:
8b2d3da4c4 am:
e00f704122
am:
772819113d
Change-Id: I1cd4c72a8ba30cf3ff43661e41c913b17b7e3bf0
Dan Willemsen [Wed, 14 Sep 2016 18:07:20 +0000 (18:07 +0000)]
Merge "Convert libui to Android.bp" am:
f0346ab68e am:
55ef158c5d
am:
14107b1e89
Change-Id: I09dbdfed50aa6446d4596d601b651c229d20158b
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:56:10 +0000 (19:56 +0000)]
Merge "Sensor: Make switching from data injection mode to normal mode more productive" am:
e6a4e9b04e am:
33685d3a84
am:
0674efdbfa
Change-Id: I056c8fbdf6d4392fc34b9e5b318d2e79afe499d9
Dan Stoza [Tue, 13 Sep 2016 19:56:10 +0000 (19:56 +0000)]
Merge changes I5041c541,I0eeafc99,Ie982d375 am:
30fcc9fc7f am:
3967e136b2
am:
6bc61379cb
Change-Id: Iff7b7ac27bf2b15c1a1218a6e75826fb361476e9
Dan Stoza [Tue, 13 Sep 2016 19:56:09 +0000 (19:56 +0000)]
Squashed: gralloc1/binder/requestor am:
f62eaf5994 am:
c76b6fb0c8
am:
82e5e2edc7
Change-Id: I284ecdc896ae625ddce389b2bfc4d1f512c81358
Dan Stoza [Tue, 13 Sep 2016 19:56:08 +0000 (19:56 +0000)]
libui: Add Gralloc1On0Adapter and C++ shim am:
eb03fd3a8b am:
e9a0705cf5
am:
0d85101e33 -s ours
Change-Id: I12f55c47c12a7cf7e35c0db22ec4d0f8dbe028ac
Dan Stoza [Tue, 13 Sep 2016 19:55:57 +0000 (19:55 +0000)]
libagl: Switch from gralloc to GraphicBufferMapper am:
204240a88b am:
3a37f21808
am:
5752748514
Change-Id: I96f04b3e7777d76f3cba0a65beb673e2f0a24a9b
Feng Yu [Tue, 13 Sep 2016 19:37:08 +0000 (19:37 +0000)]
Merge changes I1b74d58b,I38c6e8bc am:
9f41107732 am:
263f969ab9
am:
75ef58520f
Change-Id: I1f80b1f3c450adeaec86c6256d8c37919712ad60
Arve Hjnnevg [Tue, 13 Sep 2016 19:36:55 +0000 (19:36 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
6b9c6d23f6 am:
f84867654e
am:
26905f1768
Change-Id: Icaaf7c2ec9213fe2c06987cba36d633cbd1c26af
Arve Hjnnevg [Tue, 13 Sep 2016 19:36:53 +0000 (19:36 +0000)]
ServiceManager: Restore basic uid check am:
5fa90a063f am:
362687f1f4 -s ours
am:
7050b0c54d
Change-Id: Ib1d85df2219611befaeb35b919e24a715e34b405
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"
Kalle Raita [Tue, 13 Sep 2016 18:32:46 +0000 (18:32 +0000)]
Merge "Increase YV12BufferPow2 test threshold" into nyc-mr1-dev am:
186c4c93a7
am:
59d8480530
Change-Id: I9a3b8947a7631f2dced0c6e6c9fd35d290428539
Kalle Raita [Tue, 13 Sep 2016 18:32:45 +0000 (18:32 +0000)]
Increase YV12BufferPow2 test threshold am:
6a2593ac53
am:
b384bc32a0
Change-Id: Idb99f4c01321a4400093ae8fc33cb3a1ab507653
Kalle Raita [Tue, 13 Sep 2016 18:30:16 +0000 (18:30 +0000)]
Merge "Increase YV12BufferPow2 test threshold" into nyc-mr1-dev
am:
186c4c93a7
Change-Id: Ie0a96823e0f40392fa113a54ea9df49a3d5c34e5
Kalle Raita [Tue, 13 Sep 2016 18:30:15 +0000 (18:30 +0000)]
Increase YV12BufferPow2 test threshold
am:
6a2593ac53
Change-Id: I632d9d46486edd1d603ec2289537c8f76553aea9
TreeHugger Robot [Tue, 13 Sep 2016 18:25:41 +0000 (18:25 +0000)]
Merge "Increase YV12BufferPow2 test threshold" into nyc-mr1-dev
Andreas Gampe [Tue, 13 Sep 2016 17:07:16 +0000 (17:07 +0000)]
Merge "Installd: Add a delete_odex command" into nyc-mr1-dev am:
a721faee57
am:
5f31f5de36
Change-Id: I46ca980fbea7502962ff44c50523ffe31e5d538d
Andreas Gampe [Tue, 13 Sep 2016 16:54:29 +0000 (16:54 +0000)]
Installd: Add a delete_odex command am:
3964da0636
am:
3ca30f7a5d
Change-Id: If0165aae60c25a6e25548eafa92f7b3b5bba2974
Andreas Gampe [Tue, 13 Sep 2016 16:54:06 +0000 (16:54 +0000)]
Merge "Installd: Add a delete_odex command" into nyc-mr1-dev
am:
a721faee57
Change-Id: I37aee2b83f5809f1a65aa2955a56d22390337473
Andreas Gampe [Tue, 13 Sep 2016 16:48:49 +0000 (16:48 +0000)]
Installd: Add a delete_odex command
am:
3964da0636
Change-Id: If7f8fa9f0bb0684e386df9ad2c61975e855ea8de
Andreas Gampe [Tue, 13 Sep 2016 16:37:46 +0000 (16:37 +0000)]
Merge "Installd: Add a delete_odex command" into nyc-mr1-dev
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
Kalle Raita [Tue, 2 Aug 2016 23:19:15 +0000 (16:19 -0700)]
Increase YV12BufferPow2 test threshold
The NPOT version already has 3 as the threshold and at least one
platform seems to have diff of 3 in one of the internal pixels for POW2
variant.
Bug:
21306103
Bug:
30920650
Change-Id: I7882a6ff43ffc862d95fea32c8ee8e7f19fb759d
Cherry-pick from master (
e3747fd25918c943caef4d9c7158a668c786c55d)
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
Dan Willemsen [Tue, 13 Sep 2016 05:35:49 +0000 (05:35 +0000)]
Merge "Convert libui to Android.bp" into nyc-mr1-dev-plus-aosp
Andreas Gampe [Sat, 10 Sep 2016 00:07:04 +0000 (17:07 -0700)]
Installd: Add a delete_odex command
Add a command to delete odex files.
Bug:
31347757
Change-Id: I29bca8751bcee8d6981c682fbbc816c73b78ac68
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
Eino-Ville Talvala [Mon, 12 Sep 2016 21:41:58 +0000 (21:41 +0000)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method am:
8211047138 -s ours am:
7b265d8ab5 -s ours am:
e373a97bd7 -s ours
am:
3f3171788d -s ours
Change-Id: I9a9797580b99e5f529302220e437dc288e3afb36
Eino-Ville Talvala [Mon, 12 Sep 2016 21:34:10 +0000 (21:34 +0000)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method am:
8211047138 -s ours am:
7b265d8ab5 -s ours
am:
e373a97bd7 -s ours
Change-Id: I6f1db057f3a65265635cd3883118f65832fc7b85
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
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
Eino-Ville Talvala [Mon, 12 Sep 2016 19:31:58 +0000 (19:31 +0000)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method am:
8211047138 -s ours
am:
7b265d8ab5 -s ours
Change-Id: I555ef520067d4300450ef3b0e91f127d06e55b66
Eino-Ville Talvala [Mon, 12 Sep 2016 19:31:57 +0000 (19:31 +0000)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method am:
8211047138 -s ours
am:
06d67b6cfd -s ours
Change-Id: I484d9b2ea63980d37368e364d1e2033bb4fe80ae
Eino-Ville Talvala [Mon, 12 Sep 2016 19:26:18 +0000 (19:26 +0000)]
DO NOT MERGE ANYWHERE: BufferQueue consumers: Add discardFreeBuffer method
am:
8211047138 -s ours
Change-Id: If827f77c9c8cb36ad3a8f2eaeb6157bc59258a7a
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:09:39 +0000 (19:09 +0000)]
Merge "Fix google-explicit-constructor warnings in surfaceflinger." am:
5e703a6ad0 am:
101b4cc9d7
am:
32db2f3c9f
Change-Id: Ie75a9e21c634691243d4f5c972f2f2879c48a76e
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."
Dan Stoza [Mon, 12 Sep 2016 17:55:23 +0000 (17:55 +0000)]
Merge "Update default DispSync offsets" into nyc-mr1-dev am:
0c083d43f2
am:
204e1a0264
Change-Id: Ia49d5b1d206fbbf7d083620a3dbfe4744f9a9a24
Dan Stoza [Mon, 12 Sep 2016 17:51:33 +0000 (17:51 +0000)]
Merge "Update default DispSync offsets" into nyc-mr1-dev
am:
0c083d43f2
Change-Id: I93de11437b64aa930f8edef39e0d86ccdbb532e4
Dan Stoza [Mon, 12 Sep 2016 17:51:09 +0000 (17:51 +0000)]
Update default DispSync offsets am:
28ffe198bf
am:
e826b1c2c4
Change-Id: I3acb2aadf64e1ea19af4e675088c67f3145e03a0
Dan Stoza [Mon, 12 Sep 2016 17:48:33 +0000 (17:48 +0000)]
Update default DispSync offsets
am:
28ffe198bf
Change-Id: Id3d014c7a289890c97ca91980407e060e993bd46
Dan Stoza [Mon, 12 Sep 2016 17:37:52 +0000 (17:37 +0000)]
Merge "Update default DispSync offsets" into nyc-mr1-dev
David Brazdil [Mon, 12 Sep 2016 15:26:40 +0000 (16:26 +0100)]
resolve merge conflicts of
8ef0ace to nyc-mr1-dev-plus-aosp
Change-Id: I6feac17131e040011eb9f243bcd70640b0e8417f
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:50:41 +0000 (00:50 +0000)]
Merge "Fix google-explicit-constructor warnings in dumpstate." am:
a70396971e am:
347b6f4c35
am:
666cd74e59
Change-Id: Ie02f5e2a30c5df43ce0d088f93e73c981537d792
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."
OSDN Git Service
