Mathias Agopian
75b95f5bc1
Merge "fix an issue where invalidate/transactions could be missed"
2011-12-04 00:45:50 -08:00
Jeff Brown
26f944e7a2
Merge "Remove type tests when recycling input events."
2011-12-03 17:35:19 -08:00
Mathias Agopian
be42aef82f
fix an issue where invalidate/transactions could be missed
...
Change-Id: I84a1fcba1317b2631f5441de7b7ecd12af5ad022
2011-12-03 14:47:29 -08:00
Jesse Hall
43bfe7f047
am a91e54fe: am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
...
* commit 'a91e54fed6a0690d59c97bab9b081b2614880563':
SurfaceFlinger: fix layer removal race condition
2011-12-02 18:35:54 -08:00
Jesse Hall
19a586f70a
am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
...
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
SurfaceFlinger: fix layer removal race condition
2011-12-02 18:33:14 -08:00
Jesse Hall
7d9f44c2f0
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
2011-12-02 18:31:03 -08:00
Robert Greenwalt
af2eab2285
am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
...
* commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2':
Be careful sharing connections when dun is in play
2011-12-02 17:57:37 -08:00
Gilles Debunne
a68b5e9d41
am 0c7e894e: am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
...
* commit '0c7e894e79bea35f979d30e4e3bb6115b102cafd':
Handle animations in Views' rectangle clipping methods.
2011-12-02 17:57:31 -08:00
John Reck
cef050d17a
am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
...
* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
Fix updateDoubleTapZoom logic
2011-12-02 17:57:29 -08:00
Mike Lockwood
2fe2651df0
am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
...
* commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
2011-12-02 17:57:19 -08:00
Mike Lockwood
4eec194c86
am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
...
* commit '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
2011-12-02 17:57:17 -08:00
Chia-chi Yeh
7c2da311b7
am 939a3dd4: am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
...
* commit '939a3dd4e7e2282786a8c5270855b611317ad241':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
2011-12-02 17:57:14 -08:00
Jesse Hall
7b2db8cd0b
am 54cf27d7: am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
...
* commit '54cf27d7bbe27b1096f5e060c540f07dac07f1d0':
Disable GLES20Canvas on emu w/o native GL
2011-12-02 17:57:09 -08:00
Roman Nurik
e927c69f3c
am 04bd27eb: (-s ours) am 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
...
* commit '04bd27ebed36d396dfdca0b6c8e6f6b08d8e7e0d':
Reduce file size for ADL presentation shareable.
2011-12-02 17:57:07 -08:00
Amith Yamasani
5a618a9ed7
am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1
...
* commit 'f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4':
Further volume improvements.
2011-12-02 17:49:31 -08:00
Gilles Debunne
82cd12db82
am 99019d52: (-s ours) am f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1
...
* commit '99019d522335690df4c563e1dbe489bf843fe58e':
(de)activating spell check taken into account immediately
2011-12-02 17:49:28 -08:00
Robert Greenwalt
b3e9629420
am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
...
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
Be careful sharing connections when dun is in play
2011-12-02 16:54:04 -08:00
Robert Greenwalt
d76faf3963
Merge "Be careful sharing connections when dun is in play" into ics-mr1
2011-12-02 16:52:29 -08:00
Mathias Agopian
1d04d872b4
Merge "fix an issue where updates could starve transactions"
2011-12-02 16:49:06 -08:00
Fabrice Di Meglio
34fa2d4fb8
Merge "TextLayoutCache Fix compilation issue"
2011-12-02 16:21:14 -08:00
Mathias Agopian
2228936411
fix an issue where updates could starve transactions
...
Bug: 5700586
Change-Id: Iaa4adc1a6aea1db6e2943efe4caca1f6cbebfa72
2011-12-02 16:11:19 -08:00
Siva Velusamy
73d2b3c7e5
Merge "glestrace: Framework for GLES tracing library"
2011-12-02 15:49:01 -08:00
Gilles Debunne
d934573021
am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
...
* commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
Handle animations in Views' rectangle clipping methods.
2011-12-02 15:31:07 -08:00
Siva Velusamy
0469dd6d55
glestrace: Framework for GLES tracing library
...
This patch provides a framework for tracing GLES 1.0 and 2.0
functions. It is missing a lot of features, but here are the
things it accomplishes:
- Stop building the glesv2dbg library, and build the
glestrace library instead.
- Replace the hooks for glesv2dbg with the ones for glestrace.
- Add the basics for the trace library. Currently, this
traces all GL functions, but not all required data is
sent for all the functions. As a result, it will not
be possible to reconstruct the entire GL state on the
host side.
The files gltrace.pb.* and gltrace_api.* are both generated
using the tools/genapi.py script.
Change-Id: Id60a468f7278657f008bc6ea1df01f9bdfecfdd3
2011-12-02 15:30:17 -08:00
Gilles Debunne
557266f89a
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
2011-12-02 15:28:56 -08:00
John Reck
d8c16f2266
am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
...
* commit '43bc6b094edda6baa8123115a33afaf454525376':
Fix updateDoubleTapZoom logic
2011-12-02 14:49:19 -08:00
John Reck
4ca57ef165
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
2011-12-02 14:47:04 -08:00
Hong Teng
54703d8b2b
am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification,
...
* commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c':
Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
2011-12-02 13:44:10 -08:00
Mike Lockwood
f9d67a9081
am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
...
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
2011-12-02 13:22:17 -08:00
Mike Lockwood
511c45337f
am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
...
* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
2011-12-02 13:22:15 -08:00
Mike Lockwood
128a09d9b1
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
2011-12-02 13:20:49 -08:00
Mike Lockwood
1740eee1d0
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
2011-12-02 13:20:39 -08:00
Jeff Sharkey
9574c2f1a8
Merge "Move native netd calls to varargs."
2011-12-02 13:19:14 -08:00
Chia-chi Yeh
5c33d1cadf
am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
...
* commit '25bcbbb5971e2832c3020ee406b27d641d4ca05b':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
2011-12-02 12:48:35 -08:00
Chia-chi Yeh
6c8163c640
am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
...
* commit '431c3e4c7e2103865a90501a552b4e5145ed3f35':
Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
2011-12-02 12:46:51 -08:00
Chia-chi Yeh
f17b809ba0
Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html " into ics-mr0
2011-12-02 12:45:44 -08:00
Jesse Hall
75a3e54e66
am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
...
* commit '6d90c1c6fedc7add177418324ba5e591af543fa4':
Disable GLES20Canvas on emu w/o native GL
2011-12-02 12:35:22 -08:00
Jesse Hall
00dbb097dc
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
2011-12-02 12:33:20 -08:00
Roman Nurik
ae065e1c2f
am 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
...
* commit '55347e65e229ed63f7e18cb5b82639174c0f54bb':
Reduce file size for ADL presentation shareable.
2011-12-02 12:01:36 -08:00
Roman Nurik
f7f7fff40b
am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
...
* commit 'cd0e446dc8de4b639df889ec3b5754bea60d752a':
Reduce file size for ADL presentation shareable.
2011-12-02 11:59:07 -08:00
Roman Nurik
9208d65973
Merge "Reduce file size for ADL presentation shareable." into ics-mr0
2011-12-02 11:57:03 -08:00
Amith Yamasani
168a075de8
am afd01086: Merge "Further volume improvements." into ics-mr1
...
* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
Further volume improvements.
2011-12-02 11:24:03 -08:00
Amith Yamasani
66b39bd67c
Merge "Further volume improvements." into ics-mr1
2011-12-02 11:22:32 -08:00
Gilles Debunne
5bc6298d6f
am f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1
...
* commit 'f96aa3b197b96f9cb276485420c09a7b36606599':
(de)activating spell check taken into account immediately
2011-12-02 10:47:46 -08:00
Gilles Debunne
99b26e5406
Merge "(de)activating spell check taken into account immediately" into ics-mr1
2011-12-02 10:45:25 -08:00
Jesse Hall
2f4b68d21c
SurfaceFlinger: fix layer removal race condition
...
Layer::lockPageFlip() and layer::onRemove() could be called on
different threads and race such that lockPageFlip() successfully
called mSurfaceTexture->updateTexImage() but then gets NULL back from
mSurfaceTexture->getCurrentBuffer(), leading to a crash.
This change moves Layer::onRemove() calls to
SurfaceFlinger::commitTransaction() so they happen after the Layer is
done being drawn from and only happen on the main surfaceflinger
thread.
Change-Id: I4b550caadff4cc1878d7c3bca6129193fb0c713e
2011-12-02 10:03:25 -08:00
Hong Teng
41dbbb01e0
am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the applicati
...
* commit '613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0':
Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
2011-12-02 09:34:05 -08:00
Hong Teng
71ebfa771d
Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1
2011-12-02 09:32:02 -08:00
Mike Lockwood
becb04902d
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage"
2011-12-02 08:17:33 -08:00
Mike Lockwood
57c27b9023
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"
2011-12-02 08:10:03 -08:00