Tim Kilbourn
82cdd76e60
Merge "Mock out more inputflinger host functions"
2015-06-10 16:38:42 +00:00
Erik Kline
e593158ac6
am 78c8a700
: am 47a7dc81
: Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
...
* commit '78c8a7005c0f4d6c57d3f6be176574408aedf063':
Incorporate network diagnostics during a bugreport
2015-06-10 00:00:17 +00:00
Erik Kline
78c8a7005c
am 47a7dc81
: Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
...
* commit '47a7dc81d0fedc1e85091f0e8a868768d0e8cadd':
Incorporate network diagnostics during a bugreport
2015-06-09 23:47:36 +00:00
Erik Kline
47a7dc81d0
Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
2015-06-09 23:24:54 +00:00
Dan Stoza
d08e78f40a
am 024e38a8
: am 558f55c7
: am 5ab3ba1e
: Merge "SF: Don\'t crop surface damage against viewport"
...
* commit '024e38a8b9e38f2a2d8d51387f3d789893deef9f':
SF: Don't crop surface damage against viewport
2015-06-09 21:06:17 +00:00
Dan Stoza
024e38a8b9
am 558f55c7
: am 5ab3ba1e
: Merge "SF: Don\'t crop surface damage against viewport"
...
* commit '558f55c79874990cb629a02fd015eec445a20e44':
SF: Don't crop surface damage against viewport
2015-06-09 20:56:34 +00:00
Dan Stoza
558f55c798
am 5ab3ba1e
: Merge "SF: Don\'t crop surface damage against viewport"
...
* commit '5ab3ba1e43e609c7a77cc780c888f666d153a4c9':
SF: Don't crop surface damage against viewport
2015-06-09 20:40:48 +00:00
Dan Stoza
5ab3ba1e43
Merge "SF: Don't crop surface damage against viewport"
2015-06-09 20:28:59 +00:00
Dan Stoza
074a13a3cb
SF: Don't crop surface damage against viewport
...
Apply the display transform to surface damage, but don't intersect it
with the viewport.
Bug: 21486007
Change-Id: I94e697cea52096a960385d5f3b89609fdcf30a02
(cherry picked from commit 17833a1b0d
)
2015-06-09 13:27:45 -07:00
Dan Stoza
2c21ab6114
am 9fc80d74
: am 837b9fb8
: am 816c9e0e
: Merge "libgui/SurfaceFlinger: Add getConsumerName"
...
* commit '9fc80d74a2106f851d4d4c5803205b04f825f09b':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-09 20:21:34 +00:00
Dan Stoza
ff18717a08
am 8efa01d9
: am 9a9bedc8
: (-s ours) am b169b49a
: Merge "libgui: Add generation numbers to BufferQueue"
...
* commit '8efa01d9da98b036628a73353bd0ac8a6e360c7d':
libgui: Add generation numbers to BufferQueue
2015-06-09 20:21:32 +00:00
Dan Stoza
9fc80d74a2
am 837b9fb8
: am 816c9e0e
: Merge "libgui/SurfaceFlinger: Add getConsumerName"
...
* commit '837b9fb87b0a8ea8a4ca680952b86e4d759723d0':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-09 20:13:53 +00:00
Dan Stoza
8efa01d9da
am 9a9bedc8
: (-s ours) am b169b49a
: Merge "libgui: Add generation numbers to BufferQueue"
...
* commit '9a9bedc815c98a55e9fb25107be5b9d74410b8cf':
libgui: Add generation numbers to BufferQueue
2015-06-09 20:13:52 +00:00
Dan Stoza
837b9fb87b
am 816c9e0e
: Merge "libgui/SurfaceFlinger: Add getConsumerName"
...
* commit '816c9e0eab939322360da972569506ba19fafc74':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-09 18:37:09 +00:00
Dan Stoza
9a9bedc815
am b169b49a
: Merge "libgui: Add generation numbers to BufferQueue"
...
* commit 'b169b49aecdbf3424f334ac2b22c36a2988a8338':
libgui: Add generation numbers to BufferQueue
2015-06-09 18:37:08 +00:00
Dan Stoza
816c9e0eab
Merge "libgui/SurfaceFlinger: Add getConsumerName"
2015-06-09 18:34:11 +00:00
Dan Stoza
53a2e97a78
libgui/SurfaceFlinger: Add getConsumerName
...
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is update on connect
and dequeueBuffer, which should be good enough for most uses.
Bug: 6667401
Change-Id: I22c7881d778e495cf8276de7bbcd769e52429915
(cherry picked from commit c6f30bdee1
)
2015-06-09 11:28:37 -07:00
Dan Stoza
b169b49aec
Merge "libgui: Add generation numbers to BufferQueue"
2015-06-09 18:23:48 +00:00
Narayan Kamath
8772a855dd
am d6f86874
: am 3d051856
: Merge "Add an installd command to link files" into mnc-dev
...
* commit 'd6f86874c4d995841751de6e723aec39aafd70d5':
Add an installd command to link files
2015-06-09 13:16:23 +00:00
Narayan Kamath
d6f86874c4
am 3d051856
: Merge "Add an installd command to link files" into mnc-dev
...
* commit '3d0518565a5e704dc8020a96c5bb3a96a093f4cd':
Add an installd command to link files
2015-06-09 13:01:30 +00:00
Narayan Kamath
3d0518565a
Merge "Add an installd command to link files" into mnc-dev
2015-06-09 11:31:10 +00:00
Narayan Kamath
d845c96128
Add an installd command to link files
...
Given a pair of absolute paths {from_path, to_path} , check that
they are both valid apk subpaths (eg. /data/app/package/foo) and
link(2) to_path to from_path. This is required by staged installs,
where we link existing apks and oat files to their staging location.
bug: 20889739
Change-Id: I3b5e3b43677af68be59308121a4409caaa6a72f0
2015-06-09 11:35:43 +01:00
Erik Kline
90926336c1
Incorporate network diagnostics during a bugreport
...
Bug: 21449922
Change-Id: I81a3774683c08f5d4ab4ea75bec45d279fb210ec
2015-06-09 17:38:12 +09:00
Lajos Molnar
5226c372a0
am 76ade36b
: am 037d4ca3
: Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
...
* commit '76ade36bd8374678a918dac44cab60f95a0d54f3':
media: change parameters for OMX_EventOutputRendered
2015-06-09 00:40:39 +00:00
Lajos Molnar
76ade36bd8
am 037d4ca3
: Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
...
* commit '037d4ca35abbcf40e244a5d09bade6dd8b9b2b0b':
media: change parameters for OMX_EventOutputRendered
2015-06-09 00:29:41 +00:00
Lajos Molnar
037d4ca35a
Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
2015-06-09 00:04:30 +00:00
Christopher Tate
2ba1c4d6f3
am aeac647a
: am 98e67d35
: Don\'t corrupt parcel when writeFileDescriptor() fails
...
* commit 'aeac647a003c48cc8570b6c87513f0e45ea7f30e':
Don't corrupt parcel when writeFileDescriptor() fails
2015-06-08 21:46:01 +00:00
Tim Kilbourn
c472986d4c
Mock out more inputflinger host functions
...
Change-Id: I3de1e95930578410d8f7c1e77329c00f05b72325
2015-06-08 14:44:33 -07:00
Christopher Tate
aeac647a00
am 98e67d35
: Don\'t corrupt parcel when writeFileDescriptor() fails
...
* commit '98e67d352b8805a868ca0e7c2be3ea830fb7c338':
Don't corrupt parcel when writeFileDescriptor() fails
2015-06-08 21:32:58 +00:00
Christopher Tate
98e67d352b
Don't corrupt parcel when writeFileDescriptor() fails
...
We now check for fd-legality before committing binder objects to
the flattened data buffer rather than after. Previously we would
wind up corrupting the parcel and incurring driver-level errors,
as well as potentially leaking FDs.
Bug 21428802
Change-Id: Ice0d641b3dcc41fb1b8c68ce2e2ebd744c2863a1
2015-06-08 13:13:19 -07:00
Dan Stoza
271b69c4df
am bcb868db
: am c6f30bde
: libgui/SurfaceFlinger: Add getConsumerName
...
* commit 'bcb868db922b7114e2a295282da723e1bad585f3':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-08 18:38:53 +00:00
Dan Stoza
993772a60a
libgui: Add generation numbers to BufferQueue
...
This change allows producers to set a generation number on a
BufferQueue. This number will be embedded in any new GraphicBuffers
created in that BufferQueue, and attempts to attach buffers which have
a different generation number will fail.
It also plumbs the setGenerationNumber method through Surface, with the
additional effect that any buffers attached to the Surface after
setting a new generation number will automatically be updated with the
new number (as opposed to failing, as would happen on through IGBP).
Bug: 20923096
Change-Id: I32bf726b035f99c3e5834beaf76afb9f01adcbc2
(cherry picked from commit 812ed0644f
)
2015-06-08 11:18:16 -07:00
Dan Stoza
91427c82b4
am 8fd25953
: am 5b36ea44
: Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
...
* commit '8fd259534f625ff1a677b114da0b8035b75ad03c':
Revert "libgui: Add getConsumerName"
2015-06-08 17:22:07 +00:00
Dan Stoza
6f4a00ee60
am 35751d35
: am 5b23b5bf
: Merge "libgui: Add getConsumerName" into mnc-dev
...
* commit '35751d35abd0ea755f4af39b46140071550d9d41':
libgui: Add getConsumerName
2015-06-08 17:22:06 +00:00
Dan Stoza
bcb868db92
am c6f30bde
: libgui/SurfaceFlinger: Add getConsumerName
...
* commit 'c6f30bdee1f634eb90d68cb76efe935b6535a1e8':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-08 17:18:52 +00:00
Dan Stoza
8fd259534f
am 5b36ea44
: Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
...
* commit '5b36ea44c58f8def561bf37c79d3452b21e2deab':
Revert "libgui: Add getConsumerName"
2015-06-08 17:04:11 +00:00
Dan Stoza
35751d35ab
am 5b23b5bf
: Merge "libgui: Add getConsumerName" into mnc-dev
...
* commit '5b23b5bf45b115d2c91448747ea40b63377d4abd':
libgui: Add getConsumerName
2015-06-08 17:04:10 +00:00
Dan Stoza
c6f30bdee1
libgui/SurfaceFlinger: Add getConsumerName
...
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is update on connect
and dequeueBuffer, which should be good enough for most uses.
Bug: 6667401
Change-Id: I22c7881d778e495cf8276de7bbcd769e52429915
2015-06-08 09:40:49 -07:00
Dan Stoza
5b36ea44c5
Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
2015-06-08 16:30:15 +00:00
Dan Stoza
a2ca9bf0a9
Revert "libgui: Add getConsumerName"
...
This reverts commit 107fbe5599
.
Change-Id: I0c2b0f7c81193b05eb3dd2f5a59f83598434b744
2015-06-08 16:30:08 +00:00
Dan Stoza
5b23b5bf45
Merge "libgui: Add getConsumerName" into mnc-dev
2015-06-08 16:21:03 +00:00
Jeff Brown
caaa1f5a94
am 6f33fbc8
: am 13b16040
: Enable more flexible usage of blobs in parcels.
...
* commit '6f33fbc82bb92fe95e931d7a6b69b9828f874e56':
Enable more flexible usage of blobs in parcels.
2015-06-06 17:05:33 +00:00
Jeff Brown
6f33fbc82b
am 13b16040
: Enable more flexible usage of blobs in parcels.
...
* commit '13b1604018968408bcc5553e1fa5ea9df3e4e009':
Enable more flexible usage of blobs in parcels.
2015-06-06 04:47:56 +00:00
Lajos Molnar
e21d7f500f
media: change parameters for OMX_EventOutputRendered
...
This allows batching of rendered events.
Bug: 20503131
Change-Id: I3b319317c0434eb225198f8c4bf716edf68079a2
2015-06-05 17:53:40 -07:00
Jeff Brown
13b1604018
Enable more flexible usage of blobs in parcels.
...
Add functions to allow a client to take over the ashmem region
that was transferred so that it can claim it for its own and
reuse it.
Add support for mutable ashmem regions too.
Bug: 21428802
Change-Id: I16eca338cdb99b07d81fc43573d53ce86dbc60c8
2015-06-05 17:40:59 -07:00
Dan Stoza
107fbe5599
libgui: Add getConsumerName
...
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is updated on connect
and dequeueBuffer, which should be good enough for most uses.
Bug: 6667401
Change-Id: Ife94bd89023fe7c00bad916932b9a19233fd2290
2015-06-05 15:01:58 -07:00
Dan Stoza
57f50e6a1e
am d7214d62
: am 9d2c5a7c
: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
...
* commit 'd7214d62639f02db9a420eb3f97259a4c909da45':
libgui: Add generation numbers to BufferQueue
2015-06-05 16:07:35 +00:00
Dan Stoza
a697ab7088
am 37fea879
: am 17833a1b
: SF: Don\'t crop surface damage against viewport
...
* commit '37fea879609963703e75f46cb3267fa86d1f2bd2':
SF: Don't crop surface damage against viewport
2015-06-05 16:07:34 +00:00
Dan Stoza
d7214d6263
am 9d2c5a7c
: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
...
* commit '9d2c5a7c678bd384df0fb29952cf8943e7b1b160':
libgui: Add generation numbers to BufferQueue
2015-06-05 16:00:13 +00:00
Dan Stoza
37fea87960
am 17833a1b
: SF: Don\'t crop surface damage against viewport
...
* commit '17833a1b0d70cd5cea342cadea9fdbbf16748bc6':
SF: Don't crop surface damage against viewport
2015-06-05 16:00:12 +00:00