OSDN Git Service
Fred Quintana [Tue, 6 Dec 2011 00:49:37 +0000 (16:49 -0800)]
am
f3f7d65b: am
b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
* commit '
f3f7d65b650dec7f4eacefa1f0174fadfce5ec6e':
By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
Fred Quintana [Tue, 6 Dec 2011 00:47:06 +0000 (16:47 -0800)]
am
b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
* commit '
b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
Fred Quintana [Tue, 6 Dec 2011 00:45:29 +0000 (16:45 -0800)]
Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
Michael Kolb [Tue, 6 Dec 2011 00:33:01 +0000 (16:33 -0800)]
am
cda010d5: am
3124e6f9: Merge "Remove debug log messages" into ics-mr1
* commit '
cda010d556552b533191d8bc90454c99c133549f':
Remove debug log messages
Xia Wang [Tue, 6 Dec 2011 00:32:59 +0000 (16:32 -0800)]
am
96f660f4: am
e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
* commit '
96f660f4a8b99ff387e17474f2574e4e284ceeb8':
Add extra 2 minute for wifi to shutdown
Svetoslav Ganov [Tue, 6 Dec 2011 00:32:55 +0000 (16:32 -0800)]
am
96de4c3b: am
da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
* commit '
96de4c3befe7cefac81b1d317f752ba76b9fe7ce':
TalkBack does not announce properly the buttons of the PIN lock.
Irfan Sheriff [Tue, 6 Dec 2011 00:32:49 +0000 (16:32 -0800)]
am
f81674ca: am
6b66e9e4: Switch to notifications for walled garden
* commit '
f81674ca5249313ce820ceb5329d82a2862abab6':
Switch to notifications for walled garden
Peter Ng [Tue, 6 Dec 2011 00:32:44 +0000 (16:32 -0800)]
am
9467d0bd: am
74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
* commit '
9467d0bde1e3b0065479f731236055e526664caa':
Numberpicker section divider is now 2dp thick
Eric Fischer [Tue, 6 Dec 2011 00:32:42 +0000 (16:32 -0800)]
am
ab50285a: am
845b3efc: Merge "Add missing locale date format files." into ics-mr1
* commit '
ab50285ae481e9d749048e80a3d1e79f8545c1ed':
Add missing locale date format files.
Michael Kolb [Tue, 6 Dec 2011 00:13:49 +0000 (16:13 -0800)]
am
3124e6f9: Merge "Remove debug log messages" into ics-mr1
* commit '
3124e6f9e96b730cdfbbf068f15c41b6d5c8a819':
Remove debug log messages
Michael Kolb [Tue, 6 Dec 2011 00:12:35 +0000 (16:12 -0800)]
Merge "Remove debug log messages" into ics-mr1
Xia Wang [Mon, 5 Dec 2011 23:55:27 +0000 (15:55 -0800)]
am
e63d67ef: Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
* commit '
e63d67eff794ba2e4e5d2aa9e8854b37329f4429':
Add extra 2 minute for wifi to shutdown
Xia Wang [Mon, 5 Dec 2011 23:52:34 +0000 (15:52 -0800)]
Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1
Svetoslav Ganov [Mon, 5 Dec 2011 23:04:31 +0000 (15:04 -0800)]
am
da926cf2: Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
* commit '
da926cf284ff5f5ccf91dec088ff64d442cee25c':
TalkBack does not announce properly the buttons of the PIN lock.
Svetoslav Ganov [Mon, 5 Dec 2011 23:03:13 +0000 (15:03 -0800)]
Merge "TalkBack does not announce properly the buttons of the PIN lock." into ics-mr1
Romain Guy [Mon, 5 Dec 2011 22:50:54 +0000 (14:50 -0800)]
Merge "Make sure onPostExecute() is never called after cancel() Bug #
5651553"
Andreas Huber [Mon, 5 Dec 2011 22:26:22 +0000 (14:26 -0800)]
Merge "resolved conflicts for merge of
07bacabe to master"
Irfan Sheriff [Mon, 5 Dec 2011 22:22:03 +0000 (14:22 -0800)]
am
6b66e9e4: Switch to notifications for walled garden
* commit '
6b66e9e4c95b1c866ea63a0122fc199994fd7053':
Switch to notifications for walled garden
Siva Velusamy [Mon, 5 Dec 2011 22:18:46 +0000 (14:18 -0800)]
Merge "gltrace: Make framebuffer contents an optional message."
Siva Velusamy [Mon, 5 Dec 2011 19:12:31 +0000 (11:12 -0800)]
gltrace: Make framebuffer contents an optional message.
Currently, the contents of the FrameBuffer are sent by encoding
them as the last argument to the function call. As a result, it is
not possible to know if a message has the framebuffer encoded in it
without looking at the function type.
This patch modifies the protobuf definition to include a separate
optional framebuffer message.
Change-Id: Ief3a6950052d927ca0743e729457435b48c25a92
Irfan Sheriff [Mon, 5 Dec 2011 22:07:06 +0000 (14:07 -0800)]
Merge "p2p enhancements"
Andreas Huber [Mon, 5 Dec 2011 21:30:52 +0000 (13:30 -0800)]
resolved conflicts for merge of
07bacabe to master
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
Peter Ng [Mon, 5 Dec 2011 20:36:24 +0000 (12:36 -0800)]
am
74b496dd: Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
* commit '
74b496dd8aab7e29bcba0c6502f773555c4ce29f':
Numberpicker section divider is now 2dp thick
Peter Ng [Mon, 5 Dec 2011 20:34:53 +0000 (12:34 -0800)]
Merge "Numberpicker section divider is now 2dp thick" into ics-mr1
Eric Fischer [Mon, 5 Dec 2011 20:28:06 +0000 (12:28 -0800)]
am
845b3efc: Merge "Add missing locale date format files." into ics-mr1
* commit '
845b3efc9935e66b718d8e9a56435bf039f97633':
Add missing locale date format files.
Eric Fischer [Mon, 5 Dec 2011 20:25:58 +0000 (12:25 -0800)]
Merge "Add missing locale date format files." into ics-mr1
Andreas Huber [Mon, 5 Dec 2011 20:03:41 +0000 (12:03 -0800)]
am
f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit '
f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
Andreas Huber [Mon, 5 Dec 2011 20:01:26 +0000 (12:01 -0800)]
Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
Romain Guy [Mon, 5 Dec 2011 19:56:09 +0000 (11:56 -0800)]
Merge "Clip text correctly Bug #
5706056"
Dianne Hackborn [Mon, 5 Dec 2011 18:45:16 +0000 (10:45 -0800)]
am
803caff1: am
003c15d7: Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
* commit '
803caff1dc307a8895e9f3560112f969fa3f6f39':
Fix issue #
5614559: Registering surface error in...
Dianne Hackborn [Mon, 5 Dec 2011 18:42:51 +0000 (10:42 -0800)]
am
003c15d7: Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
* commit '
003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
Fix issue #
5614559: Registering surface error in...
Dianne Hackborn [Mon, 5 Dec 2011 18:40:59 +0000 (10:40 -0800)]
Merge "Fix issue #
5614559: Registering surface error in..." into ics-mr1
Michael Kolb [Mon, 5 Dec 2011 17:28:51 +0000 (09:28 -0800)]
am
32e914fc: am
277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
* commit '
32e914fc0366401b896f34d60119f92f625e6973':
set System UI visibility based on MediaController state
Michael Kolb [Mon, 5 Dec 2011 17:26:21 +0000 (09:26 -0800)]
am
277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1
* commit '
277cbe5a951840558166020568fb1510285e2594':
set System UI visibility based on MediaController state
Michael Kolb [Mon, 5 Dec 2011 17:24:25 +0000 (09:24 -0800)]
Merge "set System UI visibility based on MediaController state" into ics-mr1
The Android Open Source Project [Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
Narayan Kamath [Mon, 5 Dec 2011 15:41:59 +0000 (07:41 -0800)]
Merge "Simplify the implementation of AudioPlaybackHandler."
Mathias Agopian [Sun, 4 Dec 2011 08:45:50 +0000 (00:45 -0800)]
Merge "fix an issue where invalidate/transactions could be missed"
Jeff Brown [Sun, 4 Dec 2011 01:35:19 +0000 (17:35 -0800)]
Merge "Remove type tests when recycling input events."
Mathias Agopian [Sat, 3 Dec 2011 22:47:29 +0000 (14:47 -0800)]
fix an issue where invalidate/transactions could be missed
Change-Id: I84a1fcba1317b2631f5441de7b7ecd12af5ad022
Jesse Hall [Sat, 3 Dec 2011 02:35:54 +0000 (18:35 -0800)]
am
a91e54fe: am
f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
* commit '
a91e54fed6a0690d59c97bab9b081b2614880563':
SurfaceFlinger: fix layer removal race condition
Jesse Hall [Sat, 3 Dec 2011 02:33:14 +0000 (18:33 -0800)]
am
f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
* commit '
f57c1388860486a70cc773f2cfeaa3ea3b38a473':
SurfaceFlinger: fix layer removal race condition
Jesse Hall [Sat, 3 Dec 2011 02:31:03 +0000 (18:31 -0800)]
Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1
Robert Greenwalt [Sat, 3 Dec 2011 01:57:37 +0000 (17:57 -0800)]
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
Gilles Debunne [Sat, 3 Dec 2011 01:57:31 +0000 (17:57 -0800)]
am
0c7e894e: am
2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
* commit '
0c7e894e79bea35f979d30e4e3bb6115b102cafd':
Handle animations in Views' rectangle clipping methods.
John Reck [Sat, 3 Dec 2011 01:57:29 +0000 (17:57 -0800)]
am
6d3e51d4: am
43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '
6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
Fix updateDoubleTapZoom logic
Mike Lockwood [Sat, 3 Dec 2011 01:57:19 +0000 (17:57 -0800)]
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
Mike Lockwood [Sat, 3 Dec 2011 01:57:17 +0000 (17:57 -0800)]
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
Chia-chi Yeh [Sat, 3 Dec 2011 01:57:14 +0000 (17:57 -0800)]
am
939a3dd4: am
25bcbbb5: am
431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: 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
Jesse Hall [Sat, 3 Dec 2011 01:57:09 +0000 (17:57 -0800)]
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
Roman Nurik [Sat, 3 Dec 2011 01:57:07 +0000 (17:57 -0800)]
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.
Amith Yamasani [Sat, 3 Dec 2011 01:49:31 +0000 (17:49 -0800)]
am
f8dad0b3: am
afd01086: Merge "Further volume improvements." into ics-mr1
* commit '
f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4':
Further volume improvements.
Gilles Debunne [Sat, 3 Dec 2011 01:49:28 +0000 (17:49 -0800)]
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
Robert Greenwalt [Sat, 3 Dec 2011 00:54:04 +0000 (16:54 -0800)]
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
Robert Greenwalt [Sat, 3 Dec 2011 00:52:29 +0000 (16:52 -0800)]
Merge "Be careful sharing connections when dun is in play" into ics-mr1
Mathias Agopian [Sat, 3 Dec 2011 00:49:06 +0000 (16:49 -0800)]
Merge "fix an issue where updates could starve transactions"
The Android Automerger [Sat, 3 Dec 2011 00:21:23 +0000 (16:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Fabrice Di Meglio [Sat, 3 Dec 2011 00:21:14 +0000 (16:21 -0800)]
Merge "TextLayoutCache Fix compilation issue"
Mathias Agopian [Sat, 3 Dec 2011 00:11:19 +0000 (16:11 -0800)]
fix an issue where updates could starve transactions
Bug:
5700586
Change-Id: Iaa4adc1a6aea1db6e2943efe4caca1f6cbebfa72
Siva Velusamy [Fri, 2 Dec 2011 23:49:01 +0000 (15:49 -0800)]
Merge "glestrace: Framework for GLES tracing library"
Gilles Debunne [Fri, 2 Dec 2011 23:31:07 +0000 (15:31 -0800)]
am
2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1
* commit '
2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
Handle animations in Views' rectangle clipping methods.
Siva Velusamy [Wed, 30 Nov 2011 23:05:37 +0000 (15:05 -0800)]
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
Gilles Debunne [Fri, 2 Dec 2011 23:28:56 +0000 (15:28 -0800)]
Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1
John Reck [Fri, 2 Dec 2011 22:49:19 +0000 (14:49 -0800)]
am
43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1
* commit '
43bc6b094edda6baa8123115a33afaf454525376':
Fix updateDoubleTapZoom logic
John Reck [Fri, 2 Dec 2011 22:47:04 +0000 (14:47 -0800)]
Merge "Fix updateDoubleTapZoom logic" into ics-mr1
Hong Teng [Fri, 2 Dec 2011 21:44:10 +0000 (13:44 -0800)]
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.
Mike Lockwood [Fri, 2 Dec 2011 21:22:17 +0000 (13:22 -0800)]
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
Mike Lockwood [Fri, 2 Dec 2011 21:22:15 +0000 (13:22 -0800)]
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
Mike Lockwood [Fri, 2 Dec 2011 21:20:49 +0000 (13:20 -0800)]
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:20:39 +0000 (13:20 -0800)]
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
Jeff Sharkey [Fri, 2 Dec 2011 21:19:14 +0000 (13:19 -0800)]
Merge "Move native netd calls to varargs."
Chia-chi Yeh [Fri, 2 Dec 2011 20:48:35 +0000 (12:48 -0800)]
am
25bcbbb5: am
431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: 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
Chia-chi Yeh [Fri, 2 Dec 2011 20:46:51 +0000 (12:46 -0800)]
am
431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: 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
Chia-chi Yeh [Fri, 2 Dec 2011 20:45:44 +0000 (12:45 -0800)]
Merge "Documentation for the VPN sample for ICS SDK. Staging server: fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0
Jesse Hall [Fri, 2 Dec 2011 20:35:22 +0000 (12:35 -0800)]
am
6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
* commit '
6d90c1c6fedc7add177418324ba5e591af543fa4':
Disable GLES20Canvas on emu w/o native GL
Jesse Hall [Fri, 2 Dec 2011 20:33:20 +0000 (12:33 -0800)]
Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1
Roman Nurik [Fri, 2 Dec 2011 20:01:36 +0000 (12:01 -0800)]
am
55347e65: am
cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit '
55347e65e229ed63f7e18cb5b82639174c0f54bb':
Reduce file size for ADL presentation shareable.
Roman Nurik [Fri, 2 Dec 2011 19:59:07 +0000 (11:59 -0800)]
am
cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0
* commit '
cd0e446dc8de4b639df889ec3b5754bea60d752a':
Reduce file size for ADL presentation shareable.
Roman Nurik [Fri, 2 Dec 2011 19:57:03 +0000 (11:57 -0800)]
Merge "Reduce file size for ADL presentation shareable." into ics-mr0
Amith Yamasani [Fri, 2 Dec 2011 19:24:03 +0000 (11:24 -0800)]
am
afd01086: Merge "Further volume improvements." into ics-mr1
* commit '
afd01086795c7c1f6950a709180b2361625b8b6a':
Further volume improvements.
Amith Yamasani [Fri, 2 Dec 2011 19:22:32 +0000 (11:22 -0800)]
Merge "Further volume improvements." into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 18:47:46 +0000 (10:47 -0800)]
am
f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1
* commit '
f96aa3b197b96f9cb276485420c09a7b36606599':
(de)activating spell check taken into account immediately
Gilles Debunne [Fri, 2 Dec 2011 18:45:25 +0000 (10:45 -0800)]
Merge "(de)activating spell check taken into account immediately" into ics-mr1
The Android Automerger [Fri, 2 Dec 2011 18:25:12 +0000 (10:25 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jesse Hall [Fri, 2 Dec 2011 18:00:00 +0000 (10:00 -0800)]
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
Hong Teng [Fri, 2 Dec 2011 17:34:05 +0000 (09:34 -0800)]
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.
Hong Teng [Fri, 2 Dec 2011 17:32:02 +0000 (09:32 -0800)]
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
Mike Lockwood [Fri, 2 Dec 2011 16:17:33 +0000 (08:17 -0800)]
Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage"
Mike Lockwood [Fri, 2 Dec 2011 16:10:03 +0000 (08:10 -0800)]
Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver"
The Android Open Source Project [Fri, 2 Dec 2011 15:53:10 +0000 (07:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1c603308272f9b00174c3f9046171e069ffee566
Ben Cheng [Fri, 2 Dec 2011 06:08:20 +0000 (22:08 -0800)]
am
f1a4c48b: am
e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
* commit '
f1a4c48b886d53e2afceb0620215e3792af79fd5':
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
Ben Cheng [Fri, 2 Dec 2011 06:06:32 +0000 (22:06 -0800)]
am
e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
* commit '
e21dabf654e3d90e50e95174d5e9670bc930c194':
Initialize bwr.read_buffer in IPCThreadState::talkWithDriver.
Ben Cheng [Fri, 2 Dec 2011 06:05:07 +0000 (22:05 -0800)]
Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1
Jeff Brown [Fri, 2 Dec 2011 05:09:49 +0000 (21:09 -0800)]
Merge "Refactor InputQueue as InputEventReceiver."
Eric Laurent [Fri, 2 Dec 2011 04:38:15 +0000 (20:38 -0800)]
am
6cfa9e6c: am
0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
* commit '
6cfa9e6c507a721f647518569c89db9560056079':
AudioService: strengthen A2DP device detection
Eric Laurent [Fri, 2 Dec 2011 04:35:26 +0000 (20:35 -0800)]
am
0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
* commit '
0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
AudioService: strengthen A2DP device detection
Eric Laurent [Fri, 2 Dec 2011 04:34:08 +0000 (20:34 -0800)]
Merge "AudioService: strengthen A2DP device detection" into ics-mr1
Jeff Brown [Fri, 2 Dec 2011 04:11:15 +0000 (20:11 -0800)]
Merge "Ensure input events are processed in-order in the application."
Jeff Brown [Fri, 2 Dec 2011 04:11:09 +0000 (20:11 -0800)]
Merge "Improve latency instrumentation."
Romain Guy [Fri, 2 Dec 2011 04:09:57 +0000 (20:09 -0800)]
Merge "Faster text clipping"
OSDN Git Service
