7ba4368100
am 35710ab0: am ffe3e96a: Merge "GLConsumer: Fix crop math"
...
* commit '35710ab014b6ff4a914f00509ecb34737d37fb47':
GLConsumer: Fix crop math
2015-06-11 18:01:37 +00:00
35710ab014
am ffe3e96a: Merge "GLConsumer: Fix crop math"
...
* commit 'ffe3e96afe99e94904ca0c8f458a3eb708d78066':
GLConsumer: Fix crop math
2015-06-11 17:47:58 +00:00
35c98a4cec
am 765511d8: am 6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev
...
* commit '765511d8a19cac4035366e7bfbc719153e9f9e6b':
GLConsumer: Fix crop math
2015-06-11 17:47:31 +00:00
23e16bb5da
sf: Add a NULL check in getDisplayConfigs
...
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
(cherry picked from commit ac71c26e9180d9d181be5ec9e45da72d39144a8b)
2015-06-11 10:40:21 -07:00
ffe3e96afe
Merge "GLConsumer: Fix crop math"
2015-06-11 17:34:15 +00:00
765511d8a1
am 6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev
...
* commit '6cd8771c9cb9512e094bc2944bb7dd38665c1838':
GLConsumer: Fix crop math
2015-06-11 17:32:56 +00:00
68efa84e7e
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
(cherry picked from commit ec4cb38750
2015-06-11 10:20:23 -07:00
6cd8771c9c
Merge "GLConsumer: Fix crop math" into mnc-dev
2015-06-11 17:12:49 +00:00
b6c2d8dd6e
am 58996069: am 8a4222a6: Merge "Add tracing header" into mnc-dev
...
* commit '58996069ae6613b54840943709517d0e4eec7a8f':
Add tracing header
2015-06-11 02:35:27 +00:00
cd2e238ead
am ce5af4b2: am 52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
...
* commit 'ce5af4b234ed6f5d6c39d47426d4e961bf3c2858':
Use LOCATION_HARDWARE permission for data injection.
2015-06-11 02:35:26 +00:00
58996069ae
am 8a4222a6: Merge "Add tracing header" into mnc-dev
...
* commit '8a4222a647bd17c991959eca17a50ba911c3ab6b':
Add tracing header
2015-06-11 02:08:20 +00:00
ce5af4b234
am 52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
...
* commit '52720f45098e9aed57c906e64a13e4a4a2173ce8':
Use LOCATION_HARDWARE permission for data injection.
2015-06-11 02:08:19 +00:00
8a4222a647
Merge "Add tracing header" into mnc-dev
2015-06-10 23:48:14 +00:00
52720f4509
Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
2015-06-10 22:56:27 +00:00
a8814ce478
Use LOCATION_HARDWARE permission for data injection.
...
Change-Id: Ie81cb0d5f537d5431f2127891cca1d39c969ee7b
2015-06-10 15:15:57 -07:00
589f374006
am 19174ceb: am 430f5f5a: am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
...
* commit '19174ceb57102ae5f1b80e0df4f2e83d5f8a196b':
SF: Swap w/h when capturing rotated screenshots
2015-06-10 20:54:00 +00:00
19174ceb57
am 430f5f5a: am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
...
* commit '430f5f5a6203cf6a4d688bc59a7082eb517533e3':
SF: Swap w/h when capturing rotated screenshots
2015-06-10 20:36:51 +00:00
6a40d678ea
Add tracing header
...
bug:21195272
Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
2015-06-10 13:10:47 -07:00
430f5f5a62
am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
...
* commit '127cf2eff638a98c5318ba8b3edaf3ca651c4090':
SF: Swap w/h when capturing rotated screenshots
2015-06-10 18:21:55 +00:00
127cf2eff6
Merge "SF: Swap w/h when capturing rotated screenshots"
2015-06-10 18:10:07 +00:00
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
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
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
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
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
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
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
d177e044d1
Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
2015-06-10 17:28:33 +00:00
2560442a1e
Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
2015-06-10 17:26:44 +00:00
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
043bd36b0d
Merge "Only log dropped input when disabled for the first event." into mnc-dev
2015-06-10 17:08:03 +00:00
82cdd76e60
Merge "Mock out more inputflinger host functions"
2015-06-10 16:38:42 +00:00
3a98172289
Only log dropped input when disabled for the first event.
...
Bug: 19851495
Change-Id: I8cb8076723c1ca1732c3bc37f283d8eb48b7bee0
2015-06-10 15:26:13 +01:00
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
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
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
47a7dc81d0
Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
2015-06-09 23:24:54 +00:00
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
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
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
5ab3ba1e43
Merge "SF: Don't crop surface damage against viewport"
2015-06-09 20:28:59 +00:00
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
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
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
9fc80d74a2
am 837b9fb8: am 816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
...
* commit '837b9fb87b0a8ea8a4ca680952b86e4d759723d0':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-09 20:13:53 +00:00
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
837b9fb87b
am 816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
...
* commit '816c9e0eab939322360da972569506ba19fafc74':
libgui/SurfaceFlinger: Add getConsumerName
2015-06-09 18:37:09 +00:00
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
816c9e0eab
Merge "libgui/SurfaceFlinger: Add getConsumerName"
2015-06-09 18:34:11 +00:00
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