ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
47,914 Commits 2 Branches 0 Tags 54 MiB
2b556bc988
Commit Graph

47914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
2b556bc988 am 6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '6d93da465ab8fff02728f268785e59ab86a2a0c2':
 2012-11-29 09:49:34 -08:00
The Android Open Source Project
6d93da465a Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc
 2012-11-29 09:13:38 -08:00
The Android Automerger
d98ae61dfb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-29 07:09:35 -08:00
Romain Guy
e402f1fde2 Add another ifndef and a couple of methods to LruCache 
The new methods on LruCache are needed by libhwui to manage
the cache of paths.

Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
 2012-11-28 17:37:03 -08:00
Romain Guy
98fc88d3ce Add #ifndef to prevent multiple definitions 
Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
 2012-11-28 12:59:40 -08:00
The Android Open Source Project
7fbe8e12da am 31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '31e8485028e93c16312c57b5bb6b511e3bc8582d':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
 2012-11-28 09:49:34 -08:00
The Android Open Source Project
31e8485028 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4
 2012-11-28 09:47:35 -08:00
Mathias Agopian
9913b9941e am a7da0dda: am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev 
* commit 'a7da0dda39cf1e807eea1304b48d4583e7329b72':
  make transform hint multi-display aware
 2012-11-27 18:43:52 -08:00
Jesse Hall
9d0e4708a1 am 1e310d64: am 2004307b: Merge "Create builtin display tokens on demand" 
* commit '1e310d64d1e51faf35962f23da1c90ec95a35e5d':
  Create builtin display tokens on demand
 2012-11-27 18:42:41 -08:00
Andy McFadden
9b60acdb52 am db2e4f16: (-s ours) am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit 'db2e4f16bb1c804414773862030cdb0aa5413778':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 17:34:20 -08:00
Mathias Agopian
a7da0dda39 am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev 
* commit '98cbec81be1d39223e33abde9ac35e43b62918bf':
  make transform hint multi-display aware
 2012-11-27 16:10:29 -08:00
Mathias Agopian
98cbec81be am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev 
* commit 'efd614b869e952792b009db4ab54f3bb4375d198':
  make transform hint multi-display aware
 2012-11-27 16:08:43 -08:00
Mathias Agopian
efd614b869 Merge "make transform hint multi-display aware" into jb-mr1.1-dev 2012-11-27 16:07:04 -08:00
The Android Automerger
282b79d7c1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-27 15:34:35 -08:00
Jesse Hall
1e310d64d1 am 2004307b: Merge "Create builtin display tokens on demand" 
* commit '2004307b65c0cb34c854331e5be21d3426a3ef06':
  Create builtin display tokens on demand
 2012-11-27 12:59:56 -08:00
Jesse Hall
2004307b65 Merge "Create builtin display tokens on demand" 2012-11-27 12:43:11 -08:00
Jesse Hall
6edebdf600 Create builtin display tokens on demand 
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.

Bug: 7491120
Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
 2012-11-27 12:30:18 -08:00
Andy McFadden
db2e4f16bb am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit 'a90173d86dd209aee55d833c73c424d854a98c70':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 11:39:20 -08:00
Andy McFadden
a90173d86d am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 
* commit '762a6d86de63ad319884ab6e666be6ad0d75996e':
  DO NOT MERGE - native_fence_sync: fix an enum name
 2012-11-27 11:31:44 -08:00
Andy McFadden
762a6d86de Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 2012-11-27 07:36:50 -08:00
Jamie Gennis
378787cf62 DO NOT MERGE - native_fence_sync: fix an enum name 
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".

Bug: http://code.google.com/p/android/issues/detail?id=40295

(cherry-pick from master)

Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
 2012-11-26 14:26:31 -08:00
Jamie Gennis
333fb79753 Merge "native_fence_sync: fix an enum name" 2012-11-26 14:12:12 -08:00
Jamie Gennis
e346c503ce native_fence_sync: fix an enum name 
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".

Bug: http://code.google.com/p/android/issues/detail?id=40295
Change-Id: I049b2ba185c2dbdccb8fc069701dbe805d63f645
 2012-11-26 13:54:56 -08:00
The Android Automerger
1b1e3201a8 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-26 11:29:02 -08:00
Mathias Agopian
8430095879 make transform hint multi-display aware 
if a layer is not mirrored, we now use its display
as the source for the transfrom hint calculation
instead of always using the default (main) display.

this change does two thing:
1) we make updateTransformHint take a DisplayDevice
   as a parameter instead of hard-coding the
   main display.

2) each time we do a transaction that could change
   the hint, we go through all layers and
   figure out which display should be used for their
   transform hint.

Bug: 7599344
Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
 2012-11-21 16:03:52 -08:00
Siva Velusamy
57cad46360 am 0e34af62: am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. 
* commit '0e34af6284c258c1dc56670a573ef11a76dda9fe':
  gltrace: Make sure device is debuggable.
 2012-11-20 20:14:14 -08:00
