Dan Stoza
d1adebc2da
am 355950c1
: am d177e044
: Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
...
* commit '355950c1fc19c35c75203ea761882168f0980181':
SF: Swap w/h when capturing rotated screenshots
2015-06-10 18:08:31 +00:00
Christopher Tate
04c664aa49
am 633b35b4
: am 2560442a
: Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
...
* commit '633b35b4dcadc772fae5bc35404db965b18d370f':
Prevent integer overflow when calculating buffer resizes
2015-06-10 18:08:30 +00:00
Dan Stoza
355950c1fc
am d177e044
: Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
...
* commit 'd177e044d129bbecc3900a7fcd442b354de768df':
SF: Swap w/h when capturing rotated screenshots
2015-06-10 17:52:50 +00:00
Christopher Tate
633b35b4dc
am 2560442a
: Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
...
* commit '2560442a1ed7e21b9d941218d2e9e203626fa731':
Prevent integer overflow when calculating buffer resizes
2015-06-10 17:52:50 +00:00
Michael Wright
a393c62f22
am f8b34319
: am 043bd36b
: Merge "Only log dropped input when disabled for the first event." into mnc-dev
...
* commit 'f8b34319a4c1ccce63b5a8e4732f162d228085cb':
Only log dropped input when disabled for the first event.
2015-06-10 17:47:58 +00:00
Dan Stoza
65dc7eeff0
SF: Swap w/h when capturing rotated screenshots
...
Swaps width and height when capturing a screenshot that is rotated by
90 or 270 degrees.
Bug: 8433742
Change-Id: Ibf0b604f541e3cc271e56fe0ad04dc366beb5d79
(cherry picked from commit 3502416204
)
2015-06-10 10:33:21 -07:00
Michael Wright
f8b34319a4
am 043bd36b
: Merge "Only log dropped input when disabled for the first event." into mnc-dev
...
* commit '043bd36b0d50efa81d010c64009317af160d5fec':
Only log dropped input when disabled for the first event.
2015-06-10 17:32:41 +00:00
Dan Stoza
d177e044d1
Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
2015-06-10 17:28:33 +00:00
Christopher Tate
2560442a1e
Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
2015-06-10 17:26:44 +00:00
Dan Stoza
ec4cb38750
GLConsumer: Fix crop math
...
When we have excess pixels that need to be removed from (for example)
the left and right sides, we currently do something like:
left += excess / 2;
right -= excess / 2;
If excess is odd, however, this removes 1 too few pixels since the odd
pixel gets rounded down twice. This changes the math to effectively:
left += excess / 2;
right -= (excess - excess / 2);
Which removes the correct total number of pixels.
Bug: 19611086
Change-Id: I8d1ad9fe7ba67c149794c148663d12acbccccef0
2015-06-10 10:24:51 -07:00
Michael Wright
043bd36b0d
Merge "Only log dropped input when disabled for the first event." into mnc-dev
2015-06-10 17:08:03 +00:00
Tim Kilbourn
82cdd76e60
Merge "Mock out more inputflinger host functions"
2015-06-10 16:38:42 +00:00
Michael Wright
3a98172289
Only log dropped input when disabled for the first event.
...
Bug: 19851495
Change-Id: I8cb8076723c1ca1732c3bc37f283d8eb48b7bee0
2015-06-10 15:26:13 +01: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
Dan Stoza
3502416204
SF: Swap w/h when capturing rotated screenshots
...
Swaps width and height when capturing a screenshot that is rotated by
90 or 270 degrees.
Bug: 8433742
Change-Id: Ibf0b604f541e3cc271e56fe0ad04dc366beb5d79
2015-06-09 16:46:20 -07: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
ed7a50cc7d
Prevent integer overflow when calculating buffer resizes
...
Make sure that we don't go haywire if an exponential buffer growth
operation winds up wrapping integer range. Along the way, fix a
bookkeeping bug in BufferedTextOutput that would cause it to keep
spuriously realloc()ing on every append().
Bug 20674694
Change-Id: Ia845b7de36b90672a151a918ffc26c7da68e20a2
2015-06-08 14:49:09 -07: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