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
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
The Android Automerger
74a474eea4
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-16 11:29:32 -08:00
Mathias Agopian
2a8c49eb5d
fix an out-of-bounds memory access
...
in this particular case, this OOB is always harmless
(and that's why it didn't get fixed from MR1), however,
it interfers with valgrind debugging.
Change-Id: Ic977e03287e59c4b124a89146c9023bd0cb540a8
2012-11-15 17:19:48 -08:00
Mathias Agopian
75220f9b93
am 35d39886: am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
...
* commit '35d3988616cc40c0975d82f166c641109b787a58':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
2012-11-14 17:00:58 -08:00
Mathias Agopian
35d3988616
am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
...
* commit 'f9730c3b9655c32fc7ea13159ac5ff2f90fda3f1':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
2012-11-14 16:59:03 -08:00
Mathias Agopian
f9730c3b96
am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
...
* commit 'ee932d0ad1a16cc93b4bd9eaf9cb3cc756fb2dfc':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
2012-11-14 16:56:35 -08:00
Glenn Kasten
9284fddfc6
Fix build
...
Change-Id: Ibb398f36a7569af3480e24145da4317bf5b86998
2012-11-14 16:24:27 -08:00
Erik Gilling
4edbd078cd
add asynchronous tracing
...
Change-Id: I5b8660cd4d2af2ad7c6b2548c9572d3527882d6d
2012-11-14 16:06:04 -08:00
Kenny Root
244408786c
Switch keystore to binder
...
Change-Id: Ie15781de079e8ecc9616cab9a5e392f5c814d9d8
2012-11-14 15:42:38 -08:00
Mathias Agopian
ee932d0ad1
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
...
Honor the documentation. this broke in JB-MR1.
Change-Id: I841a93b409fc940374bc748c4e143d82a192669c
2012-11-14 14:41:42 -08:00
The Android Open Source Project
42d44e3d52
am 11dd4b99: (-s ours) Reconcile with jb-mr1.1-release - do not merge
...
* commit '11dd4b998dfadf5a7eeaec5228cfb6100c855608':
2012-11-14 12:44:56 -08:00
The Android Open Source Project
11dd4b998d
Reconcile with jb-mr1.1-release - do not merge
...
Change-Id: I7915c2abffbc99177c1fec8cf47dfd5c43d88d20
2012-11-14 12:41:05 -08:00
The Android Automerger
2d3d9d11ba
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
2012-11-14 11:28:21 -08:00
rpcraig
f1c3ffe5f0
Bug fix on installd with SELinux enabled kernel.
...
setfilecon is not required on libsymlinks when target
doesn't exist. A bootloop is caused without this
change.
Change-Id: Ia895d9063f42885a3db6e8ca30cee5dceb8c1bac
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2012-11-14 10:42:28 -08:00
Jesse Hall
d24276d399
Merge "Create builtin display tokens on demand"
2012-11-12 09:58:12 -08:00
Andy McFadden
2bdd8fd65a
am 41f7736a: am 434e21bf: am 3fdeb48e: Reduce emulator logspam
...
* commit '41f7736ad1e72df8796416a82ce3cede6193d1eb':
Reduce emulator logspam
2012-11-09 22:49:18 -08:00
Andy McFadden
41f7736ad1
am 434e21bf: am 3fdeb48e: Reduce emulator logspam
...
* commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
Reduce emulator logspam
2012-11-09 22:45:13 -08:00
Andy McFadden
434e21bfd6
am 3fdeb48e: Reduce emulator logspam
...
* commit '3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c':
Reduce emulator logspam
2012-11-09 22:41:48 -08:00
Jesse Hall
692c723e84
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: I23b77037dc0f548d549abf580339edd0e3c626e9
2012-11-09 11:48:25 -08:00
Andy McFadden
3fdeb48e3c
Reduce emulator logspam
...
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug 7436352
Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
2012-11-08 16:40:11 -08:00
Dmitry Shmidt
258fe7eac9
am 77622879: am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dump
...
* commit '77622879a6a12c6cb916df46c919dde87656e6df':
bugreport: Add /proc/interrupts dump
2012-11-08 15:59:28 -08:00
Dmitry Shmidt
03d0600ea7
am af9e8a59: am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
...
* commit 'af9e8a59619ec6050739dd68ea108cc7e182d059':
bugreport: Add wlan FW counters dump for bcmdhd
2012-11-08 15:59:27 -08:00
Dmitry Shmidt
77622879a6
am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dump
...
* commit '4bacaec4cd5844d67bfa4659393cb7e7fe343d1e':
bugreport: Add /proc/interrupts dump
2012-11-08 15:43:05 -08:00
Dmitry Shmidt
af9e8a5961
am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
...
* commit '61db92e72771a42456a3b703f275c4a4e1f8b552':
bugreport: Add wlan FW counters dump for bcmdhd
2012-11-08 15:43:04 -08:00
Dmitry Shmidt
4bacaec4cd
am 0b2c9268: bugreport: Add /proc/interrupts dump
...
* commit '0b2c9268265e9a165551eaa66cb461d3fab8b564':
bugreport: Add /proc/interrupts dump
2012-11-07 14:37:14 -08:00
Dmitry Shmidt
61db92e727
am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
...
* commit 'c11f56e5615c5d388c072705322df5bcf22c2012':
bugreport: Add wlan FW counters dump for bcmdhd
2012-11-07 14:37:11 -08:00
Colin Cross
1493a3974a
dumpstate: fix incorrectly zeroed array
...
Change-Id: I55a916568baf66629b02a6d80fce34b84ffb3a34
2012-11-07 11:25:31 -08:00
