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
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
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
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
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
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
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
The Android Open Source Project
8002c53144
Reconcile with ics-mr1-release
...
Change-Id: I1c603308272f9b00174c3f9046171e069ffee566
2011-12-02 07:53:10 -08:00
Ben Cheng
a63ee4c2fd
am f1a4c48b: am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
...
* commit 'f1a4c48b886d53e2afceb0620215e3792af79fd5':
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
2011-12-01 22:08:20 -08:00
Ben Cheng
11fc6ba3bf
am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
...
* commit 'e21dabf654e3d90e50e95174d5e9670bc930c194':
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
2011-12-01 22:06:32 -08:00
Ben Cheng
d2e9b6b007
Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
2011-12-01 22:05:07 -08:00
Jeff Brown
6c8f6fb565
Merge "Refactor InputQueue as InputEventReceiver."
2011-12-01 21:09:49 -08:00
Eric Laurent
177fad0bc4
am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
...
* commit '6cfa9e6c507a721f647518569c89db9560056079':
AudioService: strengthen A2DP device detection
2011-12-01 20:38:15 -08:00
Eric Laurent
5523e21f4e
am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
...
* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
AudioService: strengthen A2DP device detection
2011-12-01 20:35:26 -08:00
Eric Laurent
c603733c20
Merge "AudioService: strengthen A2DP device detection" into ics-mr1
2011-12-01 20:34:08 -08:00
Jeff Brown
ec332d806e
Merge "Ensure input events are processed in-order in the application."
2011-12-01 20:11:15 -08:00
Jeff Brown
fc93e69186
Merge "Improve latency instrumentation."
2011-12-01 20:11:09 -08:00
Romain Guy
b08ec05bd5
Merge "Faster text clipping"
2011-12-01 20:09:57 -08:00
Dianne Hackborn
ab399bb285
am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1
...
* commit '48e07296800c49f8bc9b34cc57372593021f79a1':
More social integration.
2011-12-01 18:52:27 -08:00
Dianne Hackborn
d9f8d1650d
am bfb3dec2: Merge "More social integration." into ics-mr1
...
* commit 'bfb3dec22dd397b57c8bbc1d6d18ed98cd413b10':
More social integration.
2011-12-01 18:50:36 -08:00
Dianne Hackborn
5405705e67
Merge "More social integration." into ics-mr1
2011-12-01 18:48:32 -08:00
Stephen Hines
5e9277b461
am 88c02e8c: am 976ae272: Add support for handling a bitcode wrapper to librs.
...
* commit '88c02e8c5d30c053a4faa897e322540f61914718':
Add support for handling a bitcode wrapper to librs.
2011-12-01 18:25:20 -08:00
Stephen Hines
d2bfb577eb
am 976ae272: Add support for handling a bitcode wrapper to librs.
...
* commit '976ae27270a64c5abeb380d6e61d6d71f29b9433':
Add support for handling a bitcode wrapper to librs.
2011-12-01 18:10:29 -08:00
Ben Cheng
d640f89205
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
...
I/valgrind( 1309): ==1310== Syscall param
ioctl(BINDER_WRITE_READ).read_buffer points to uninitialised byte(s)
I/valgrind( 1309): ==1310== at 0x480E670: __ioctl (__ioctl.S:10)
I/valgrind( 1309): ==1310== Address 0xbda651b4 is on thread 1's stack
Change-Id: I02893df7b5786b6b2dbd9659f5706d7171295ab2
2011-12-01 17:11:32 -08:00
The Android Automerger
364c359833
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 16:45:56 -08:00
Gilles Debunne
2e406a92d1
am b4812f8a: am 335c4e6c: Broken build. New methods made private.
...
* commit 'b4812f8a815a4c4a9896e73412f4011d7a30f03f':
Broken build. New methods made private.
2011-12-01 16:10:03 -08:00