OSDN Git Service
Jesse Hall [Wed, 6 Nov 2013 16:52:02 +0000 (08:52 -0800)]
am
f111ee13: am
49318631: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev
* commit '
f111ee13a6f5d8606c5dc7a5cc07cedf929e69a8':
Don't use implementation-defined format with CPU consumers
Jesse Hall [Wed, 6 Nov 2013 15:38:36 +0000 (07:38 -0800)]
am
49318631: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev
* commit '
493186312a9a8c0215da0d6d3a9b0369491c0796':
Don't use implementation-defined format with CPU consumers
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
Jamie Gennis [Tue, 5 Nov 2013 20:02:26 +0000 (12:02 -0800)]
am
39c5ea2c: am
ee874caa: Merge "DispSync: remove delay when enabling vsync events" into klp-dev
* commit '
39c5ea2caaddd7ea44eaeed38d3760fbc421ad56':
DispSync: remove delay when enabling vsync events
Jamie Gennis [Tue, 5 Nov 2013 05:55:09 +0000 (21:55 -0800)]
am
ee874caa: Merge "DispSync: remove delay when enabling vsync events" into klp-dev
* commit '
ee874caa81ad48d6d0ee34509d3050ca9c046676':
DispSync: remove delay when enabling vsync events
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
Jesse Hall [Thu, 31 Oct 2013 06:23:45 +0000 (23:23 -0700)]
am
18f94b1e: resolved conflicts for merge of
51b27e82 to klp-dev-plus-aosp
* commit '
18f94b1e6c489f0d68c694a197aae898c68124bb':
fix corruption in Vector<> when malloc falied
Jesse Hall [Thu, 31 Oct 2013 06:21:21 +0000 (23:21 -0700)]
resolved conflicts for merge of
51b27e82 to klp-dev-plus-aosp
File was moved to system/core.git. Change will be applied there.
Change-Id: Ic2027b7f3f1f1fb4b896a219a8c1b4ab545d9723
Jesse Hall [Thu, 31 Oct 2013 04:02:24 +0000 (04:02 +0000)]
Merge "fix corruption in Vector<> when malloc falied"
Igor Murashkin [Wed, 30 Oct 2013 21:18:46 +0000 (14:18 -0700)]
am
bb3b5249: am
40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
* commit '
bb3b52495909ee1ce5d8b9beb6e8a9c72f0cdd90':
EGL: rename CallStack::dump into CallStack::log
Igor Murashkin [Wed, 30 Oct 2013 21:16:19 +0000 (14:16 -0700)]
am
40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
* commit '
40da5283ebc6b5cf1e3820740dc274c47cc55f6d':
EGL: rename CallStack::dump into CallStack::log
Igor Murashkin [Wed, 30 Oct 2013 21:09:39 +0000 (21:09 +0000)]
Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev
Elliott Hughes [Tue, 29 Oct 2013 22:28:08 +0000 (15:28 -0700)]
Re-apply androidfw fixes lost by the directory rearrangement.
Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560
Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549
Change-Id: I24e6867284d70a7793d78e62d1a836cbee310fb0
Aravind Akella [Sat, 26 Oct 2013 01:12:58 +0000 (18:12 -0700)]
am
245c4339: am
46417b84: Merge "Bug fixes for SensorService" into klp-dev
* commit '
245c43395b9bb6502e0a4bcde4c60ad9541e5ce2':
Bug fixes for SensorService
Aravind Akella [Sat, 26 Oct 2013 01:10:55 +0000 (18:10 -0700)]
am
46417b84: Merge "Bug fixes for SensorService" into klp-dev
* commit '
46417b845a257d6725adf048a3cfad6306218e9b':
Bug fixes for SensorService
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
Marco Nelissen [Fri, 25 Oct 2013 22:04:53 +0000 (15:04 -0700)]
am
fddab476: am
708cc794: Native counterpart of new power manager method
* commit '
fddab476170de87d4d4fcd2afc34376c01f68b76':
Native counterpart of new power manager method
Marco Nelissen [Fri, 25 Oct 2013 22:01:29 +0000 (15:01 -0700)]
am
708cc794: Native counterpart of new power manager method
* commit '
708cc794f6ccd4d31e0a00a23b289272c665adc1':
Native counterpart of new power manager method
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:55:24 +0000 (10:55 -0700)]
am
96002be4: am
c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
* commit '
96002be4bd4b8bbfecba2cc45bdf0b47f06464bc':
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
Jesse Hall [Fri, 25 Oct 2013 17:52:37 +0000 (10:52 -0700)]
am
c354effe: Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
* commit '
c354effe97be26638618e3bc0da81a3f8b384b20':
Fix handling of undefined TARGET_FORCE_HWC_FOR_VIRTUAL_DISPLAYS
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:20:43 +0000 (15:20 -0700)]
am
a54a8b63: am
93fcb823: Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev
* commit '
a54a8b63d191d2c1c4669f89b32c4b8a9c04cd31':
Add a boardconfig to force HWC composition of virtual displays
Jesse Hall [Wed, 23 Oct 2013 22:20:42 +0000 (15:20 -0700)]
am
48775386: am
c5807f90: Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev
* commit '
487753868aa86902f723dbdedd7083783701188d':
Use implementation-defined format when HWC writes to output buffer
Jesse Hall [Wed, 23 Oct 2013 22:17:29 +0000 (15:17 -0700)]
am
93fcb823: Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev
* commit '
93fcb82361a1cd5ceb138f8331ad9cf11fc77c95':
Add a boardconfig to force HWC composition of virtual displays
Jesse Hall [Wed, 23 Oct 2013 22:17:29 +0000 (15:17 -0700)]
am
c5807f90: Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev
* commit '
c5807f90f8e05227e6396f30b3ed91fc01392d9a':
Use implementation-defined format when HWC writes to output buffer
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
Shuo Gao [Thu, 17 Oct 2013 03:36:11 +0000 (11:36 +0800)]
fix corruption in Vector<> when malloc falied
1. When alloc or realloc failed in the function SharedBuffer::editResize,
it would return a NULL pointer, then mStorage would update to be 1 by
SharedBuffer::data() if no pointer check here, which is an obviously
wrong address, and would cause corruption when used it e.g. in capacity().
So add the pointer check here for the return value of SharedBuffer::editResize,
if it's NULL do not use it to update mStorage, to avoid the value of mStorage
polluted.
2. when alloc or realloc falied in _grow & _shrink function, mStorage keep
the original value, so mCount should not be updated here.
Otherwise, mStorage might be 0 but mCount>0, so a corruption would happend
when it try to delete items from the Vector since mCount>0.
Change-Id: I7c3814e843c459834ca5eed392e8d63d1cb7d2d8
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Jian Luo <jian.luo@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 139626
Todd Poynor [Wed, 23 Oct 2013 01:29:44 +0000 (18:29 -0700)]
batteryservice: remove now unused struct BatteryExtraProperties
Change-Id: Ibbb1eba95a800d2198e7524149ce38beb13dd7c9
Todd Poynor [Fri, 4 Oct 2013 21:03:27 +0000 (14:03 -0700)]
batteryservice: remove BatteryProperties fields not sent to BatteryService
Change-Id: I1116ebf0e21117fd37df7bfc41cb8ebaf9361faa
Michael Wright [Tue, 22 Oct 2013 00:30:25 +0000 (17:30 -0700)]
am
47f0b989: am
3223217a: Only consume touches up until the frame time
* commit '
47f0b9894b78a76a1257e0f3299cbe5446035c09':
Only consume touches up until the frame time
Michael Wright [Tue, 22 Oct 2013 00:26:57 +0000 (00:26 +0000)]
Merge "Add MAX_CONTROLLER_LEDS constant"
Michael Wright [Tue, 22 Oct 2013 00:23:55 +0000 (17:23 -0700)]
am
3223217a: Only consume touches up until the frame time
* commit '
3223217aed6dcfa55b5b952cd6be71f70e41ba63':
Only consume touches up until the frame time
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
Michael Wright [Sat, 19 Oct 2013 00:53:50 +0000 (17:53 -0700)]
Add MAX_CONTROLLER_LEDS constant
Change-Id: I5ec972338c50647049bb5a8279847d54a84d9f70
Andy McFadden [Sat, 19 Oct 2013 00:00:26 +0000 (17:00 -0700)]
am
251b11c2: am
85075869: Wait for buffers to drain
* commit '
251b11c2045b2ae97f2ab270a65e11b4ca49b1b6':
Wait for buffers to drain
Andy McFadden [Fri, 18 Oct 2013 23:57:01 +0000 (16:57 -0700)]
am
85075869: Wait for buffers to drain
* commit '
8507586903fa803abf535853a169913f2cf2e555':
Wait for buffers to drain
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
Michael Wright [Fri, 18 Oct 2013 20:02:59 +0000 (20:02 +0000)]
Merge "Parse LED mappings in keylayout files"
Michael Wright [Fri, 18 Oct 2013 00:35:53 +0000 (17:35 -0700)]
Parse LED mappings in keylayout files
Change-Id: I6bc3760341868015f054d9866e2616a312da94e0
Marco Nelissen [Fri, 18 Oct 2013 14:28:55 +0000 (14:28 +0000)]
Merge "Native counterpart of new power manager method"
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 01:02:04 +0000 (18:02 -0700)]
am
afd0debe: am
dacd4159: merge in klp-release (no-op)
* commit '
afd0debe4bdf47dc0f968282ca1261842bb65d60':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Eliminate latency when resampling is disabled
Fix blank / partial screenshots
Set the outbuf acquire fence after we actually have it.
only clear FB when asked for the opaque layer
Treat composition frames with no layers as using GLES composition
Fix two EGLConfig selection bugs
fix crashers with wifi/virtual displays
Ed Heyl [Thu, 17 Oct 2013 00:56:33 +0000 (17:56 -0700)]
am
dacd4159: merge in klp-release (no-op)
* commit '
dacd4159631865da1a02203fe5fa7c5f1339cda9':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Eliminate latency when resampling is disabled
Fix blank / partial screenshots
Set the outbuf acquire fence after we actually have it.
only clear FB when asked for the opaque layer
Treat composition frames with no layers as using GLES composition
Fix two EGLConfig selection bugs
fix crashers with wifi/virtual displays
Ed Heyl [Thu, 17 Oct 2013 00:43:06 +0000 (17:43 -0700)]
merge in klp-release (no-op)
Marco Nelissen [Wed, 16 Oct 2013 17:57:51 +0000 (10:57 -0700)]
Native counterpart of new power manager method
Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d
The Android Automerger [Wed, 16 Oct 2013 04:14:09 +0000 (21:14 -0700)]
merge in klp-release history after reset to klp-dev
Jamie Gennis [Wed, 16 Oct 2013 00:29:21 +0000 (17:29 -0700)]
am
bbfbe93c: am
0a645cc5: SurfaceFlinger: give SF its own vsync phase
* commit '
bbfbe93c0d2d6c7818e23219d2925f02ddf5bd92':
SurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Wed, 16 Oct 2013 00:29:21 +0000 (17:29 -0700)]
am
47c772e8: am
d1700756: SurfaceFlinger: Add EventControlThread
* commit '
47c772e8ec28eb0a3df9c8edd252f292c7c8e152':
SurfaceFlinger: Add EventControlThread
Jesse Hall [Wed, 16 Oct 2013 00:22:33 +0000 (17:22 -0700)]
resolved conflicts for merge of
e94d204a to master
Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd
Jamie Gennis [Tue, 15 Oct 2013 23:17:18 +0000 (16:17 -0700)]
am
0a645cc5: SurfaceFlinger: give SF its own vsync phase
* commit '
0a645cc5a935e67a8d1effc7679a838160b971d8':
SurfaceFlinger: give SF its own vsync phase
Jamie Gennis [Tue, 15 Oct 2013 23:17:18 +0000 (16:17 -0700)]
am
d1700756: SurfaceFlinger: Add EventControlThread
* commit '
d1700756ec9520c3fba22f9a14fd064a6e288810':
SurfaceFlinger: Add EventControlThread
Jesse Hall [Tue, 15 Oct 2013 23:16:47 +0000 (16:16 -0700)]
am
24742375: Merge "Disable hardware vsync when blanking the screen" into klp-dev
* commit '
247423751fd4bfb0b1f87537c985413a28fd04a1':
Disable hardware vsync when blanking the screen
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:07:23 +0000 (10:07 -0700)]
am
487c7815: am
641a1868: Merge "SensorService Flush API bug fix." into klp-dev
* commit '
487c7815d7d81570c4f2cf37ceddf10ec84e0c39':
SensorService Flush API bug fix.
Aravind Akella [Tue, 15 Oct 2013 17:05:09 +0000 (10:05 -0700)]
am
641a1868: Merge "SensorService Flush API bug fix." into klp-dev
* commit '
641a18688bc6b208bbeaffa6083d3cf5f6790e4b':
SensorService Flush API bug fix.
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
Jesse Hall [Tue, 15 Oct 2013 12:05:36 +0000 (05:05 -0700)]
am
a04fd39c: am
8e26b28b: Filter out vsync events from HWC with duplicate timestamps
* commit '
a04fd39cb88bb6df5f639464f70795f58cd0aefa':
Filter out vsync events from HWC with duplicate timestamps
Jesse Hall [Tue, 15 Oct 2013 03:34:58 +0000 (20:34 -0700)]
am
8e26b28b: Filter out vsync events from HWC with duplicate timestamps
* commit '
8e26b28be62e7c0e093900540db5e5cdcf52a0ff':
Filter out vsync events from HWC with duplicate timestamps
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
Aravind Akella [Mon, 14 Oct 2013 17:52:12 +0000 (10:52 -0700)]
am
055558b2: am
2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
* commit '
055558b257e893b50a7dff1d60f6ccc970abe46c':
Adding PackageManager feature strings for stepcounter and stepdetector.
Jesse Hall [Mon, 14 Oct 2013 17:51:54 +0000 (10:51 -0700)]
am
44b09f8b: am
44e45cfe: Merge "DispSync: don\'t compensate for wakeup latency" into klp-dev
* commit '
44b09f8b55bef56e06ad584db231916c17e30f5b':
DispSync: don't compensate for wakeup latency
Andy McFadden [Mon, 14 Oct 2013 17:48:32 +0000 (10:48 -0700)]
am
af4ae923: am
6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit '
af4ae923c3f8a2e40d74eb6291da16b4a6514449':
Use black for blackout layer
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:51:59 +0000 (15:51 -0700)]
am
2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
* commit '
2d344979eb200b7fb8ba4d811a22c80b1d77b564':
Adding PackageManager feature strings for stepcounter and stepdetector.
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:18:58 +0000 (13:18 -0700)]
am
44e45cfe: Merge "DispSync: don\'t compensate for wakeup latency" into klp-dev
* commit '
44e45cfeb37a04c206730b12ff001525ebe42a7b':
DispSync: don't compensate for wakeup latency
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:47:25 +0000 (14:47 -0700)]
am
6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit '
6410c8c4097f1a3246aa3d03b3291d47f982bc4b':
Use black for blackout layer
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:41:28 +0000 (19:41 -0700)]
am
06c964d9: am
9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev
* commit '
06c964d9b31ac81d3521f97427cdab77ee7d1cff':
Eliminate latency when resampling is disabled
Dave Burke [Fri, 11 Oct 2013 02:39:05 +0000 (19:39 -0700)]
am
9c0dfa09: Merge "Eliminate latency when resampling is disabled" into klp-dev
* commit '
9c0dfa09731a8366a7cdcd7171dde64b73af0d5c':
Eliminate latency when resampling is disabled
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:26:34 +0000 (19:26 -0700)]
am
1f1e5768: am
5d6aa951: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
* commit '
1f1e576840d5b36a091368abb6fe6610384b6449':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
Aravind Akella [Fri, 11 Oct 2013 02:21:05 +0000 (19:21 -0700)]
am
5d6aa951: Merge "Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection." into klp-dev
* commit '
5d6aa95129a13aae37a60b3e4246a0592dab396d':
Change API from flush(handle) to flush(). Call flush on all active sensors in the given SensorEventConnection.
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 23:08:22 +0000 (16:08 -0700)]
am
8c76d2a1: am
5c65efe2: Merge "Wake up disp sync thread when setting display period" into klp-dev
* commit '
8c76d2a16ede579fd2069647ff73591bb6d6a235':
Wake up disp sync thread when setting display period
Jesse Hall [Thu, 10 Oct 2013 23:05:37 +0000 (16:05 -0700)]
am
5c65efe2: Merge "Wake up disp sync thread when setting display period" into klp-dev
* commit '
5c65efe2b1d632226f02751e6b1d3cfd7c8ecb26':
Wake up disp sync thread when setting display period
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
Andy McFadden [Thu, 10 Oct 2013 15:38:36 +0000 (08:38 -0700)]
am
c00ab7b5: am
2d8d120d: Fix blank / partial screenshots
* commit '
c00ab7b5aafb7625ad7ebd2af107936df3efc98b':
Fix blank / partial screenshots