Ben Cheng
149627d136
am 07e8134e
: Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
...
* commit '07e8134e24e9ef7a3b2ade361ead5ce1b514c72f':
Print warnings when backwards timestamps are detected.
2012-09-16 16:25:21 -07:00
Ben Cheng
07e8134e24
Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
2012-09-16 16:24:29 -07:00
Ben Cheng
8dc7c6e659
Print warnings when backwards timestamps are detected.
...
Bug: 7100774
Change-Id: I752fd1680b32ce33d17d6042d6c82e27d7ba9dd2
2012-09-16 16:21:01 -07:00
Andy McFadden
cc29e530cf
am 71f683ac
: New test
...
* commit '71f683ac8d28e93928a9bb1744f43264b4846e8f':
New test
2012-09-16 13:28:48 -07:00
Andy McFadden
1d84178faf
am 6905205c
: Fix transform hints
...
* commit '6905205c8d130b6ea3a813c1b9283492ed183367':
Fix transform hints
2012-09-16 12:54:28 -07:00
Andy McFadden
71f683ac8d
New test
...
Added a test to confirm that the transform hint is being respected.
Bug: 7162482
Change-Id: I892fe962f8cf2759ff951b4f5065b9ac2732c3d1
2012-09-16 12:53:41 -07:00
Andy McFadden
6905205c8d
Fix transform hints
...
The hints were being set a little too late, so the pre-rotation stuff
wasn't quite working.
Bug 7054997
Change-Id: Id8d5c626db7a76f768ba762a145b315878ee08e6
2012-09-16 11:39:09 -07:00
The Android Automerger
d76dba486a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-14 07:11:52 -07:00
Jeff Brown
1aee81862e
am 6e220a6c
: Fix display projections when translated.
...
* commit '6e220a6ce6971555b883f4852c6e5d4c7a617815':
Fix display projections when translated.
2012-09-13 19:42:12 -07:00
Jeff Brown
6e220a6ce6
Fix display projections when translated.
...
There are two different translations to apply in the logical
orientation, one before scaling and one after.
So translate, scale, translate then rotate.
Bug: 7139798
Change-Id: I0726991cadb62988390e77503dbbaed54f07bfe3
2012-09-13 19:24:43 -07:00
Andy McFadden
c410428451
am ae2cfb57
: Minor tweaks
...
* commit 'ae2cfb5746e87f1bf17c446e20274c41ce0a57ce':
Minor tweaks
2012-09-13 13:25:17 -07:00
Andy McFadden
ae2cfb5746
Minor tweaks
...
A couple of minor cleanups I stumbled over while looking at other
things.
Change-Id: I385ecfe1afefd577afbc59d7ef1d98d868073651
2012-09-13 11:21:40 -07:00
The Android Automerger
5eb434e4fe
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-13 06:59:52 -07:00
Jesse Hall
65a835df43
am a4383fd9
: Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev
...
* commit 'a4383fd9de407d16342cd1069f75d2f0207efc0f':
Initialize new HWC 1.2 fields
2012-09-12 20:20:02 -07:00
Jesse Hall
a4383fd9de
Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev
2012-09-12 20:18:53 -07:00
Jesse Hall
c66f34d8dd
am fa32888f
: Merge "Fix display projection transforms" into jb-mr1-dev
...
* commit 'fa32888f5822093f69522086d96ea2d493011a67':
Fix display projection transforms
2012-09-12 20:18:31 -07:00
Jesse Hall
fa32888f58
Merge "Fix display projection transforms" into jb-mr1-dev
2012-09-12 20:16:28 -07:00
Mathias Agopian
917321d2fb
am a5be0cd4
: Merge "don\'t call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev
...
* commit 'a5be0cd4f360a415a65825e5956e80a374c09743':
don't call hwc with non-empty layer lists for blanked displays
2012-09-12 19:11:52 -07:00
Mathias Agopian
a5be0cd4f3
Merge "don't call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev
2012-09-12 19:10:03 -07:00
Mathias Agopian
791dcea018
am 9ca6491b
: Region::validate() cannot be called from addRectUnchecked()
...
* commit '9ca6491bb701919a3f88fa7c43da284b13822ed6':
Region::validate() cannot be called from addRectUnchecked()
2012-09-12 18:01:27 -07:00
Mathias Agopian
9ca6491bb7
Region::validate() cannot be called from addRectUnchecked()
...
addRectUnchecked() is allowed to be in an invalid state
temporarily.
Change-Id: I6f5162b5c49f378978c070a77abba35023fe918c
2012-09-12 17:56:29 -07:00
Mathias Agopian
57ffbe9979
am 8df840aa
: Merge "strengthen region validation" into jb-mr1-dev
...
* commit '8df840aa76bc1cd7bc924d32ed4c69a95b33059e':
strengthen region validation
2012-09-12 17:51:05 -07:00
Mathias Agopian
8df840aa76
Merge "strengthen region validation" into jb-mr1-dev
2012-09-12 17:49:29 -07:00
Mathias Agopian
ce3a0a541c
don't call hwc with non-empty layer lists for blanked displays
...
we now make sure to take the blanked state of a display into
account when we build its list of visible layers, this ensures
that we won't call prepare/set with a non-empty list when the
display is blanked.
Possibly fixes 7075380, 7103553, 7130187, 7016215
Bug: 7075380
Change-Id: I9fdd2e73d1b7621eaeca3d4ac2ae60d9fb1b3631
2012-09-12 17:42:06 -07:00
Mathias Agopian
068d47f29d
strengthen region validation
...
Change-Id: I75ee7bc4dd7a2f5357ac8994a23bc8b8bfb6eb44
2012-09-12 17:30:47 -07:00
Jamie Gennis
688115bbd7
am e45b01f5
: Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev
...
* commit 'e45b01f575e877b463ca2d2b124633c3a8997e82':
EGL: make max cache key size BoardConfig-able
2012-09-12 15:56:39 -07:00
Jamie Gennis
e45b01f575
Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev
2012-09-12 15:54:39 -07:00
Jesse Hall
db27621e22
Initialize new HWC 1.2 fields
...
Also rename resolution* to width/height.
Change-Id: Ia5f0c50d3f0a349160f314a3257c3b985e13ef1d
2012-09-12 15:35:44 -07:00
Steven Holte
646a5c593f
Return back-end result from eglDestroyImageKHR
...
Change-Id: I0e972b778f9802c28f52092bb9af087285833e0b
2012-09-12 15:14:55 -07:00
Jesse Hall
6360ec42d4
Fix display projection transforms
...
Bug: 7139798
Change-Id: I61aafe99180d85563c6880d16bc367fce80e6022
2012-09-12 13:49:10 -07:00
Andy McFadden
7665ad074f
am 2c7c8ba5
: Merge "Fix emulator" into jb-mr1-dev
...
* commit '2c7c8ba56ad9c0c08fde6f86771475f03a03e6fd':
Fix emulator
2012-09-12 13:29:24 -07:00
Andy McFadden
2c7c8ba56a
Merge "Fix emulator" into jb-mr1-dev
2012-09-12 13:27:01 -07:00
Andy McFadden
da61397f5a
am c2724309
: Merge "Watch for SurfaceFlinger death" into jb-mr1-dev
...
* commit 'c272430960047de4e9b2f169fb053bd0aedce3b1':
Watch for SurfaceFlinger death
2012-09-12 13:24:04 -07:00
Andy McFadden
c272430960
Merge "Watch for SurfaceFlinger death" into jb-mr1-dev
2012-09-12 13:22:35 -07:00
Andy McFadden
babba18687
Fix emulator
...
Emulator has no HWC.
Change-Id: I7810b27034f6772823142e5bf877681db1c8ee49
2012-09-12 13:17:01 -07:00
Jamie Gennis
f478e6d18c
EGL: make max cache key size BoardConfig-able
...
This change makes the maximum EGL blob cache key size configurable via a
BoardConfig.
Change-Id: Ic669cd25fc743662bd4f13aab62354fc3d54560c
2012-09-12 11:59:24 -07:00
Jamie Gennis
95fa2dd826
am a0931d65
: Merge "SurfaceTexture: eglDestroySync after duping its fd" into jb-mr1-dev
...
* commit 'a0931d657551f5098f805fbdeeed2b060bbe6171':
SurfaceTexture: eglDestroySync after duping its fd
2012-09-12 11:56:26 -07:00
Jamie Gennis
a0931d6575
Merge "SurfaceTexture: eglDestroySync after duping its fd" into jb-mr1-dev
2012-09-12 11:54:52 -07:00
The Android Open Source Project
0aa60f5a7e
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ib76f1e00f07e1ef8ce67ad3ca443edb5dcaa33d8
2012-09-12 07:40:48 -07:00
The Android Automerger
a77f0fec92
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-12 06:59:50 -07:00
Mathias Agopian
2749d7b5c8
am 92def36f
: Merge "fix typo in LayerBase::dump()" into jb-mr1-dev
...
* commit '92def36f9f79973c6ca18fc66210b32e3901351d':
fix typo in LayerBase::dump()
2012-09-11 20:54:09 -07:00
Mathias Agopian
92def36f9f
Merge "fix typo in LayerBase::dump()" into jb-mr1-dev
2012-09-11 20:53:21 -07:00
Mathias Agopian
791da60dd3
fix typo in LayerBase::dump()
...
Change-Id: Ie4861a58baed003b7ef643931d41f6be3fbfd00c
2012-09-11 20:52:46 -07:00
Andy McFadden
944ec952e9
am 43601a2d
: Reduce failure uncertainty
...
* commit '43601a2dc320a271ff8c3765ff61414a07221635':
Reduce failure uncertainty
2012-09-11 17:02:51 -07:00
Andy McFadden
43601a2dc3
Reduce failure uncertainty
...
This adds a trivial workaround for a one-shot boot time crash, plus
an explicit check and abort for a failure condition that currently
presents as a less obvious failure.
Bug: 7145521, 7147557
Change-Id: I548f6a9caa9f0bd5710aaecea0e1c6c7c8f2f281
2012-09-11 15:15:13 -07:00
Andy McFadden
c81aa3e3d7
am b0d1dd36
: Reshuffle FramebufferSurface
...
* commit 'b0d1dd36f104c0b581674adc7f830cbf44b7db06':
Reshuffle FramebufferSurface
2012-09-11 10:04:55 -07:00
Andy McFadden
b0d1dd36f1
Reshuffle FramebufferSurface
...
FramebufferSurface no longer speaks directly to the FB HAL. Now
everything goes through HWComposer (which may or may not be
connected to a hardware composer).
Added display index arg to some query methods.
Change-Id: Id3e157d2d4e3555d33afbb703e518b6e92e2d6d5
2012-09-11 09:31:34 -07:00
The Android Automerger
4a94ea7e65
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-11 06:59:40 -07:00
James Dong
fc737a1669
am 1fc4f80f
: Add stack dump from drmserver process to bugreports
...
* commit '1fc4f80fc38f782f128102795481924a97a2d3c5':
Add stack dump from drmserver process to bugreports
2012-09-10 17:53:43 -07:00
James Dong
1fc4f80fc3
Add stack dump from drmserver process to bugreports
...
This would be helpful tracking down ANR issues in drmserver
o related-to-bug: 7132419
Change-Id: I7eceaa0c29af26bd0092110be6bddf8f4c063545
2012-09-10 16:10:29 -07:00