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
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
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
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
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
Gilles Debunne
56b3e46b8b
am 335c4e6c: Broken build. New methods made private.
...
* commit '335c4e6cb2094c7cbd6039e0c7915702b69e7657':
Broken build. New methods made private.
2011-12-01 16:06:51 -08:00
Gilles Debunne
3dae6ef5cc
am 58d89539: Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
...
* commit '58d8953958ce452c5080eaa582d7e5d2b5017398':
Scroll performance improved in multiline TextEdit
2011-12-01 15:07:10 -08:00
Gilles Debunne
44f60b17b1
am eb189d39: Merge "Performance improvement in TextView" into ics-mr1
...
* commit 'eb189d399a459c2e1ad29e1beba70d1de9f447b3':
Performance improvement in TextView
2011-12-01 15:07:08 -08:00
Gilles Debunne
a36dc6304f
am 09cbff02: Merge "Better handles\' visibility test" into ics-mr1
...
* commit '09cbff0294a27d33c93de50e0b4471ad86154a84':
Better handles' visibility test
2011-12-01 15:04:46 -08:00
Gilles Debunne
afdc18bb0c
Merge "Scroll performance improved in multiline TextEdit" into ics-mr1
2011-12-01 15:04:35 -08:00
Gilles Debunne
d72b461ae6
Merge "Performance improvement in TextView" into ics-mr1
2011-12-01 15:03:55 -08:00
Gilles Debunne
ff8f841f12
Merge "Better handles' visibility test" into ics-mr1
2011-12-01 15:03:27 -08:00
Winson Chung
7c04bd23cb
am cea32ecd: Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1
...
* commit 'cea32ecd3aef013bc5da6e401eeb8e9e8cd1b595':
Adding a sound when you take a screenshot. (Bug 5617734)
2011-12-01 14:57:50 -08:00
Winson Chung
21a50fdd03
Merge "Adding a sound when you take a screenshot. (Bug 5617734)" into ics-mr1
2011-12-01 14:55:41 -08:00
Kenny Root
82930f32bb
am 5a7c9176: Merge "Fix free_cache to actually work" into ics-mr1
...
* commit '5a7c91769f011bc150c9def9edab9cccb4761c66':
Fix free_cache to actually work
2011-12-01 14:16:18 -08:00
Kenny Root
c9fc27fd05
Merge "Fix free_cache to actually work" into ics-mr1
2011-12-01 14:14:22 -08:00
Roman Nurik
09d510a088
am a7d825dd: am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
...
* commit 'a7d825dddcb2e8bfd765bad2fb406498f4f1e37e':
Update widget design guidelines for padding and 8dp.
2011-12-01 13:44:41 -08:00
Roman Nurik
b97464208e
am c3998ced: Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
...
* commit 'c3998ced746ee97bc5f10a9de1b2848f85c8711e':
Update widget design guidelines for padding and 8dp.
2011-12-01 13:42:23 -08:00
Roman Nurik
845715a005
Merge "Update widget design guidelines for padding and 8dp." into ics-mr0
2011-12-01 13:40:38 -08:00
Matthew Xie
89610203c3
am 1a1be44c: Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
...
* commit '1a1be44c5bf1e6099d678c81ef5e9326cabcb3df':
Unlink the Binder DeathRecipient when removing a Bluetooth service record
2011-12-01 13:34:18 -08:00
Matthew Xie
3c418d0c7b
Merge "Unlink the Binder DeathRecipient when removing a Bluetooth service record" into ics-mr1
2011-12-01 13:32:19 -08:00
Svetoslav Ganov
de8f840dec
am e9f24a43: Merge "Fix memory leaks in the accessibility layer." into ics-mr1
...
* commit 'e9f24a43021734d28a4f65ebc804847b31ce13e8':
Fix memory leaks in the accessibility layer.
2011-12-01 12:59:11 -08:00
Svetoslav Ganov
314043ac17
Merge "Fix memory leaks in the accessibility layer." into ics-mr1
2011-12-01 12:57:12 -08:00
Dianne Hackborn
666666e5be
am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1
...
* commit '55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
Improve how we manage the previous app.
2011-12-01 12:49:38 -08:00
Dianne Hackborn
7023e09efb
Merge "Improve how we manage the previous app." into ics-mr1
2011-12-01 12:47:43 -08:00
Daniel Sandler
36b576c94e
am b73dc9c8: Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
...
* commit 'b73dc9c852f73c7d61f317b5ec7b74766d2f22d5':
Add copious navigation bar info to SystemUI dumps.
2011-12-01 12:11:23 -08:00
Daniel Sandler
5ff5208408
Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1
2011-12-01 12:09:51 -08:00
Bill Gruber
399bee8e6a
am 715a3c52: am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
...
* commit '715a3c52ccd896265b4e57835d196bf7a2a17437':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
2011-12-01 11:56:55 -08:00
Scott Main
fee5270baf
am a8fa89f7: am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
...
* commit 'a8fa89f7f4e658c41dba466b10459208d673bc3a':
docs: dashboard update for 12/1
2011-12-01 11:56:54 -08:00
Bill Gruber
1f3bce972e
am 92ad16d3: Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
...
* commit '92ad16d342aa4d39bad33600161b3799b84716f3':
Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766
2011-12-01 11:54:57 -08:00
Scott Main
d4d0d73790
am 8f3993b1: Merge "docs: dashboard update for 12/1" into ics-mr0
...
* commit '8f3993b12b52ac5d94d84376ec4f42b130018429':
docs: dashboard update for 12/1
2011-12-01 11:54:55 -08:00
Bill Gruber
867b9e3392
Merge "Cherrypick from HCMR2 Change ID: Id849cb25098fef76c96c4935db31ebc1422d74d8 IAB doc update: CSV import feature Also fixed Bug 5221766" into ics-mr0
2011-12-01 11:53:23 -08:00
Scott Main
dc18c92fa8
Merge "docs: dashboard update for 12/1" into ics-mr0
2011-12-01 11:53:17 -08:00
Amith Yamasani
cb79af80ec
am e9b0608c: Merge "No clicking on volume icon in volume dialog." into ics-mr1
...
* commit 'e9b0608c76bd19356f3141358ffdf134b7a9700f':
No clicking on volume icon in volume dialog.
2011-12-01 11:37:32 -08:00
Amith Yamasani
6f5f57a827
Merge "No clicking on volume icon in volume dialog." into ics-mr1
2011-12-01 11:35:30 -08:00
Scott Main
e4ff2334e5
am 4f926932: am acf1038a: docs: remove broken link from renderscript docs bug: 5696178
...
* commit '4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0':
docs: remove broken link from renderscript docs bug: 5696178
2011-12-01 11:23:15 -08:00
Scott Main
28dd6b3c7b
am acf1038a: docs: remove broken link from renderscript docs bug: 5696178
...
* commit 'acf1038a260d7b2a3bb6b36058da47041c8ec173':
docs: remove broken link from renderscript docs bug: 5696178
2011-12-01 11:20:03 -08:00
Gilles Debunne
f6d23c3af9
am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1
...
* commit '0433c157141b9122f6c61498e909770f1db27c7c':
TextViews keep focus after Done
2011-12-01 10:24:23 -08:00
Gilles Debunne
fd55ac0009
am b2aa672f: Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
...
* commit 'b2aa672f24ea0d746f3b96c24e376d5e2c041dc3':
Revert "IME action (done, next...) correctly handled"
2011-12-01 10:24:21 -08:00
Gilles Debunne
e3d12016b4
Merge "TextViews keep focus after Done" into ics-mr1
2011-12-01 10:22:15 -08:00
Gilles Debunne
fb3064556e
Merge "Revert "IME action (done, next...) correctly handled"" into ics-mr1
2011-12-01 10:21:59 -08:00
Andreas Huber
52395b1e29
am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
...
* commit '2c2ed7bef931f43dc0701ab723beb0cbed2cb630':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
2011-12-01 10:20:09 -08:00
Andreas Huber
8adebc7d05
Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
2011-12-01 10:18:19 -08:00
Robert Greenwalt
ec92962c06
am 22d5d7b6: Merge "Fix state synchronization problem." into ics-mr1
...
* commit '22d5d7b6e865e36eb3e057bc27d339d56c292d20':
Fix state synchronization problem.
2011-12-01 09:44:12 -08:00