OSDN Git Service
Marco Nelissen [Tue, 26 Apr 2016 15:44:09 +0000 (08:44 -0700)]
Correctly handle dup() failure in Parcel::readNativeHandle
bail out if dup() fails, instead of creating an invalid native_handle_t
Bug:
28395952
Change-Id: Ia1a6198c0f45165b9c6a55a803e5f64d8afa0572
Dianne Hackborn [Mon, 21 Mar 2016 17:36:54 +0000 (10:36 -0700)]
Fix issue #
27252896: Security Vulnerability -- weak binder
Sending transaction to freed BBinder through weak handle
can cause use of a (mostly) freed object. We need to try to
safely promote to a strong reference first.
Change-Id: Ic9c6940fa824980472e94ed2dfeca52a6b0fd342
(manually cherry picked and resolved conflicts from commit
c11146106f94e07016e8e26e4f8628f9a0c73199)
Pablo Ceballos [Fri, 18 Mar 2016 17:52:55 +0000 (17:52 +0000)]
Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev
Pablo Ceballos [Wed, 16 Mar 2016 01:10:49 +0000 (18:10 -0700)]
DO NOT MERGE BQ: fix some uninitialized variables
Bug
27555981
Bug
27556038
Change-Id: I436b6fec589677d7e36c0e980f6e59808415dc0e
Pablo Ceballos [Sat, 20 Feb 2016 19:30:43 +0000 (11:30 -0800)]
DO NOT MERGE Add SN logging
Bug
27046057
Change-Id: I942876c09fdbe841c19807e463f5426287e07803
Pablo Ceballos [Fri, 19 Feb 2016 23:39:36 +0000 (23:39 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev
Christopher Tate [Sat, 6 Feb 2016 03:02:56 +0000 (19:02 -0800)]
Sanity check IMemory access versus underlying mmap
Bug
26877992
Change-Id: Ibbf4b1061e4675e4e96bc944a865b53eaf6984fe
Pablo Ceballos [Fri, 12 Feb 2016 03:15:35 +0000 (19:15 -0800)]
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Bug
27046057
Change-Id: I387178708f460596433f75bb059854a26cc22e78
Robert Shih [Mon, 11 Jan 2016 23:02:12 +0000 (15:02 -0800)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Bug:
26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
Nick Kralevich [Thu, 22 Oct 2015 21:48:50 +0000 (14:48 -0700)]
DO NOT MERGE: fix build try #2
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug:
23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
Nick Kralevich [Thu, 22 Oct 2015 14:09:23 +0000 (07:09 -0700)]
DO NOT MERGE: fix build breakage
fix klp-dev only build breakage.
frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope
Bug:
23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit
552a8a5d8df32f659b8d11311a244cdc6d3b7733)
Change-Id: I9b7ea859889b7697bee4165a2746602212120543
Naveen Leekha [Wed, 23 Sep 2015 00:58:21 +0000 (17:58 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )
For b/
23696300
Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
Christopher Tate [Thu, 28 May 2015 00:53:02 +0000 (17:53 -0700)]
Disregard alleged binder entities beyond parcel bounds
When appending one parcel's contents to another, ignore binder
objects within the source Parcel that appear to lie beyond the
formal bounds of that Parcel's data buffer.
Bug
17312693
Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514
(cherry picked from commit
27182be9f20f4f5b48316666429f09b9ecc1f22e)
Adam Lesinski [Wed, 13 May 2015 00:35:48 +0000 (17:35 -0700)]
Verify that the native handle was created
The inputs to native_handle_create can cause an overflowed allocation,
so check the return value of native_handle_create before accessing
the memory it returns.
Bug:
19334482
Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2
(cherry picked from commit
eaac99a7172da52a76ba48c26413778a74951b1a)
Michael Lentine [Thu, 19 Feb 2015 00:15:40 +0000 (00:15 +0000)]
am
2758eb2e: am
fde92eb0: Update maxNumber to be smaller.
* commit '
2758eb2e67d935cf1f04e3d713438c6ac7fe8b89':
Update maxNumber to be smaller.
Michael Lentine [Thu, 19 Feb 2015 00:10:11 +0000 (00:10 +0000)]
am
fde92eb0: Update maxNumber to be smaller.
* commit '
fde92eb0ffcc37106d5fe85bf1f1ba30d8639d17':
Update maxNumber to be smaller.
Michael Lentine [Wed, 18 Feb 2015 18:14:18 +0000 (10:14 -0800)]
Update maxNumber to be smaller.
There shouldn't be more than 4096 fds (probably signficantly smaller) and
there shouldn't be more than 4096 ints.
Bug:
18076253
Change-Id: I3a3e50ee3078a4710e9737114e65afc923ed0573
Michael Lentine [Tue, 2 Dec 2014 17:52:00 +0000 (17:52 +0000)]
am
3d89edca: am
e6f7a44e: Fix for corruption when numFds or numInts is too large.
* commit '
3d89edca65e07319c9ac3b9bb9889e80e8c40578':
Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:45:44 +0000 (17:45 +0000)]
am
e6f7a44e: Fix for corruption when numFds or numInts is too large.
* commit '
e6f7a44e835d320593fa33052f35ea52948ff0b2':
Fix for corruption when numFds or numInts is too large.
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.
Bug:
18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
Xia Wang [Thu, 27 Feb 2014 02:04:50 +0000 (18:04 -0800)]
Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit
b7925f1364b56708e072884a5ae9dba2d32b58e6)
Marco Nelissen [Thu, 20 Mar 2014 20:48:45 +0000 (20:48 +0000)]
am
23c2fcbb: (-s ours) am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
23c2fcbbf4be87580e64132150aa554b764425c2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:26:08 +0000 (13:26 -0700)]
am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
c0af9cafba1217e2585777964730c70e40957dcd':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:13:23 +0000 (13:13 -0700)]
am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
b14d72bce04e990639305890b2aca3ccad5b3ebb':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 18:11:18 +0000 (11:11 -0700)]
am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
d070009ecdb9e8c58ce5d1540d5bcba5587a0448':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 18:06:54 +0000 (11:06 -0700)]
am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
df6774c9a3c1460554208925f38dde08953b6d0b':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:55:05 +0000 (10:55 -0700)]
am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
7c1cdbdd68c4f809dc5616654740ea98a275892d':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:48:35 +0000 (10:48 -0700)]
am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:33:12 +0000 (10:33 -0700)]
am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
1f70863d13668dc97047df15cce547ebc8435ff2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:04:42 +0000 (10:04 -0700)]
am
37b44969: Add support for writing byte arrays to parcels
* commit '
37b44969c0ca1d00e213da685dfbb2807f2bab30':
Add support for writing byte arrays to parcels
Kenny Root [Mon, 17 Mar 2014 20:18:16 +0000 (13:18 -0700)]
Check the padded size of the read byte array
Bug:
13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Cherrypicked from
f0190bff38b6c29abbfc4a877442f71fc3d7dad8
https://googleplex-android-review.git.corp.google.com/#/c/433320/
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug:
12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit
88509090387eeb400771a786171866710cca230c)
Aravind Akella [Tue, 4 Mar 2014 03:02:46 +0000 (19:02 -0800)]
Ignore flush complete events when recording last value for a sensor.
Bug:
11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
Arve Hjønnevåg [Wed, 19 Feb 2014 23:35:52 +0000 (15:35 -0800)]
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
Arve Hjønnevåg [Fri, 14 Feb 2014 03:22:08 +0000 (19:22 -0800)]
Binder: Make sure binder objects do not overlap
Fixes crashing part of bug
11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
Jesse Hall [Thu, 7 Nov 2013 20:28:26 +0000 (12:28 -0800)]
Don't change the framebuffer target until we render a new one
Continuing to send the last-rendered framebuffer to HWC on subsequent
frames allows the HWC to read partially-composed regions that haven't
changed, instead of re-composing from scratch.
Bug:
11573910
Change-Id: I8829877d2a06001f1e1b3f168cbba71c7b217b2d
Jesse Hall [Thu, 7 Nov 2013 04:43:19 +0000 (04:43 +0000)]
Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
Jesse Hall [Wed, 6 Nov 2013 15:35:08 +0000 (15:35 +0000)]
Merge "Don't use implementation-defined format with CPU consumers" into klp-dev
Jesse Hall [Wed, 6 Nov 2013 00:12:31 +0000 (16:12 -0800)]
Provide virtual display output buffer to HWC in prepare
We were already making sure the HWComposer class had the handle before
prepare, but it wasn't passing the handle along to HWC as intended.
Partial fix for bug:
11430248
Change-Id: I25f672c4fdfaa6a81fe0acb24d9ad05153ee17dc
Jesse Hall [Tue, 5 Nov 2013 00:43:03 +0000 (16:43 -0800)]
Don't use implementation-defined format with CPU consumers
If the virtual display surface is being consumed by the CPU, it can't
be allowed with HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED since there is
no way for the CPU consumer to find out what format gralloc chose. So
for CPU-consumer surfaces, just use the BufferQueue's default format,
which can be set by the consumer.
A better but more invasive change would be to let the consumer require
a certain format (or set of formats?), and disallow the producer from
requesting a different format.
Bug:
11479817
Change-Id: I5b20ee6ac1146550e8799b806e14661d279670c0
Jamie Gennis [Mon, 4 Nov 2013 22:47:31 +0000 (22:47 +0000)]
Merge "DispSync: remove delay when enabling vsync events" into klp-dev
Jamie Gennis [Tue, 29 Oct 2013 20:36:12 +0000 (13:36 -0700)]
DispSync: remove delay when enabling vsync events
This change fixes a bug that caused an extra frame of latency when enabling
vsync event callbacks in DispSync. The bug was related to the logic that
prevents the two events from firing with very little time between them due to
updates to the vsync model.
Bug:
11479720
Change-Id: Ie7eaff9e92ffb7b7b6cb4d3d4402c96cbd29af7e
Igor Murashkin [Wed, 30 Oct 2013 21:09:39 +0000 (21:09 +0000)]
Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
Igor Murashkin [Sat, 26 Oct 2013 00:13:57 +0000 (17:13 -0700)]
EGL: rename CallStack::dump into CallStack::log
Bug:
11324229
Change-Id: Ibac1be182c336e7aa5ac098f08d18b3c188964b4
Aravind Akella [Fri, 25 Oct 2013 23:16:59 +0000 (23:16 +0000)]
Merge "Bug fixes for SensorService" into klp-dev
Aravind Akella [Tue, 15 Oct 2013 22:43:10 +0000 (15:43 -0700)]
Bug fixes for SensorService
i) Emulate Flush for AOSP Fusion Sesnsors on newer HALs that support batching.
ii) Early return if there are no events for the current SensorEventConnection.
Bug:
11325707,
11376538
Change-Id: Idb856302463649a99d3d5d0c965bb06ba06b8e1d
Marco Nelissen [Wed, 16 Oct 2013 17:57:51 +0000 (10:57 -0700)]
Native counterpart of new power manager method
Cherrypicked from master.
b/
9464621
Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d
Jesse Hall [Fri, 25 Oct 2013 17:44:41 +0000 (10:44 -0700)]
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
related to b/
8316155 - Implement HWComposer 1.3 w/ virtual display support
Change-Id: I2dc8d65a74174aa833cc491264f97f1f2df49307
Jesse Hall [Wed, 23 Oct 2013 22:12:54 +0000 (22:12 +0000)]
Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev
Jesse Hall [Wed, 23 Oct 2013 22:12:37 +0000 (22:12 +0000)]
Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev
Michael Wright [Mon, 21 Oct 2013 19:05:22 +0000 (12:05 -0700)]
Only consume touches up until the frame time
When resampling is disabled, it's currently possible to consume
touches after the current frame time. This breaks some guarantees and
could cause unexpected behaviors.
Change-Id: I99908a2cac2df9f795dd4a07188b4451213cf3e4
Andy McFadden [Fri, 18 Oct 2013 22:50:24 +0000 (15:50 -0700)]
Wait for buffers to drain
When a BufferQueue producer disconnects and reconnects, we retain
the previously-queued buffers but empty the slots. This allows
the number of queued buffers to grow without limit. The low-memory
killer does not approve.
Bug
11069934
Change-Id: Ia2eaa954c7a3904b54209a3701dba01689e204d8
Naseer Ahmed [Fri, 4 Oct 2013 20:15:22 +0000 (16:15 -0400)]
Add a boardconfig to force HWC composition of virtual displays
When this boardconfig is defined, even when all virtual display
composition is done by GLES, the HWC will be forced to copy from the
GLES framebuffer to the output buffer. On some hardware this allows
HWC to do format conversions that would otherwise have to be done by
the consumer, with worse power and/or performance.
Bug:
8316155
Change-Id: If980ecc589f138cef063eafa757f7f748196713e
Jesse Hall [Fri, 27 Sep 2013 16:05:09 +0000 (09:05 -0700)]
Use implementation-defined format when HWC writes to output buffer
When GLES isn't writing to the output buffer directly, request an
implementation-defined format with minimal usage flags, leaving the
format choice up to gralloc. On some hardware this allows HWC to do
format conversions during composition that would otherwise need to be
done (with worse power and/or performance) by the consumer.
Bug:
8316155
Change-Id: Iee6ee8404282036f9fd1833067cfe11dbadbf0bf
Ed Heyl [Thu, 17 Oct 2013 00:43:06 +0000 (17:43 -0700)]
merge in klp-release (no-op)
The Android Automerger [Wed, 16 Oct 2013 04:14:09 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 15 Oct 2013 22:55:41 +0000 (15:55 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Tue, 15 Oct 2013 03:52:46 +0000 (20:52 -0700)]
SurfaceFlinger: give SF its own vsync phase
This change allows SurfaceFlinger to run at a different vsync phase offset from
that used by external listeners.
Bug:
11175503
Change-Id: I561c53a5659fa6dc1e3e4ae30340f3c1a6adceb4
Jamie Gennis [Mon, 14 Oct 2013 19:22:52 +0000 (12:22 -0700)]
SurfaceFlinger: Add EventControlThread
This change adds a new thread for calling HWComposer's eventControl
asynchronously. The DispSync-based vsync approach ends up enabling and
disabling HWComposer's vsync callbacks at arbitrary times, and some HWComposer
implementations do not have these calls optimized.
Bug:
11175503
Change-Id: I719be82bd200b391c61d40863b991c7b59acdfd6
Jesse Hall [Tue, 15 Oct 2013 19:53:10 +0000 (19:53 +0000)]
Merge "Disable hardware vsync when blanking the screen" into klp-dev
Aravind Akella [Tue, 15 Oct 2013 17:01:55 +0000 (17:01 +0000)]
Merge "SensorService Flush API bug fix." into klp-dev
The Android Automerger [Tue, 15 Oct 2013 13:00:54 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Aravind Akella [Tue, 15 Oct 2013 00:04:42 +0000 (17:04 -0700)]
SensorService Flush API bug fix.
SensorService is dead locking itself when flush is called on older devices which don't support batching. mConnectionLock is acquired twice.
Change-Id: I5c25585bfb2b396df4b05826a9cba1da7997a3ee
Jesse Hall [Mon, 14 Oct 2013 19:56:09 +0000 (12:56 -0700)]
Disable hardware vsync when blanking the screen
Bug:
11220224
Change-Id: I99d0a42e1a6bb0aaf89706f6d100e9ef2a5deaa4
Jesse Hall [Mon, 14 Oct 2013 19:36:45 +0000 (12:36 -0700)]
Filter out vsync events from HWC with duplicate timestamps
Bug:
11220224
Change-Id: I4efe0b66ea8969bf0ec3c4fcb325d354c8a0c315
The Android Automerger [Mon, 14 Oct 2013 02:20:31 +0000 (19:20 -0700)]
merge in klp-release history after reset to klp-dev
Aravind Akella [Sun, 13 Oct 2013 22:47:47 +0000 (22:47 +0000)]
Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
Aravind Akella [Sun, 13 Oct 2013 00:30:40 +0000 (17:30 -0700)]
Adding PackageManager feature strings for stepcounter and stepdetector.
Change-Id: I75ec21900fdc3ea80b61ec12c851a0c5ce9c44e8
Jesse Hall [Sun, 13 Oct 2013 20:13:59 +0000 (20:13 +0000)]
Merge "DispSync: don't compensate for wakeup latency" into klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:02 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Andy McFadden [Fri, 11 Oct 2013 21:39:49 +0000 (21:39 +0000)]
Merge "Use black for blackout layer" into klp-dev
Aravind Akella [Tue, 8 Oct 2013 21:59:26 +0000 (14:59 -0700)]
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
Andy McFadden [Fri, 11 Oct 2013 18:16:03 +0000 (11:16 -0700)]
Use black for blackout layer
SurfaceFlinger was rendering dark purple for secure content, which
showed up when we took a screen shot for the orientation change
animation. Use black instead.
Bug
11157921
Change-Id: I3895e8168891d49dc5b84eed599bcd0a303bb70a
Michael Wright [Fri, 11 Oct 2013 01:54:12 +0000 (18:54 -0700)]
Eliminate latency when resampling is disabled
Since the latency was introduced to avoid egregious errors during
resampling, remove it when we aren't resampling.
Change-Id: Ia8e9a9afb1e16212fec81a8c9c661c598e1b0ebf
Dave Burke [Fri, 11 Oct 2013 02:33:15 +0000 (02:33 +0000)]
Merge "Eliminate latency when resampling is disabled" into klp-dev
Aravind Akella [Fri, 11 Oct 2013 02:05:40 +0000 (02:05 +0000)]
Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
Michael Wright [Fri, 11 Oct 2013 01:54:12 +0000 (18:54 -0700)]
Eliminate latency when resampling is disabled
Since the latency was introduced to avoid egregious errors during
resampling, remove it when we aren't resampling.
Change-Id: Ia8e9a9afb1e16212fec81a8c9c661c598e1b0ebf
Jesse Hall [Thu, 10 Oct 2013 22:24:32 +0000 (22:24 +0000)]
Merge "Wake up disp sync thread when setting display period" into klp-dev
Jesse Hall [Thu, 10 Oct 2013 21:48:22 +0000 (14:48 -0700)]
Wake up disp sync thread when setting display period
Bug:
10624956
Change-Id: I272c15f319521bfbd1bb70451366c7dd84d60bf9
Andy McFadden [Wed, 9 Oct 2013 23:38:02 +0000 (16:38 -0700)]
Fix blank / partial screenshots
The screen capture code wasn't waiting for the render to finish,
so sometimes you'd see an empty or partial image.
Bug
11131777
Change-Id: Ic64087322ce3bb15bb5f4fb1eb07579880fe6197
Jamie Gennis [Thu, 10 Oct 2013 00:49:37 +0000 (17:49 -0700)]
DispSync: don't compensate for wakeup latency
This change removes the wakeup latency compensation from the software-generated
vsync events. Choreographer can't handle timestamps in the future, so don't
aim for early wake-ups with the expectation that the actual wake-up will be
late.
Bug:
11153576
Aravind Akella [Tue, 8 Oct 2013 21:59:26 +0000 (14:59 -0700)]
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Change-Id: I4ef2bec80406c517903ab9782dc9eaf3fa8b7f36
Andy McFadden [Wed, 9 Oct 2013 23:38:02 +0000 (16:38 -0700)]
Fix blank / partial screenshots
The screen capture code wasn't waiting for the render to finish,
so sometimes you'd see an empty or partial image.
Bug
11131777
Change-Id: Ic64087322ce3bb15bb5f4fb1eb07579880fe6197
The Android Automerger [Wed, 9 Oct 2013 13:01:16 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Ed Heyl [Tue, 8 Oct 2013 22:40:38 +0000 (15:40 -0700)]
merge in KQS81M
Jamie Gennis [Tue, 30 Jul 2013 22:10:32 +0000 (15:10 -0700)]
SurfaceFlinger: SW-based vsync events
This change adds the DispSync class, which models the hardware vsync event
times to allow vsync event callbacks to be done at an arbitrary phase offset
from the hardware vsync. This can be used to reduce the minimum latency from
Choreographer wake-up to on-screen image presentation.
Bug:
10624956
Change-Id: I8c7a54ceacaa4d709726ed97b0dcae4093a7bdcf
The Android Automerger [Sun, 6 Oct 2013 13:01:27 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Alex Ray [Thu, 3 Oct 2013 20:09:37 +0000 (13:09 -0700)]
Add feature android.hardware.consumerir xml file
Bug:
10676690
Change-Id: I2cc62b9c97a71588c43ff96ca38d470976bde9b0
Marco Nelissen [Thu, 3 Oct 2013 16:34:51 +0000 (16:34 +0000)]
Merge "Allow blaming a single uid for work done" into klp-dev
Lajos Molnar [Thu, 3 Oct 2013 16:10:25 +0000 (16:10 +0000)]
Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev
Marco Nelissen [Wed, 2 Oct 2013 19:42:20 +0000 (12:42 -0700)]
Allow blaming a single uid for work done
This lets audioflinger assign blame for wakelocks to a single uid.
Currently this is only used for recording wakelocks.
b/
10985160
Change-Id: Idc9adb22c29030010ac690d4cb95e7e7ea6b91e6
The Android Automerger [Thu, 3 Oct 2013 13:02:17 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Jesse Hall [Wed, 2 Oct 2013 00:25:20 +0000 (17:25 -0700)]
Set the outbuf acquire fence after we actually have it.
In GLES-only mode, we don't have the outbuf acquire fence until after
GLES composition is done for the frame. We were setting the fence in
HWC's state immediately after dequeueing the buffer from the consumer,
before GLES had started. This fence got passed through HWC and on to
the consumer, so the consumer was reading the buffer before GLES was
done writing to it.
Now we update HWC's state just before set(), when we know we have the
right fence.
Bug:
11000763
Change-Id: Iea9db4c69634c352dc2d600f0bdb6bef2a432636
Mathias Agopian [Tue, 1 Oct 2013 22:36:52 +0000 (15:36 -0700)]
only clear FB when asked for the opaque layer
a layer need to be considered NOT opaque if it has a
plane-alpha.
Bug:
10846930
Change-Id: Ibd8981b63ede4560c7096bacc4cff46a7eb2a8bb
Jesse Hall [Mon, 30 Sep 2013 23:49:30 +0000 (16:49 -0700)]
Treat composition frames with no layers as using GLES composition
When there are no window layers for a display, SurfaceFlinger clears
the undefined region using GLES. Some of the places that check for
GLES composition weren't considering this special case, in particular:
- We were skipping the eglSwapBuffers() on these frames.
- We were putting VirtualDisplaySurface in HWC-only composition mode.
This change centralizes the logic for this special case.
Bug:
10957068
Change-Id: I2deaf2ed101e8ea76708862a6bb67751b6078794
Jamie Gennis [Thu, 26 Sep 2013 00:21:56 +0000 (17:21 -0700)]
BufferQueue: fix a test crash
Bug:
10935880
Change-Id: If76e9fb055103bad0db7e6c16487532671573149
Jamie Gennis [Wed, 2 Oct 2013 17:36:48 +0000 (17:36 +0000)]
Merge "GLConsumer: start using EGL_ANDROID_image_crop" into klp-dev