Mathias Agopian
69973992d5
improve Vector<> safety checks
...
- make errors that will always cause a memory corruption always fatal
(for eg: KeyedVector<>::editValue{For|At}() failure)
- make other errors fatal in debug mode, those that can be caught by
the caller.
- fix typos
Change-Id: I65cc7d81035c37ce2906fc4500c50e5d5b5c49eb
2012-08-10 13:15:00 -07:00
The Android Open Source Project
5a438f5235
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ie9a1491c6957ea87bd50d4e19342b5f086ff08ee
2012-08-10 08:52:49 -07:00
The Android Automerger
19f5a345ce
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:52 -07:00
Jamie Gennis
1fbcb3173b
am 599d4882
: Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
...
* commit '599d48825f040c074027ffaf9e4b5490428adacb':
SurfaceTexture: Fix a fence fd leak.
2012-08-08 16:15:11 -07:00
Jamie Gennis
599d48825f
Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
2012-08-08 16:13:21 -07:00
Jamie Gennis
3d1d09c0c1
SurfaceTexture: Fix a fence fd leak.
...
Bug: 6949010
Change-Id: I289992c964504b4fe5458dbd19b248a841ef043f
2012-08-08 15:39:55 -07:00
Mathias Agopian
15d656f3f5
am 85aea748
: add /d/sync to dumpstate
...
* commit '85aea748861b5665e68b786b55f1c798f56fc0da':
add /d/sync to dumpstate
2012-08-08 15:33:45 -07:00
Mathias Agopian
85aea74886
add /d/sync to dumpstate
...
Change-Id: I24f8f3e0420c2198ae3981fc067fb660898655e8
2012-08-08 15:32:02 -07:00
Keun young Park
b910bebf52
am a610da90
: Merge "enable java/jni build in PDK if supported" into jb-mr1-dev
...
* commit 'a610da900cf67f0cbd323c60a0dd55827df8313a':
enable java/jni build in PDK if supported
2012-08-08 12:26:18 -07:00
Keun young Park
a610da900c
Merge "enable java/jni build in PDK if supported" into jb-mr1-dev
2012-08-08 12:25:15 -07:00
The Android Open Source Project
9f2ef2fbf5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I939b3c749ca86343996e1d4aefb32a7f30df037a
2012-08-08 08:17:08 -07:00
The Android Automerger
a1f4bf8412
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-08 06:47:25 -07:00
Keun young Park
203a3357c7
enable java/jni build in PDK if supported
...
- testFramerate requires platform java API
while all other tests only need SDK support
Change-Id: Iaefe23c41b3ace87522b5deefd6db2f5d80ed872
2012-08-07 17:09:19 -07:00
Jesse Hall
6eef3a3667
am b685c542
: Changes to support multi-display HWC
...
* commit 'b685c542836b93c99cd85053e07696406ea37adb':
Changes to support multi-display HWC
2012-08-07 13:50:44 -07:00
Jesse Hall
b685c54283
Changes to support multi-display HWC
...
Change-Id: I07efff54f2980dcb013935747b03e099b8f1181b
2012-08-07 12:16:36 -07:00
The Android Open Source Project
9a7768a4f3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I699a2310b14b3168c32dca19e4c9055eeab79d1a
2012-08-07 11:03:48 -07:00
The Android Automerger
d02212da42
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:34:29 -07:00
Jamie Gennis
a9311c17f6
am 14bd369e
: Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
...
* commit '14bd369e4b711bfb267279c2161358542ed75b29':
SurfaceTexture: fix an out of bounds array access
surfaceflinger: refactor FrambufferSurface
2012-08-06 19:17:34 -07:00
Greg Hackmann
196c50d0eb
am 92516c84
: fix pdk build
...
* commit '92516c84ef2a167524007a0584fb26018b5cb9c4':
fix pdk build
2012-08-06 19:16:06 -07:00
Jamie Gennis
14bd369e4b
Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
...
* changes:
SurfaceTexture: fix an out of bounds array access
surfaceflinger: refactor FrambufferSurface
2012-08-06 19:15:51 -07:00
Jamie Gennis
45cb2ba1d5
SurfaceTexture: fix an out of bounds array access
...
Bug: 6879028
Change-Id: Ic3d35a9384c0a6dfa4000e7743a6f6859608b0bf
2012-08-06 18:55:01 -07:00
Jamie Gennis
1a4d883dcc
surfaceflinger: refactor FrambufferSurface
...
This change refactors the FramebufferSurface class to inherit from the new
ConsumerBase class.
Bug: 6620200
Change-Id: I46ec942ddb019658e3c5e79465548b171b2261f2
2012-08-06 18:55:01 -07:00
Greg Hackmann
92516c84ef
fix pdk build
...
Change-Id: Ia4db8e1e8ee18ac112bf13a5ab2a75edb08fc70f
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2012-08-06 13:55:56 -07:00
The Android Open Source Project
95bd5ab912
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3
2012-08-06 13:34:52 -07:00
Mathias Agopian
a730878db2
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}
2012-08-06 13:16:39 -07:00
The Android Automerger
348b71e295
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-06 06:28:31 -07:00
Mathias Agopian
53095e25d6
libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
...
Change-Id: I72206f16619d81887e3b85603494563faab3b445
2012-08-05 12:41:16 -07:00
Mathias Agopian
fe00fb0d73
am 028a7572
: DisplayDevice doesn\'t need weak pointers or polymorphism
...
* commit '028a7572c81f91e4039b694cde1f55fdb3e483c7':
DisplayDevice doesn't need weak pointers or polymorphism
2012-08-05 01:33:09 -07:00
Mathias Agopian
028a7572c8
DisplayDevice doesn't need weak pointers or polymorphism
...
let's use a LightRefBase for now.
Change-Id: Ida068fa902343a8f89ffb6d34c2cd4627ab43c6c
2012-08-05 01:23:51 -07:00
Mathias Agopian
0a569b66fd
am 4297734c
: turn DisplayDevice into a reference-counted object
...
* commit '4297734c1156fd8ede7e9c61b1e439f9e1c18cd9':
turn DisplayDevice into a reference-counted object
2012-08-05 00:44:58 -07:00
Mathias Agopian
4297734c11
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
2012-08-05 00:40:46 -07:00
Mathias Agopian
dba3c59696
am d8552d79
: DisplayDevice only needs ANativeWindow not SurfaceTextureClient
...
* commit 'd8552d796cbcb9a89711fc8f97b34838da5cbdb7':
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
2012-08-04 21:43:07 -07:00
Mathias Agopian
d8552d796c
DisplayDevice only needs ANativeWindow not SurfaceTextureClient
...
Change-Id: Ib5be5af8bede435c8d5d9fabf586d28d0e74c2cb
2012-08-04 21:39:11 -07:00
Mathias Agopian
8766b0cc8f
am 888c822c
: remove a dependency of DisplayDevice on the refresh rate
...
* commit '888c822c4cb6976aab9256c58bae9e17e3e55c5c':
remove a dependency of DisplayDevice on the refresh rate
2012-08-04 21:33:29 -07:00
Mathias Agopian
888c822c4c
remove a dependency of DisplayDevice on the refresh rate
...
this remove a dependency (not all) on FramebufferSurface
Change-Id: Ie07ce70760cdcedfb41b5b41bea8da45637bf474
2012-08-04 21:23:47 -07:00
Mathias Agopian
7d892ee892
am 72131d9e
: remove unneeded dependencies in libhardware
...
* commit '72131d9ef13ffaf3af4ca2fe700426b82baac9fa':
remove unneeded dependencies in libhardware
2012-08-04 20:25:31 -07:00
Mathias Agopian
72131d9ef1
remove unneeded dependencies in libhardware
...
Change-Id: Ibb8d698d594216d0746b0e7270cf87d7e5acab2b
2012-08-04 20:22:32 -07:00
Mathias Agopian
e083077bc3
am c1d359d4
: break SF dependencies on libdvm and libandroid_runtime
...
* commit 'c1d359d42b753fcc2426d66a0f782f7c300893bc':
break SF dependencies on libdvm and libandroid_runtime
2012-08-04 20:16:52 -07:00
Mathias Agopian
c1d359d42b
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
2012-08-04 20:09:48 -07:00
Mathias Agopian
7730b3d571
am 92efd84f
: screen-off animation won\'t be handled by SF anymore
...
* commit '92efd84f37ce5a8aae74dc9086f825a67b6894e9':
screen-off animation won't be handled by SF anymore
2012-08-03 17:14:55 -07:00
Mathias Agopian
ed71e87779
am 92a979a9
: We now have a real list of displays.
...
* commit '92a979a92c34b7de609ce2b1662c73bb8a2728b9':
We now have a real list of displays.
2012-08-03 17:14:54 -07:00
Mathias Agopian
450171ac11
am fcb239d3
: don\'t filter when capturing a screenshot unless needed
...
* commit 'fcb239d3dac8bc80f28177f1951611c1d43286ff':
don't filter when capturing a screenshot unless needed
2012-08-03 17:14:53 -07:00
Mathias Agopian
d364ea2c1e
am d3ee231e
: cleanups in preparation of bigger changes
...
* commit 'd3ee231eddce0b69ec5e35188dbd0f4a2c3b9ac3':
cleanups in preparation of bigger changes
2012-08-03 17:14:52 -07:00
Mathias Agopian
1583a15400
am 0f2f5ff7
: rename DisplayHardware to DisplayDevice
...
* commit '0f2f5ff75b7b48ceb64270655ee6b62d09bf4d00':
rename DisplayHardware to DisplayDevice
2012-08-03 17:14:52 -07:00
Mathias Agopian
0e626e064a
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
2012-08-03 17:14:51 -07:00
Mathias Agopian
50e1602050
am 52bbb1ae
: getting closer to final main composition loop
...
* commit '52bbb1ae239c8a4d05543a23fa8c08467d09c3b2':
getting closer to final main composition loop
2012-08-03 17:14:50 -07:00
Mathias Agopian
9b04a90155
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
2012-08-03 17:14:49 -07:00
Mathias Agopian
92efd84f37
screen-off animation won't be handled by SF anymore
...
Change-Id: Idc41386804ae7d7eb981c36e1bc55c270870c8d0
2012-08-03 13:22:58 -07:00
Mathias Agopian
92a979a92c
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
2012-08-02 22:24:12 -07:00
Mathias Agopian
fcb239d3da
don't filter when capturing a screenshot unless needed
...
bug: 6919952
Change-Id: Ia6fbe9bc7e533a64cfdd6ef7f0cd6b9f11feb947
2012-08-02 22:24:12 -07:00