OSDN Git Service
The Android Open Source Project [Tue, 7 Aug 2012 18:08:27 +0000 (11:08 -0700)]
am
9a7768a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9a7768a4f3fede135ab73098d6a2ae046b5d016b':
The Android Open Source Project [Tue, 7 Aug 2012 18:03:48 +0000 (11:03 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I699a2310b14b3168c32dca19e4c9055eeab79d1a
The Android Automerger [Tue, 7 Aug 2012 13:34:29 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Tue, 7 Aug 2012 02:19:04 +0000 (19:19 -0700)]
am
a9311c17: am
14bd369e: Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
* commit '
a9311c17f6844f74b08c2e3b73a76c4ba9902b7a':
SurfaceTexture: fix an out of bounds array access
surfaceflinger: refactor FrambufferSurface
Jamie Gennis [Tue, 7 Aug 2012 02:17:34 +0000 (19:17 -0700)]
am
14bd369e: Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
* commit '
14bd369e4b711bfb267279c2161358542ed75b29':
SurfaceTexture: fix an out of bounds array access
surfaceflinger: refactor FrambufferSurface
Greg Hackmann [Tue, 7 Aug 2012 02:17:34 +0000 (19:17 -0700)]
Greg Hackmann [Tue, 7 Aug 2012 02:16:06 +0000 (19:16 -0700)]
Jamie Gennis [Tue, 7 Aug 2012 02:15:51 +0000 (19:15 -0700)]
Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
* changes:
SurfaceTexture: fix an out of bounds array access
surfaceflinger: refactor FrambufferSurface
Jamie Gennis [Tue, 7 Aug 2012 00:10:57 +0000 (17:10 -0700)]
SurfaceTexture: fix an out of bounds array access
Bug:
6879028
Change-Id: Ic3d35a9384c0a6dfa4000e7743a6f6859608b0bf
Jamie Gennis [Fri, 3 Aug 2012 03:11:05 +0000 (20:11 -0700)]
surfaceflinger: refactor FrambufferSurface
This change refactors the FramebufferSurface class to inherit from the new
ConsumerBase class.
Bug:
6620200
Change-Id: I46ec942ddb019658e3c5e79465548b171b2261f2
Greg Hackmann [Mon, 6 Aug 2012 20:55:56 +0000 (13:55 -0700)]
fix pdk build
Change-Id: Ia4db8e1e8ee18ac112bf13a5ab2a75edb08fc70f
Signed-off-by: Greg Hackmann <ghackmann@google.com>
The Android Open Source Project [Mon, 6 Aug 2012 20:37:20 +0000 (13:37 -0700)]
am
95bd5ab9: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
95bd5ab91211e208b1080b3fa0696b75838d7b4f':
The Android Open Source Project [Mon, 6 Aug 2012 20:34:52 +0000 (13:34 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3
Mathias Agopian [Mon, 6 Aug 2012 20:18:15 +0000 (13:18 -0700)]
am
a730878d: am
53095e25: libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
* commit '
a730878db2afad6acd05a02e63215936dc05a6a0':
libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
Mathias Agopian [Mon, 6 Aug 2012 20:16:39 +0000 (13:16 -0700)]
am
53095e25: libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
* commit '
53095e25d69206bea1ac15a7382ab8b61155c0c1':
libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
The Android Automerger [Mon, 6 Aug 2012 13:28:31 +0000 (06:28 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Sun, 5 Aug 2012 19:41:16 +0000 (12:41 -0700)]
libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
Change-Id: I72206f16619d81887e3b85603494563faab3b445
Mathias Agopian [Sun, 5 Aug 2012 08:34:19 +0000 (01:34 -0700)]
am
fe00fb0d: am
028a7572: DisplayDevice doesn\'t need weak pointers or polymorphism
* commit '
fe00fb0d73889b687a33837a81113383da1ed37c':
DisplayDevice doesn't need weak pointers or polymorphism
Mathias Agopian [Sun, 5 Aug 2012 08:33:09 +0000 (01:33 -0700)]
am
028a7572: DisplayDevice doesn\'t need weak pointers or polymorphism
* commit '
028a7572c81f91e4039b694cde1f55fdb3e483c7':
DisplayDevice doesn't need weak pointers or polymorphism
Mathias Agopian [Sun, 5 Aug 2012 08:23:51 +0000 (01:23 -0700)]
DisplayDevice doesn't need weak pointers or polymorphism
let's use a LightRefBase for now.
Change-Id: Ida068fa902343a8f89ffb6d34c2cd4627ab43c6c
Mathias Agopian [Sun, 5 Aug 2012 07:46:32 +0000 (00:46 -0700)]
am
0a569b66: am
4297734c: turn DisplayDevice into a reference-counted object
* commit '
0a569b66fd9965d5456df025b6118a3c46387e8e':
turn DisplayDevice into a reference-counted object
Mathias Agopian [Sun, 5 Aug 2012 07:44:58 +0000 (00:44 -0700)]
am
4297734c: turn DisplayDevice into a reference-counted object
* commit '
4297734c1156fd8ede7e9c61b1e439f9e1c18cd9':
turn DisplayDevice into a reference-counted object
Mathias Agopian [Sun, 5 Aug 2012 07:40:46 +0000 (00:40 -0700)]
turn DisplayDevice into a reference-counted object
it's safer this way because this object owns an
EGLSurface which cannot be easily reference-counted.
it also gives us the ability to sub-class it, which
we might want to do soon.
Change-Id: I07358bb052dc5a13b4f2196b2c2b6e6e94c4bb4f
Mathias Agopian [Sun, 5 Aug 2012 04:44:38 +0000 (21:44 -0700)]
am
dba3c596: am
d8552d79: DisplayDevice only needs ANativeWindow not SurfaceTextureClient
* commit '
dba3c5969667e29c847c61e04351cf65324fd723':
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
Mathias Agopian [Sun, 5 Aug 2012 04:43:07 +0000 (21:43 -0700)]
am
d8552d79: DisplayDevice only needs ANativeWindow not SurfaceTextureClient
* commit '
d8552d796cbcb9a89711fc8f97b34838da5cbdb7':
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
Mathias Agopian [Sun, 5 Aug 2012 04:39:11 +0000 (21:39 -0700)]
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
Change-Id: Ib5be5af8bede435c8d5d9fabf586d28d0e74c2cb
Mathias Agopian [Sun, 5 Aug 2012 04:34:52 +0000 (21:34 -0700)]
am
8766b0cc: am
888c822c: remove a dependency of DisplayDevice on the refresh rate
* commit '
8766b0cc8f816867b1e1d0dcdb32edcebc4ff3c4':
remove a dependency of DisplayDevice on the refresh rate
Mathias Agopian [Sun, 5 Aug 2012 04:33:29 +0000 (21:33 -0700)]
am
888c822c: remove a dependency of DisplayDevice on the refresh rate
* commit '
888c822c4cb6976aab9256c58bae9e17e3e55c5c':
remove a dependency of DisplayDevice on the refresh rate
Mathias Agopian [Sun, 5 Aug 2012 04:10:38 +0000 (21:10 -0700)]
remove a dependency of DisplayDevice on the refresh rate
this remove a dependency (not all) on FramebufferSurface
Change-Id: Ie07ce70760cdcedfb41b5b41bea8da45637bf474
Mathias Agopian [Sun, 5 Aug 2012 03:27:22 +0000 (20:27 -0700)]
am
7d892ee8: am
72131d9e: remove unneeded dependencies in libhardware
* commit '
7d892ee8923b527032dcdf6a97dfb2f305ecc05e':
remove unneeded dependencies in libhardware
Mathias Agopian [Sun, 5 Aug 2012 03:25:31 +0000 (20:25 -0700)]
am
72131d9e: remove unneeded dependencies in libhardware
* commit '
72131d9ef13ffaf3af4ca2fe700426b82baac9fa':
remove unneeded dependencies in libhardware
Mathias Agopian [Sun, 5 Aug 2012 03:22:32 +0000 (20:22 -0700)]
remove unneeded dependencies in libhardware
Change-Id: Ibb8d698d594216d0746b0e7270cf87d7e5acab2b
Mathias Agopian [Sun, 5 Aug 2012 03:18:44 +0000 (20:18 -0700)]
am
e083077b: am
c1d359d4: break SF dependencies on libdvm and libandroid_runtime
* commit '
e083077bc3c9c4f8df22abbe52440541fd04db7b':
break SF dependencies on libdvm and libandroid_runtime
Mathias Agopian [Sun, 5 Aug 2012 03:16:52 +0000 (20:16 -0700)]
am
c1d359d4: break SF dependencies on libdvm and libandroid_runtime
* commit '
c1d359d42b753fcc2426d66a0f782f7c300893bc':
break SF dependencies on libdvm and libandroid_runtime
Mathias Agopian [Sun, 5 Aug 2012 03:09:03 +0000 (20:09 -0700)]
break SF dependencies on libdvm and libandroid_runtime
these libraries are only needed for debugging and are now
linked at runtime if needed.
Change-Id: I03f138523c6de166a1e2700d4454d4a854aee145
Mathias Agopian [Sat, 4 Aug 2012 00:17:04 +0000 (17:17 -0700)]
am
7730b3d5: am
92efd84f: screen-off animation won\'t be handled by SF anymore
* commit '
7730b3d571f3c6bea566026e60ceca53fd99956a':
screen-off animation won't be handled by SF anymore
Mathias Agopian [Sat, 4 Aug 2012 00:17:03 +0000 (17:17 -0700)]
am
ed71e877: am
92a979a9: We now have a real list of displays.
* commit '
ed71e87779672bace85ad6f55ea462771d00042a':
We now have a real list of displays.
Mathias Agopian [Sat, 4 Aug 2012 00:17:03 +0000 (17:17 -0700)]
am
450171ac: am
fcb239d3: don\'t filter when capturing a screenshot unless needed
* commit '
450171ac112dd5e035497f6d751e440f6722e5db':
don't filter when capturing a screenshot unless needed
Mathias Agopian [Sat, 4 Aug 2012 00:17:02 +0000 (17:17 -0700)]
am
d364ea2c: am
d3ee231e: cleanups in preparation of bigger changes
* commit '
d364ea2c1e3bdfe789df98f345c5051a821d5502':
cleanups in preparation of bigger changes
Mathias Agopian [Sat, 4 Aug 2012 00:17:01 +0000 (17:17 -0700)]
am
1583a154: am
0f2f5ff7: rename DisplayHardware to DisplayDevice
* commit '
1583a15400b04e4d45c5300769167d28c8968ec5':
rename DisplayHardware to DisplayDevice
Mathias Agopian [Sat, 4 Aug 2012 00:17:00 +0000 (17:17 -0700)]
am
0e626e06: am
be246f86: Layers are now sorted by layer-stack first, then by z-order
* commit '
0e626e064a830679aedf4c63f497a869499c44f0':
Layers are now sorted by layer-stack first, then by z-order
Mathias Agopian [Sat, 4 Aug 2012 00:16:59 +0000 (17:16 -0700)]
am
50e16020: am
52bbb1ae: getting closer to final main composition loop
* commit '
50e16020508d9fc65cd8f94c74b05a681fdb7387':
getting closer to final main composition loop
Mathias Agopian [Sat, 4 Aug 2012 00:16:58 +0000 (17:16 -0700)]
am
9b04a901: am
87baae10: get rid of global regions that should be tracked per display
* commit '
9b04a90155bf2ab7a6462ea01edf8d7ae0e70be0':
get rid of global regions that should be tracked per display
Mathias Agopian [Sat, 4 Aug 2012 00:14:55 +0000 (17:14 -0700)]
am
92efd84f: screen-off animation won\'t be handled by SF anymore
* commit '
92efd84f37ce5a8aae74dc9086f825a67b6894e9':
screen-off animation won't be handled by SF anymore
Mathias Agopian [Sat, 4 Aug 2012 00:14:54 +0000 (17:14 -0700)]
am
92a979a9: We now have a real list of displays.
* commit '
92a979a92c34b7de609ce2b1662c73bb8a2728b9':
We now have a real list of displays.
Mathias Agopian [Sat, 4 Aug 2012 00:14:53 +0000 (17:14 -0700)]
am
fcb239d3: don\'t filter when capturing a screenshot unless needed
* commit '
fcb239d3dac8bc80f28177f1951611c1d43286ff':
don't filter when capturing a screenshot unless needed
Mathias Agopian [Sat, 4 Aug 2012 00:14:52 +0000 (17:14 -0700)]
am
d3ee231e: cleanups in preparation of bigger changes
* commit '
d3ee231eddce0b69ec5e35188dbd0f4a2c3b9ac3':
cleanups in preparation of bigger changes
Mathias Agopian [Sat, 4 Aug 2012 00:14:52 +0000 (17:14 -0700)]
am
0f2f5ff7: rename DisplayHardware to DisplayDevice
* commit '
0f2f5ff75b7b48ceb64270655ee6b62d09bf4d00':
rename DisplayHardware to DisplayDevice
Mathias Agopian [Sat, 4 Aug 2012 00:14:51 +0000 (17:14 -0700)]
am
be246f86: Layers are now sorted by layer-stack first, then by z-order
* commit '
be246f86bd6378a5110e81e9d9068ab03c3b077e':
Layers are now sorted by layer-stack first, then by z-order
Mathias Agopian [Sat, 4 Aug 2012 00:14:50 +0000 (17:14 -0700)]
am
52bbb1ae: getting closer to final main composition loop
* commit '
52bbb1ae239c8a4d05543a23fa8c08467d09c3b2':
getting closer to final main composition loop
Mathias Agopian [Sat, 4 Aug 2012 00:14:49 +0000 (17:14 -0700)]
am
87baae10: get rid of global regions that should be tracked per display
* commit '
87baae104a3e4c2059990b01c393476065c558b0':
get rid of global regions that should be tracked per display
Mathias Agopian [Fri, 3 Aug 2012 04:27:56 +0000 (21:27 -0700)]
screen-off animation won't be handled by SF anymore
Change-Id: Idc41386804ae7d7eb981c36e1bc55c270870c8d0
Mathias Agopian [Fri, 3 Aug 2012 01:32:23 +0000 (18:32 -0700)]
We now have a real list of displays.
displays can be dynamically added or removed, and the
list is part of the SF's transaction.
Change-Id: I4186ea39f1317c0e7c044f869004017738968fab
Mathias Agopian [Thu, 2 Aug 2012 23:01:34 +0000 (16:01 -0700)]
don't filter when capturing a screenshot unless needed
bug:
6919952
Change-Id: Ia6fbe9bc7e533a64cfdd6ef7f0cd6b9f11feb947
Mathias Agopian [Thu, 2 Aug 2012 21:01:42 +0000 (14:01 -0700)]
cleanups in preparation of bigger changes
- fix typo drawForSreenshot misspelled
- get rid of DisplayDeviceBase
- removed unused or unneeded code
- always pass a DisplayDevice to Layer methods that are called
on a per-display basis (to make it clear that this could be
called more than once per composition).
Change-Id: Id948b7e09fe5c06db0e42d40d6ed75dd095c7f44
Mathias Agopian [Wed, 1 Aug 2012 06:09:07 +0000 (23:09 -0700)]
rename DisplayHardware to DisplayDevice
Change-Id: I3f7250cd914e0da4f9ec2c9403587bbe12f3cc62
Mathias Agopian [Wed, 1 Aug 2012 05:59:38 +0000 (22:59 -0700)]
Layers are now sorted by layer-stack first, then by z-order
Change-Id: I7a82929df5ba87b9d88cc5be87e1a233bc4628e9
Mathias Agopian [Wed, 1 Aug 2012 02:01:53 +0000 (19:01 -0700)]
getting closer to final main composition loop
Change-Id: Icd63782366ffd11d9ea00c925ae5783ed7440cdb
Mathias Agopian [Tue, 31 Jul 2012 19:38:26 +0000 (12:38 -0700)]
get rid of global regions that should be tracked per display
Change-Id: I3b871860cc29f1b2fdcc22b0c577a6eae65d9296
The Android Open Source Project [Thu, 2 Aug 2012 22:09:11 +0000 (15:09 -0700)]
am
6c19776e: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
6c19776e9c8736b2f29f92e772469724cf55c1e4':
The Android Open Source Project [Thu, 2 Aug 2012 18:26:38 +0000 (11:26 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ied7fb684e20303e807cb5f06d7cdcdf8e2e16276
The Android Automerger [Thu, 2 Aug 2012 14:16:59 +0000 (07:16 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Romain Guy [Thu, 2 Aug 2012 02:25:15 +0000 (19:25 -0700)]
am
b4c3a393: am
53f10b7b: Merge "Add missing break in switch statement" into jb-mr1-dev
* commit '
b4c3a393f092fb7cf12046a7024a7feed983b9f1':
Add missing break in switch statement
Dianne Hackborn [Thu, 2 Aug 2012 02:23:43 +0000 (19:23 -0700)]
am
4d1a4829: am
22ea9b37: Dalvik heap size for a 10" xhdpi tablet.
* commit '
4d1a4829bf52677585ff330ff9df4b4af402ab9c':
Dalvik heap size for a 10" xhdpi tablet.
Romain Guy [Thu, 2 Aug 2012 02:20:44 +0000 (19:20 -0700)]
am
53f10b7b: Merge "Add missing break in switch statement" into jb-mr1-dev
* commit '
53f10b7b13363e6d017985ead704494fe79c9e09':
Add missing break in switch statement
Romain Guy [Thu, 2 Aug 2012 02:18:10 +0000 (19:18 -0700)]
Merge "Add missing break in switch statement" into jb-mr1-dev
Dianne Hackborn [Thu, 2 Aug 2012 02:17:59 +0000 (19:17 -0700)]
am
22ea9b37: Dalvik heap size for a 10" xhdpi tablet.
* commit '
22ea9b37e2a2b5e3e0e2e1d556f499fc20a9de17':
Dalvik heap size for a 10" xhdpi tablet.
Romain Guy [Thu, 2 Aug 2012 02:16:59 +0000 (19:16 -0700)]
Add missing break in switch statement
Change-Id: I6206cc9ca46c4e2f125d3d820256280586ad66a1
Dianne Hackborn [Thu, 2 Aug 2012 01:14:45 +0000 (18:14 -0700)]
Dalvik heap size for a 10" xhdpi tablet.
Change-Id: Ie47702cda764817e023464944cd6dc5352fc439e
Jamie Gennis [Wed, 1 Aug 2012 00:16:51 +0000 (17:16 -0700)]
am
e5b50d31: am
1dd2003f: Merge "libgui: enable EGL_fence_sync usage for exynos5" into jb-mr1-dev
* commit '
e5b50d312fc5d7d596908135ab0d673947ad0033':
libgui: enable EGL_fence_sync usage for exynos5
Jamie Gennis [Wed, 1 Aug 2012 00:15:28 +0000 (17:15 -0700)]
am
1dd2003f: Merge "libgui: enable EGL_fence_sync usage for exynos5" into jb-mr1-dev
* commit '
1dd2003f1a9a7a4826da7a4b565d41b941b7cc5d':
libgui: enable EGL_fence_sync usage for exynos5
Jamie Gennis [Wed, 1 Aug 2012 00:13:31 +0000 (17:13 -0700)]
Merge "libgui: enable EGL_fence_sync usage for exynos5" into jb-mr1-dev
Jamie Gennis [Tue, 31 Jul 2012 21:01:57 +0000 (14:01 -0700)]
libgui: enable EGL_fence_sync usage for exynos5
Bug:
6876502
Change-Id: I2ec2800881dcba9e4f6ff32ffa1341a2de01f0a2
Jesse Hall [Tue, 31 Jul 2012 23:21:50 +0000 (16:21 -0700)]
am
b765f2c2: am
cbc388ca: Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev
* commit '
b765f2c2db85be3b1a2aecf0d94969113e46c71c':
Move eglSwapBuffers out of HWComposer
Jesse Hall [Tue, 31 Jul 2012 23:20:18 +0000 (16:20 -0700)]
am
cbc388ca: Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev
* commit '
cbc388ca6a363d5228e69fdab5c583877a760280':
Move eglSwapBuffers out of HWComposer
Jesse Hall [Tue, 31 Jul 2012 23:17:52 +0000 (16:17 -0700)]
Merge "Move eglSwapBuffers out of HWComposer" into jb-mr1-dev
The Android Open Source Project [Tue, 31 Jul 2012 22:06:05 +0000 (15:06 -0700)]
am
2b24add3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
2b24add32eb6d0250581465bdc6961114cca86c3':
Revert "Minimal changes to support multi-display HWC"
The Android Open Source Project [Tue, 31 Jul 2012 22:03:17 +0000 (15:03 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I198408ef678851f19476836b10a2fc002dd11a95
Jesse Hall [Tue, 31 Jul 2012 19:16:31 +0000 (12:16 -0700)]
Revert "Minimal changes to support multi-display HWC"
This reverts commit
bddd724b178b1263c16e41b564165fcd0e93ff83
Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4
Jesse Hall [Tue, 31 Jul 2012 19:25:36 +0000 (12:25 -0700)]
am
b6ae16f0: Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev
* commit '
b6ae16f04e0655f938cd511c3965fa00e2ae6763':
Revert "Minimal changes to support multi-display HWC"
Jesse Hall [Tue, 31 Jul 2012 19:24:16 +0000 (12:24 -0700)]
Merge "Revert "Minimal changes to support multi-display HWC"" into jb-mr1-dev
Jesse Hall [Tue, 31 Jul 2012 19:16:31 +0000 (12:16 -0700)]
Revert "Minimal changes to support multi-display HWC"
This reverts commit
bddd724b178b1263c16e41b564165fcd0e93ff83
Change-Id: Ib7db20b5b3de4779b6e173473a33976ae398abd4
The Android Open Source Project [Tue, 31 Jul 2012 14:51:52 +0000 (07:51 -0700)]
Sync with jb-mr1-dev
Change-Id: I8ad322a285ffbcda32be279f3e06fdb2908789d9
Jesse Hall [Tue, 31 Jul 2012 04:20:04 +0000 (21:20 -0700)]
Merge "Minimal changes to support multi-display HWC" into jb-mr1-dev
Jesse Hall [Mon, 30 Jul 2012 05:35:34 +0000 (22:35 -0700)]
Move eglSwapBuffers out of HWComposer
Commit
8630320 moved the eglSwapBuffers fallback (for devices with no
HWC implementation) from DisplayHardware to HWComposer. But HWComposer
only knows about the framebuffer EGL display and surface handles if
there is a HWC, so it was always passing bogus handles.
This change moves the eglSwapBuffers fallback up to SurfaceFlinger,
which has access to the framebuffer EGL handles.
Bug:
6886613
Change-Id: Iad3f5ff7c90ee48d7053999e6a4548d6794b6ebd
Mathias Agopian [Mon, 30 Jul 2012 22:21:59 +0000 (15:21 -0700)]
Merge "log more info on fence sync_merge error" into jb-mr1-dev
Mathias Agopian [Mon, 30 Jul 2012 22:10:35 +0000 (15:10 -0700)]
log more info on fence sync_merge error
also fix a typo where the wrong value was passed to sterror.
Change-Id: I4df2abe582e14c8f816b65818f4593a6bd3c23ea
Ed Heyl [Sat, 28 Jul 2012 16:55:54 +0000 (09:55 -0700)]
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
include/media/hardware/CryptoAPI.h
Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
The Android Open Source Project [Fri, 27 Jul 2012 22:45:33 +0000 (15:45 -0700)]
The Android Open Source Project [Fri, 27 Jul 2012 21:52:00 +0000 (14:52 -0700)]
Reconcile with jb-release
Change-Id: Ied4d1f919062ea2abeee45ce4ecbc92a105b8f3d
Jesse Hall [Thu, 26 Jul 2012 05:15:40 +0000 (22:15 -0700)]
Minimal changes to support multi-display HWC
Change-Id: I5efea78ac381c3e3118e6e92b508f336233ac319
Mathias Agopian [Thu, 26 Jul 2012 01:56:13 +0000 (18:56 -0700)]
get rid of the shared-memory control block
Change-Id: If814060aca1d2ff2619d4adcd57296983d207f7f
Mathias Agopian [Thu, 26 Jul 2012 04:12:12 +0000 (21:12 -0700)]
hopefully fixe a race condition in sf initialization
if we received a vsync event during SF init, we could crash
as not all objects were ready to go.
Change-Id: Ie11b46e3eb1b37a709dd8757843d444f93dd0189
Mathias Agopian [Wed, 25 Jul 2012 05:46:10 +0000 (22:46 -0700)]
split HWComposer out of DisplayHardware
we will only ever have a single instance of HWComposer, so
it's now an attribute of SurfaceFlinger, instead of being part
of DisplayHardware.
DisplayHardware now just represents a "display" (it should be renamed).
Change-Id: Iec191e57686868e1df6daa8b880a286c9fefde56
Mathias Agopian [Wed, 25 Jul 2012 04:08:59 +0000 (21:08 -0700)]
get rid of ro.sf.hwrotation, it's not used anymore
Change-Id: I2ee469ac89ecd65d7187be5cab08b5cc18f67cbe
Mathias Agopian [Wed, 25 Jul 2012 04:41:09 +0000 (21:41 -0700)]
add a layerStack attribute to Layers.
this attribute can be set through a regular transaction using
SurfaceComposerClient (just like any other attribute, eg: position or size)
Change-Id: I701a47c677ea6442ca713728a93335328cd2b172
Mathias Agopian [Wed, 25 Jul 2012 03:43:54 +0000 (20:43 -0700)]
update SF binder protocol to support setting display attributes
no change of functionality -- the old behavior is implemented
on top of this new protocol.
this new protocol will allow, eventually, to pass informations
about displays and layer stacks.
Change-Id: Ic6c2295e61ec8ecbc8ce01ab7664e35d928202fc
The Android Automerger [Wed, 25 Jul 2012 03:23:13 +0000 (20:23 -0700)]
merge in jb-release history after reset to jb-dev
Mathias Agopian [Tue, 24 Jul 2012 06:11:29 +0000 (23:11 -0700)]
SurfaceFlinger cleanup
mostly refactored SurfaceFlinger.h, but also removed dead code.
cleaned-up a few includes as well.
Change-Id: Ib15f4ffe567912b61ee98aa076c6a283b72811b5
Thomas Tafertshofer [Mon, 23 Jul 2012 23:52:32 +0000 (16:52 -0700)]
Fixed bug in opengl es binding generation
This fixes the glgen code generation for methods
which have a buffer arg that can be NULL.
Bug:
6845189
Change-Id: I5fb745b806601e5665f97bfd15fd865cd9c241ed