Commit Graph

49496 Commits

Author SHA1 Message Date
Jesse Hall
014dd9f0f2 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
2013-10-23 15:20:42 -07:00
Jesse Hall
a54a8b63d1 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
2013-10-23 15:17:29 -07:00
Jesse Hall
487753868a 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
2013-10-23 15:17:29 -07:00
Jesse Hall
93fcb82361 Merge "Add a boardconfig to force HWC composition of virtual displays" into klp-dev 2013-10-23 22:12:54 +00:00
Jesse Hall
c5807f90f8 Merge "Use implementation-defined format when HWC writes to output buffer" into klp-dev 2013-10-23 22:12:37 +00:00
Shuo Gao
0a885309aa 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
2013-10-22 22:36:46 -07:00
Todd Poynor
6f948c3960 batteryservice: remove now unused struct BatteryExtraProperties
Change-Id: Ibbb1eba95a800d2198e7524149ce38beb13dd7c9
2013-10-22 18:30:50 -07:00
Todd Poynor
7014fbd700 batteryservice: remove BatteryProperties fields not sent to BatteryService
Change-Id: I1116ebf0e21117fd37df7bfc41cb8ebaf9361faa
2013-10-22 23:18:36 +00:00
Michael Wright
2130192c78 am 47f0b989: am 3223217a: Only consume touches up until the frame time
* commit '47f0b9894b78a76a1257e0f3299cbe5446035c09':
  Only consume touches up until the frame time
2013-10-21 17:30:25 -07:00
Michael Wright
60f19de1ed Merge "Add MAX_CONTROLLER_LEDS constant" 2013-10-22 00:26:57 +00:00
Michael Wright
47f0b9894b am 3223217a: Only consume touches up until the frame time
* commit '3223217aed6dcfa55b5b952cd6be71f70e41ba63':
  Only consume touches up until the frame time
2013-10-21 17:23:55 -07:00
Michael Wright
3223217aed 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
2013-10-21 23:57:17 +00:00
Michael Wright
0247e2213e Add MAX_CONTROLLER_LEDS constant
Change-Id: I5ec972338c50647049bb5a8279847d54a84d9f70
2013-10-21 11:58:41 -07:00
Andy McFadden
0012dbc3c6 am 251b11c2: am 85075869: Wait for buffers to drain
* commit '251b11c2045b2ae97f2ab270a65e11b4ca49b1b6':
  Wait for buffers to drain
2013-10-18 17:00:26 -07:00
Andy McFadden
251b11c204 am 85075869: Wait for buffers to drain
* commit '8507586903fa803abf535853a169913f2cf2e555':
  Wait for buffers to drain
2013-10-18 16:57:01 -07:00
Andy McFadden
8507586903 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
2013-10-18 23:10:16 +00:00
Michael Wright
6f467daf05 Merge "Parse LED mappings in keylayout files" 2013-10-18 20:02:59 +00:00
Michael Wright
74bdd2e7ce Parse LED mappings in keylayout files
Change-Id: I6bc3760341868015f054d9866e2616a312da94e0
2013-10-18 12:39:31 -07:00
Marco Nelissen
8938550af4 Merge "Native counterpart of new power manager method" 2013-10-18 14:28:55 +00:00
Naseer Ahmed
6a968462f9 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
2013-10-17 13:57:58 -07:00
Jesse Hall
1e27ba234c 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
2013-10-17 11:20:22 -07:00
Ed Heyl
b02579b04d 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
2013-10-16 18:02:04 -07:00
Ed Heyl
afd0debe4b 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
2013-10-16 17:56:33 -07:00
Ed Heyl
dacd415963 merge in klp-release (no-op) 2013-10-16 17:43:06 -07:00
Marco Nelissen
5c0106e134 Native counterpart of new power manager method
Change-Id: I54c0ed50a57ac870da91db8589a73a2c792dbd8d
2013-10-16 12:57:32 -07:00
The Android Automerger
993da5c301 merge in klp-release history after reset to klp-dev 2013-10-15 21:14:09 -07:00
Jamie Gennis
cd65a2c51e am bbfbe93c: am 0a645cc5: SurfaceFlinger: give SF its own vsync phase
* commit 'bbfbe93c0d2d6c7818e23219d2925f02ddf5bd92':
  SurfaceFlinger: give SF its own vsync phase
2013-10-15 17:29:21 -07:00
Jamie Gennis
5727fc08ba am 47c772e8: am d1700756: SurfaceFlinger: Add EventControlThread
* commit '47c772e8ec28eb0a3df9c8edd252f292c7c8e152':
  SurfaceFlinger: Add EventControlThread