Siva Velusamy
0e34af6284 am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable. 
* commit 'c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
  gltrace: Make sure device is debuggable.
 2012-11-20 20:01:30 -08:00
Siva Velusamy
c859084ca3 am a9a4cd48: gltrace: Make sure device is debuggable. 
* commit 'a9a4cd4806ea5b2cf525c8ab4c6604d78c6e3f8f':
  gltrace: Make sure device is debuggable.
 2012-11-20 19:59:23 -08:00
Siva Velusamy
a9a4cd4806 gltrace: Make sure device is debuggable. 
(cherry picked from commit 6482fa4db0)

Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
 2012-11-20 15:55:35 -08:00
Siva Velusamy
dd8e58cf3e Merge "gltrace: Make sure device is debuggable." 2012-11-20 15:37:51 -08:00
Siva Velusamy
6482fa4db0 gltrace: Make sure device is debuggable. 
Change-Id: Icc22ff823a2f56733b232b927dd1fa494e9e1e81
 2012-11-20 13:39:57 -08:00
Jamie Gennis
c849b6f44c Merge "SurfaceFlinger: refactor frame time tracking" 2012-11-20 12:20:52 -08:00
Mathias Agopian
588bb086f7 am b171fe9f: am 594a8773: am 764c197c: fix typo that broke all the builds 
* commit 'b171fe9f47f0082dae55d5a08fe9b379cbd8e33c':
  fix typo that broke all the builds
 2012-11-20 07:16:13 -08:00
Mathias Agopian
b171fe9f47 am 594a8773: am 764c197c: fix typo that broke all the builds 
* commit '594a8773c1ef5632a8eb2ef61a86c319460d4248':
  fix typo that broke all the builds
 2012-11-20 07:13:12 -08:00
Mathias Agopian
73d5662e4c fix typo that broke all the builds 
cherry pick into master since auto-merger is blocked

Bug: 7584338
Change-Id: Ie7d7c238de1fd224b3b0bae9669a8dcb2f700a79
 2012-11-19 22:13:49 -08:00
Jamie Gennis
82dbc7429f SurfaceFlinger: refactor frame time tracking 
This change moves the frame time history tracking code out of Layer and into a
new class called FrameTracker.  It also changes the tracking to use signal
timestamps from fences when available for more accurate results.

Change-Id: I323c5f075c58bf86ce363b52af885ad0f6365f2b
 2012-11-19 17:45:09 -08:00
Mathias Agopian
594a8773c1 am 764c197c: fix typo that broke all the builds 
* commit '764c197c6fc2bf10b038c33b320a4e95594d52d8':
  fix typo that broke all the builds
 2012-11-19 17:04:44 -08:00
The Android Automerger
05dbbb932f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-19 16:50:37 -08:00
Mathias Agopian
764c197c6f fix typo that broke all the builds 
Bug: 7584338
Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
 2012-11-19 16:50:24 -08:00
Jamie Gennis
e64b38fad2 Merge "SurfaceFlinger: track the HWC retire fences" 2012-11-19 16:37:43 -08:00
The Android Automerger
87fe15c4fc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-19 16:13:13 -08:00
Mathias Agopian
93f838b3a6 workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] 
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.

Bug: 7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
 2012-11-19 15:45:10 -08:00
Mathias Agopian
50cb83f43b am c763303e: (-s ours) am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] 
* commit 'c763303eca5acf56a6d45157106d6277fb0887ab':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
 2012-11-19 15:24:52 -08:00
Mathias Agopian
c763303eca am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] 
* commit '92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
 2012-11-19 15:23:36 -08:00
Mathias Agopian
92c3a307d3 am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] 
* commit '3e095b251503d71bea04d6b707e8188cd30034e2':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
 2012-11-19 15:22:04 -08:00
Mathias Agopian
bd3e837ec7 am c208cdd4: am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access 
* commit 'c208cdd402d767228a34074d589c6368cc656b7d':
  fix an out-of-bounds memory access
 2012-11-19 15:17:27 -08:00
Mathias Agopian
c208cdd402 am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access 
* commit '1d3612f11cb0a56062059dad4643657750c23aab':
  fix an out-of-bounds memory access
 2012-11-19 15:14:08 -08:00
Mathias Agopian
3e095b2515 workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE] 
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.

Bug: 7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
 2012-11-19 15:07:33 -08:00
Mathias Agopian
1d3612f11c am 2a8c49eb: fix an out-of-bounds memory access 
* commit '2a8c49eb5dd51b2e60c9a78bea00870867d91c03':
  fix an out-of-bounds memory access
 2012-11-19 14:36:43 -08:00
Jamie Gennis
2ec3e0748b SurfaceFlinger: track the HWC retire fences 
This change adds functionality to the HWComposer class to track the retire
fences returned by each hwc set call.  It adds the HWComposer::getDisplayFence
method to allow other parts of SurfaceFlinger to get a fence that will signal
when the most recent flip takes effect on a display.

Change-Id: I676e0f98440fc58ed70908aa1a1e2ee3e7bf9eb2
 2012-11-19 13:46:40 -08:00