OSDN Git Service
Mark Salyzyn [Fri, 31 Jul 2015 22:17:36 +0000 (22:17 +0000)]
am
5b7e9dc7: Merge "dumpstate: add logcat -b all -S"
* commit '
5b7e9dc7db79b6a4750efc628b81765b58a7cd92':
dumpstate: add logcat -b all -S
Mark Salyzyn [Fri, 31 Jul 2015 22:10:51 +0000 (22:10 +0000)]
Merge "dumpstate: add logcat -b all -S"
Mark Salyzyn [Thu, 30 Jul 2015 21:57:09 +0000 (14:57 -0700)]
dumpstate: add logcat -b all -S
- For those that are proud to call themselves logspam police
- Every time someone declares that something is too chatty, or that
they lost their logs because they were declared too chatty and
their associated logs were aggresively pruned we generally
ask them to report the logger statistics to pinpoint what software
product that is the elephant in the room.
- Every time we want to spawn a new 'stop being so spammy' bug spawned
off a bugreport collected for another purpose, we *wish* we had the
logger statistics to help add gravitas to the claim that some piece
of software is the top, or near the top, polluter.
Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c
Yasuhiro Matsuda [Thu, 30 Jul 2015 07:51:08 +0000 (07:51 +0000)]
am
366c38f8: Merge "Enable atrace to read categories from file."
* commit '
366c38f82393c8a3e9419c0dbe6320504a4d741b':
Enable atrace to read categories from file.
Yasuhiro Matsuda [Thu, 30 Jul 2015 07:42:08 +0000 (07:42 +0000)]
Merge "Enable atrace to read categories from file."
Nick Kralevich [Sun, 26 Jul 2015 04:39:24 +0000 (04:39 +0000)]
am
2cb9994c: Merge "dumpstate: remove unnecessary mkdir"
* commit '
2cb9994c022e67c28f0e436035202928a000993c':
dumpstate: remove unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:26:11 +0000 (04:26 +0000)]
Merge "dumpstate: remove unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:13:49 +0000 (21:13 -0700)]
dumpstate: remove unnecessary mkdir
/data/anr is now created in init.rc. This code is unnecessary.
Bug:
22385254
Change-Id: I4ea9c311d52eee7fb6b90235fbd12a4c9364d71f
Andreas Gampe [Fri, 17 Jul 2015 01:31:13 +0000 (01:31 +0000)]
am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
25b2ed03487b7c7b4e5e6897525a169ee32b1998':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:23:10 +0000 (01:23 +0000)]
Merge "Installd: Add a swap override flag"
Andreas Gampe [Thu, 16 Jul 2015 22:55:41 +0000 (15:55 -0700)]
Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug:
20658562
(cherry picked from commit
c968c0175e967e39e72f557b5e014b9575ba4727)
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Evgenii Stepanov [Wed, 15 Jul 2015 00:02:44 +0000 (00:02 +0000)]
am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
5e8dcf1c1fbd060f1bd2ba8d45bbc228bb310a7e':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Tue, 14 Jul 2015 23:47:59 +0000 (23:47 +0000)]
Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
Elliott Hughes [Thu, 9 Jul 2015 17:29:47 +0000 (17:29 +0000)]
am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
9bad590ef91c655fb9a0212e5a347aaa3e350bb0':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:16:58 +0000 (17:16 +0000)]
Merge "Binder on Windows? Unlikely."
Elliott Hughes [Thu, 9 Jul 2015 17:04:34 +0000 (10:04 -0700)]
Binder on Windows? Unlikely.
Change-Id: I36c1bee4ed33b9b0d24109a6dbaefa0548dd5aa8
Evgenii Stepanov [Wed, 8 Jul 2015 22:49:52 +0000 (15:49 -0700)]
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Bug:
21785137
Change-Id: Iac56419a9ca776c5704bed44d3f0a1a1edd9d172
Narayan Kamath [Wed, 1 Jul 2015 13:14:41 +0000 (13:14 +0000)]
am
dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
* commit '
dbc2d87a74987db84f6cb3cf1eed9ae7ca450ce7':
Installd: Fix delete_code_cache() clearing the wrong cache dir
Narayan Kamath [Wed, 1 Jul 2015 13:03:55 +0000 (13:03 +0000)]
Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
Hao Li [Thu, 25 Jun 2015 02:31:56 +0000 (14:31 +1200)]
Installd: Fix delete_code_cache() clearing the wrong cache dir
Fix a typo in delete_code_cache() introduced by commit
c03de09, which
causes the function to empty /data/data/<package_name>/cache/ rather
than /data/data/<package_name>/code_cache/.
The following CTS test case should now pass:
com.android.cts.appsecurity.SplitTests#testClearCodeCache
Change-Id: I2d9452d70ed39b3ea29ad65fb35e788c2fef5100
Signed-off-by: Hao Li <hao.i.li@intel.com>
Signed-off-by: Yu Ning <yu.ning@intel.com>
Dan Stoza [Tue, 30 Jun 2015 17:24:40 +0000 (17:24 +0000)]
am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
1998615f8b5becc6d2bb309a4a1686fe24c71bbc':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:11:08 +0000 (17:11 +0000)]
Merge "sf: Initialize EventThread before creating HWC"
John Reck [Mon, 29 Jun 2015 14:28:45 +0000 (14:28 +0000)]
am
dd749506: Merge "Fix async_stop"
* commit '
dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
Fix async_stop
John Reck [Mon, 29 Jun 2015 14:17:43 +0000 (14:17 +0000)]
Merge "Fix async_stop"
John Reck [Fri, 15 May 2015 17:00:34 +0000 (10:00 -0700)]
Fix async_stop
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
(cherry picked from commit
2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2)
Yasuhiro Matsuda [Mon, 29 Jun 2015 10:20:39 +0000 (19:20 +0900)]
Enable atrace to read categories from file.
Add -f option to atrace, which enables atrace to use the
categories written in the specified file.
BUG:
21739901
Change-Id: I2cf1f277280434b28c426c68e2864b62aebd20cc
Saurabh Shah [Tue, 16 Jun 2015 00:55:51 +0000 (17:55 -0700)]
sf: Initialize EventThread before creating HWC
Once HWC is created, it could use any of the provided hooks, which
could lead to a crash if the EventThread (handler) isn't initialized
prior to creating HWC.
Change-Id: I5ea35fe9bcb150fb74aae1295b798bd787ad6cee
Mark Salyzyn [Mon, 15 Jun 2015 14:35:49 +0000 (14:35 +0000)]
am
2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"
* commit '
2ab05fc551f8ee8442b05484cce0350c1b523678':
dumpstate: modify logcat timeout to compensate for storage speed
Mark Salyzyn [Mon, 15 Jun 2015 14:27:10 +0000 (14:27 +0000)]
Merge "dumpstate: modify logcat timeout to compensate for storage speed"
Mark Salyzyn [Fri, 12 Jun 2015 19:28:24 +0000 (12:28 -0700)]
dumpstate: modify logcat timeout to compensate for storage speed
Discover the logcat buffer size, divide by the worst storage
speed in kb/s, and multiply by ten to estimate the timeout in
ms for each named buffer. If that value is less than 20 seconds,
then select 20 seconds. Apply this to each logcat request.
Bug:
21555259
Change-Id: Id36aebff83cb06e94350e4a84fa266b66a8444fc
Dan Stoza [Fri, 12 Jun 2015 17:00:44 +0000 (17:00 +0000)]
am
2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '
2b5b55e73c79658b9a0ae3fdf347f6dbe65e3c68':
sf: Fix incorrect state reporting in dumpsys
Dan Stoza [Fri, 12 Jun 2015 16:47:21 +0000 (16:47 +0000)]
Merge "sf: Fix incorrect state reporting in dumpsys"
Manoj Kumar AVM [Thu, 11 Jun 2015 21:18:14 +0000 (14:18 -0700)]
sf: Fix incorrect state reporting in dumpsys
Dumpsys utility accesses layer compositionType variable
with out proper protection. These variables are modified
during hwc_prepare call. Existing HAL lock protection is not
sufficient to address this issue. Failure to do this will
result in incorrect state reporting in dumpsys.
A new displayLock mutex in HWComposer will be used in both
dumpsys and draw calls to ensure correct state is accessed.
Change-Id: I8a57de59525adc0e089b3bed95c067c01e42b666
Dan Stoza [Thu, 11 Jun 2015 19:40:31 +0000 (19:40 +0000)]
am
85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '
85e271d051770fdd5bb1bb017255f735cbd45459':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 19:31:43 +0000 (19:31 +0000)]
Merge "sf: Add a NULL check in getDisplayConfigs"
Tatenda Chipeperekwa [Wed, 29 Oct 2014 23:47:19 +0000 (16:47 -0700)]
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: Ib32a7dc8378d3438df0dba1ecd608bbcfc837717
Dan Stoza [Thu, 11 Jun 2015 17:47:58 +0000 (17:47 +0000)]
am
ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '
ffe3e96afe99e94904ca0c8f458a3eb708d78066':
GLConsumer: Fix crop math
Dan Stoza [Thu, 11 Jun 2015 17:34:15 +0000 (17:34 +0000)]
Merge "GLConsumer: Fix crop math"
Dan Stoza [Tue, 9 Jun 2015 22:05:23 +0000 (15:05 -0700)]
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
ec4cb387502d5bd09e49b55605cf679fe3a0207a)
Dan Stoza [Wed, 10 Jun 2015 18:21:55 +0000 (18:21 +0000)]
am
127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '
127cf2eff638a98c5318ba8b3edaf3ca651c4090':
SF: Swap w/h when capturing rotated screenshots
Dan Stoza [Wed, 10 Jun 2015 18:10:07 +0000 (18:10 +0000)]
Merge "SF: Swap w/h when capturing rotated screenshots"
Dan Stoza [Tue, 9 Jun 2015 23:44:40 +0000 (16:44 -0700)]
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
3502416204d9dbd905012ee586d8bd145323809f)
Dan Stoza [Tue, 9 Jun 2015 20:40:48 +0000 (20:40 +0000)]
am
5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '
5ab3ba1e43e609c7a77cc780c888f666d153a4c9':
SF: Don't crop surface damage against viewport
Dan Stoza [Tue, 9 Jun 2015 20:28:59 +0000 (20:28 +0000)]
Merge "SF: Don't crop surface damage against viewport"
Dan Stoza [Fri, 5 Jun 2015 02:40:03 +0000 (19:40 -0700)]
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
17833a1b0d70cd5cea342cadea9fdbbf16748bc6)
Dan Stoza [Tue, 9 Jun 2015 18:37:09 +0000 (18:37 +0000)]
am
816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
* commit '
816c9e0eab939322360da972569506ba19fafc74':
libgui/SurfaceFlinger: Add getConsumerName
Dan Stoza [Tue, 9 Jun 2015 18:37:08 +0000 (18:37 +0000)]
am
b169b49a: Merge "libgui: Add generation numbers to BufferQueue"
* commit '
b169b49aecdbf3424f334ac2b22c36a2988a8338':
libgui: Add generation numbers to BufferQueue
Dan Stoza [Tue, 9 Jun 2015 18:34:10 +0000 (18:34 +0000)]
Merge "libgui/SurfaceFlinger: Add getConsumerName"
Dan Stoza [Mon, 8 Jun 2015 16:32:50 +0000 (09:32 -0700)]
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
c6f30bdee1f634eb90d68cb76efe935b6535a1e8)
Dan Stoza [Tue, 9 Jun 2015 18:23:48 +0000 (18:23 +0000)]
Merge "libgui: Add generation numbers to BufferQueue"
Dan Stoza [Tue, 2 Jun 2015 22:45:22 +0000 (15:45 -0700)]
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
812ed0644f8f8f71ca403f4e5793f0dbc1fcf9b2)
Nick Kralevich [Wed, 3 Jun 2015 13:41:53 +0000 (13:41 +0000)]
am
c19fdee3: Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
* commit '
c19fdee38a4715b0d642fc8673687715766307cc':
Call selinux_status_open() prior to use of selinux_status_updated().
Nick Kralevich [Wed, 3 Jun 2015 13:33:36 +0000 (13:33 +0000)]
Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
Stephen Smalley [Wed, 3 Jun 2015 13:25:37 +0000 (09:25 -0400)]
Call selinux_status_open() prior to use of selinux_status_updated().
The selinux_status_*() interfaces require calling selinux_status_open()
first. Since this was not being called by servicemanager, the
selinux_status_updated() call was always failing and servicemanager
was not reloading service_contexts upon a policy reload.
Change-Id: I6ac62e114bbca99c5f0999feb918fcde15009274
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dan Stoza [Mon, 1 Jun 2015 22:09:30 +0000 (22:09 +0000)]
am
8980e0cc: Merge "libgui: Propagate error by clearing sp<GB>"
* commit '
8980e0ccd4608adbef0d7c80ead97cec995e269c':
libgui: Propagate error by clearing sp<GB>
Dan Stoza [Mon, 1 Jun 2015 21:59:20 +0000 (21:59 +0000)]
Merge "libgui: Propagate error by clearing sp<GB>"
Dan Stoza [Mon, 1 Jun 2015 20:59:15 +0000 (13:59 -0700)]
libgui: Propagate error by clearing sp<GB>
Clears the sp<GraphicBuffer> returned by createGraphicBuffer when there
is an error during unflattening.
Bug:
21498231
Change-Id: I886da4474fc06853cc59188d62044b7d7549126b
(cherry picked from commit
6a04e5fcf67e754b215301fe38a6401db567f4b5)
Dan Stoza [Mon, 1 Jun 2015 18:42:31 +0000 (18:42 +0000)]
am
cf1edb3f: Merge "Fix libgui crop matrix test."
* commit '
cf1edb3f3ece597dcf9c3f4ae018374550e8b561':
Fix libgui crop matrix test.
Dan Stoza [Mon, 1 Jun 2015 18:31:20 +0000 (18:31 +0000)]
am
75145aa2: Merge "SF: Reduce resync samples without present"
* commit '
75145aa2b77c348bce43c432c17b70f6dcb31c91':
SF: Reduce resync samples without present
Dan Stoza [Mon, 1 Jun 2015 18:31:19 +0000 (18:31 +0000)]
Merge "Fix libgui crop matrix test."
Dan Stoza [Mon, 1 Jun 2015 18:31:19 +0000 (18:31 +0000)]
am
edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
* commit '
edcfe7c513a111890b7bd245cf10fa105e910277':
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Dan Stoza [Mon, 1 Jun 2015 18:31:17 +0000 (18:31 +0000)]
am
c76683f5: Merge "Check that width and height parameters are small."
* commit '
c76683f51f6ad1f5493d9af43bf868601f474060':
Check that width and height parameters are small.
Michael Lentine [Fri, 29 May 2015 23:05:36 +0000 (16:05 -0700)]
Fix libgui crop matrix test.
On devices that have the crop image extension the crop is not applied to the
transform matrix so we have to expect different results in this case.
Change-Id: If62dec1111fb77c9fa2c4332d121665960ce0216
(cherry picked from commit
04b00cea67b406c4a971b24b9f91e95c754813ed)
Dan Stoza [Mon, 1 Jun 2015 18:27:35 +0000 (18:27 +0000)]
Merge "SF: Reduce resync samples without present"
Dan Stoza [Fri, 29 May 2015 20:00:23 +0000 (13:00 -0700)]
SF: Reduce resync samples without present
Reduces the number of resync samples that DispSync will attempt to
collect without an intervening present from 12 to 4. The former value
was causing excessive power draw for some vendors' implementations, and
reducing it doesn't seem to harm anything.
Bug:
20724456
Change-Id: Ifd6e0490be67756ed001d509a38e8a36953b4618
(cherry picked from commit
9c64757f6530a0510f15f8bd75b1925a3001f83a)
Dan Stoza [Mon, 1 Jun 2015 18:25:50 +0000 (18:25 +0000)]
Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
Dan Stoza [Fri, 29 May 2015 19:48:04 +0000 (12:48 -0700)]
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before
calling alloc on the gralloc module. This filters out the new flag
GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the
producer, but which does not affect the allocation of buffers.
Bug:
19801661
Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247
(cherry picked from commit
b8efdc40039e4900ae2c64fbdfa03906c867ec84)
Dan Stoza [Mon, 1 Jun 2015 18:18:42 +0000 (18:18 +0000)]
Merge "Check that width and height parameters are small."
Michael Lentine [Fri, 29 May 2015 00:43:06 +0000 (17:43 -0700)]
Check that width and height parameters are small.
The product of width and height should be less than UINT32_MAX (in practice
smaller). Adding the checks prevents overflows when allocating buffers.
Bug:
20726612
Change-Id: I9769edf0688a9bfe69906d49fa0540cadf4c49b0
(cherry picked from commit
1c4537e2e80aa776a61517be8b1605e36432287a)
Dan Stoza [Thu, 28 May 2015 21:40:29 +0000 (21:40 +0000)]
am
a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
* commit '
a8702c4765993f31a70243e4f89c251fe9911cde':
SurfaceFlinger: Tweak whitespace in DdmConnection
Dan Stoza [Thu, 28 May 2015 21:40:28 +0000 (21:40 +0000)]
am
5566d9db: Merge "Bypass surface flinger permission check for calls from system."
* commit '
5566d9db26e656a53ee9a5e87c0af997bb1a10d5':
Bypass surface flinger permission check for calls from system.
Dan Stoza [Thu, 28 May 2015 21:40:27 +0000 (21:40 +0000)]
am
13c04c27: Merge "surfaceflinger: Fix range check for getFormat"
* commit '
13c04c27622c7be474e9368211795bcec052dedb':
surfaceflinger: Fix range check for getFormat
Dan Stoza [Thu, 28 May 2015 21:25:10 +0000 (21:25 +0000)]
Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
Dan Stoza [Thu, 28 May 2015 21:23:54 +0000 (14:23 -0700)]
SurfaceFlinger: Tweak whitespace in DdmConnection
Change-Id: I99e7b09e4bc3611ffb790eddfbb9b3c8b9bc5d4c
Dan Stoza [Thu, 28 May 2015 21:21:27 +0000 (21:21 +0000)]
Merge "Bypass surface flinger permission check for calls from system."
Dan Stoza [Thu, 28 May 2015 21:20:59 +0000 (21:20 +0000)]
Merge "surfaceflinger: Fix range check for getFormat"
Dan Stoza [Thu, 28 May 2015 21:20:55 +0000 (21:20 +0000)]
am
20f7a6f0: Merge "Modify EGL to disconnect the window when the surface gets destroyed."
* commit '
20f7a6f004511486a2130030a4694ec2d2983c96':
Modify EGL to disconnect the window when the surface gets destroyed.
Jeff Brown [Sat, 11 Apr 2015 03:20:13 +0000 (20:20 -0700)]
Bypass surface flinger permission check for calls from system.
Early during the boot, before activity manager is ready to handle
permission checks, the system needs to be able to change the display
state. Added a hardcoded exemption for AID_SYSTEM (which already
has permission to talk to surface flinger anyhow).
Bug:
19029490
Change-Id: I6222edcab8e394e5fb6adf7a982be446e4505a1e
(cherry picked from commit
3bfe51d7901e99e7f122f76ed2708e2b67b71cf9)
Ajay Dudani [Sun, 3 May 2015 18:44:55 +0000 (11:44 -0700)]
surfaceflinger: Fix range check for getFormat
Fix potential buffer overflow error in getFormat with indices
greater than MAX_HWC_DISPLAYS.
Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
(cherry picked from commit
4e3e30c2d5a2a6f7dc4ee8696b1ac2a52dffd5dc)
Dan Stoza [Thu, 28 May 2015 21:10:35 +0000 (21:10 +0000)]
Merge "Modify EGL to disconnect the window when the surface gets destroyed."
Michael Lentine [Wed, 23 Jul 2014 17:19:41 +0000 (10:19 -0700)]
Modify EGL to disconnect the window when the surface gets destroyed.
Bug:
14445579
Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
(cherry picked from commit
00699fa64197cc72a160d69e1f0003cdd43dc136)
Dan Stoza [Thu, 28 May 2015 21:08:24 +0000 (21:08 +0000)]
am
c2bdfb86: Merge "SF: Skip render-to-texture for color transforms"
* commit '
c2bdfb869427f840c37a977ca91c87ca75b89b0f':
SF: Skip render-to-texture for color transforms
Dan Stoza [Thu, 28 May 2015 21:08:23 +0000 (21:08 +0000)]
am
0af1e0fe: Merge "Add hotplug support for primary display."
* commit '
0af1e0feb6c3c693707fe5b970518713d0149741':
Add hotplug support for primary display.
Dan Stoza [Thu, 28 May 2015 21:08:20 +0000 (21:08 +0000)]
am
35283482: Merge "libgui: Fix surface damage on rotated buffers"
* commit '
35283482d0d82f7d264b77941aabe41dacfe3155':
libgui: Fix surface damage on rotated buffers
Dan Stoza [Thu, 28 May 2015 21:08:17 +0000 (21:08 +0000)]
am
0a70ed99: Merge "Fix surfaceflinger tests."
* commit '
0a70ed998cad67bf1c82e82d4229291c9dcc22ac':
Fix surfaceflinger tests.
Dan Stoza [Thu, 28 May 2015 21:08:15 +0000 (21:08 +0000)]
am
4ebb44e8: Merge "Fix libgui tests."
* commit '
4ebb44e8cc42231bc9c4588ec3432eae9770483a':
Fix libgui tests.
Dan Stoza [Thu, 28 May 2015 21:02:22 +0000 (21:02 +0000)]
Merge "SF: Skip render-to-texture for color transforms"
Dan Stoza [Thu, 28 May 2015 20:59:43 +0000 (20:59 +0000)]
Merge "Add hotplug support for primary display."
Dan Stoza [Thu, 28 May 2015 20:57:47 +0000 (20:57 +0000)]
Merge "libgui: Fix surface damage on rotated buffers"
Dan Stoza [Thu, 28 May 2015 20:55:43 +0000 (20:55 +0000)]
Merge "Fix surfaceflinger tests."
Dan Stoza [Thu, 28 May 2015 20:55:20 +0000 (20:55 +0000)]
am
10cb68fb: Merge "fix BufferItem flatten/unflatten alignment"
* commit '
10cb68fb971c899d7d1eb6c131ecf59761af6ddf':
fix BufferItem flatten/unflatten alignment
Dan Stoza [Thu, 28 May 2015 20:55:19 +0000 (20:55 +0000)]
am
1bdeb9d8: Merge "Refactor ConsumerBase and it\'s derived classes."
* commit '
1bdeb9d84f4c63a0fb6be2517aebe5de88a3bb45':
Refactor ConsumerBase and it's derived classes.
Jesse Hall [Thu, 28 May 2015 20:55:18 +0000 (20:55 +0000)]
am
5a606c3a: Merge "Fix EGL shim extension injection for GL ES 3 drivers."
* commit '
5a606c3ab9ead418709c0f63940b60347d11e925':
Fix EGL shim extension injection for GL ES 3 drivers.
Dan Stoza [Thu, 28 May 2015 20:55:17 +0000 (20:55 +0000)]
am
d19ad6fb: Merge "Add ConsumerBase::isAbandoned"
* commit '
d19ad6fb676f6934bf9208a47d33738234570145':
Add ConsumerBase::isAbandoned
Dan Stoza [Thu, 28 May 2015 20:54:05 +0000 (20:54 +0000)]
Merge "Fix libgui tests."
Dan Stoza [Thu, 28 May 2015 20:51:55 +0000 (20:51 +0000)]
Merge "fix BufferItem flatten/unflatten alignment"
Dan Stoza [Thu, 28 May 2015 20:48:47 +0000 (20:48 +0000)]
Merge "Refactor ConsumerBase and it's derived classes."
Jesse Hall [Thu, 28 May 2015 20:46:44 +0000 (20:46 +0000)]
Merge "Fix EGL shim extension injection for GL ES 3 drivers."
Dan Stoza [Thu, 28 May 2015 20:39:59 +0000 (20:39 +0000)]
Merge "Add ConsumerBase::isAbandoned"
Dan Stoza [Mon, 20 Oct 2014 22:46:09 +0000 (15:46 -0700)]
SF: Skip render-to-texture for color transforms
In cases where SurfaceFlinger is applying a color matrix (usually for
accessibility features), we previously would perform a render-to-
texture for the initial composition, and then apply the matrix during
a copy to the framebuffer. This changes that behavior to just apply the
matrix during composition without a render-to-texture pass.
This may result in a perceived change of the image in cases with alpha
blending, since the blending is performed at a different stage of the
pipeline and the system effectively performs non-linear blends.
However, neither this nor the prior render-to-texture pass is strictly
correct in that regard, and this approach is less error-prone and
likely faster.
Change-Id: I2110ff0374f61d76df7b087dde8a1ed98990440c
(cherry picked from commit
f008799d3753e52c10849824ff8146985ea66284)