2013-10-15 17:29:21 -07:00
Jesse Hall
c6694b4cb4 resolved conflicts for merge of e94d204a to master
Change-Id: Idb2030dbb25a2e4b972492587558b25a305e68bd
2013-10-15 17:22:33 -07:00
Jamie Gennis
bbfbe93c0d am 0a645cc5: SurfaceFlinger: give SF its own vsync phase
* commit '0a645cc5a935e67a8d1effc7679a838160b971d8':
  SurfaceFlinger: give SF its own vsync phase
2013-10-15 16:17:18 -07:00
Jamie Gennis
47c772e8ec am d1700756: SurfaceFlinger: Add EventControlThread
* commit 'd1700756ec9520c3fba22f9a14fd064a6e288810':
  SurfaceFlinger: Add EventControlThread
2013-10-15 16:17:18 -07:00
Jesse Hall
e94d204ab0 am 24742375: Merge "Disable hardware vsync when blanking the screen" into klp-dev
* commit '247423751fd4bfb0b1f87537c985413a28fd04a1':
  Disable hardware vsync when blanking the screen
2013-10-15 16:16:47 -07:00
The Android Automerger
288515bf44 merge in klp-release history after reset to klp-dev 2013-10-15 15:55:41 -07:00
Jamie Gennis
0a645cc5a9 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
2013-10-15 14:31:41 -07:00
Jamie Gennis
d1700756ec 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
2013-10-15 14:31:41 -07:00
Jesse Hall
247423751f Merge "Disable hardware vsync when blanking the screen" into klp-dev 2013-10-15 19:53:11 +00:00
Aravind Akella
e276feb813 am 487c7815: am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev
* commit '487c7815d7d81570c4f2cf37ceddf10ec84e0c39':
  SensorService Flush API bug fix.
2013-10-15 10:07:23 -07:00
Aravind Akella
487c7815d7 am 641a1868: Merge "SensorService Flush API bug fix." into klp-dev
* commit '641a18688bc6b208bbeaffa6083d3cf5f6790e4b':
  SensorService Flush API bug fix.
2013-10-15 10:05:09 -07:00
Aravind Akella
641a18688b Merge "SensorService Flush API bug fix." into klp-dev 2013-10-15 17:01:55 +00:00
The Android Automerger
3bd1b65ffb merge in klp-release history after reset to klp-dev 2013-10-15 06:00:54 -07:00
Jesse Hall
adbb3062e1 am a04fd39c: am 8e26b28b: Filter out vsync events from HWC with duplicate timestamps
* commit 'a04fd39cb88bb6df5f639464f70795f58cd0aefa':
  Filter out vsync events from HWC with duplicate timestamps
2013-10-15 05:05:36 -07:00
Jesse Hall
a04fd39cb8 am 8e26b28b: Filter out vsync events from HWC with duplicate timestamps
* commit '8e26b28be62e7c0e093900540db5e5cdcf52a0ff':
  Filter out vsync events from HWC with duplicate timestamps
2013-10-14 20:34:58 -07:00
Aravind Akella
c551eac5b1 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
2013-10-14 17:09:19 -07:00
Jesse Hall
948fe0ce74 Disable hardware vsync when blanking the screen
Bug: 11220224
Change-Id: I99d0a42e1a6bb0aaf89706f6d100e9ef2a5deaa4
2013-10-14 16:25:01 -07:00
Jesse Hall
8e26b28be6 Filter out vsync events from HWC with duplicate timestamps
Bug: 11220224
Change-Id: I4efe0b66ea8969bf0ec3c4fcb325d354c8a0c315
2013-10-14 15:34:00 -07:00
Aravind Akella
c60f1ad0fa 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.
2013-10-14 10:52:12 -07:00
Jesse Hall
4df2dae1c9 am 44b09f8b: am 44e45cfe: Merge "DispSync: don\'t compensate for wakeup latency" into klp-dev
* commit '44b09f8b55bef56e06ad584db231916c17e30f5b':
  DispSync: don't compensate for wakeup latency
2013-10-14 10:51:54 -07:00
Andy McFadden
9c8b3097e6 am af4ae923: am 6410c8c4: Merge "Use black for blackout layer" into klp-dev
* commit 'af4ae923c3f8a2e40d74eb6291da16b4a6514449':
  Use black for blackout layer
2013-10-14 10:48:32 -07:00
The Android Automerger
4fec2900a3 merge in klp-release history after reset to klp-dev 2013-10-13 19:20:31 -07:00
Aravind Akella
055558b257 am 2d344979: Merge "Adding PackageManager feature strings for stepcounter and stepdetector." into klp-dev
* commit '2d344979eb200b7fb8ba4d811a22c80b1d77b564':
  Adding PackageManager feature strings for stepcounter and stepdetector.
2013-10-13 15:51:59 -07:00