Commit Graph

40890 Commits

Author SHA1 Message Date
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
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
66b39bd67c Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -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
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
d2e9b6b007 Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1 2011-12-01 22:05:07 -08:00
Eric Laurent
c603733c20 Merge "AudioService: strengthen A2DP device detection" into ics-mr1 2011-12-01 20:34:08 -08:00
Dianne Hackborn
5405705e67 Merge "More social integration." into ics-mr1 2011-12-01 18:48:32 -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
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
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
c9fc27fd05 Merge "Fix free_cache to actually work" into ics-mr1 2011-12-01 14:14:22 -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
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
314043ac17 Merge "Fix memory leaks in the accessibility layer." into ics-mr1 2011-12-01 12:57:12 -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
5ff5208408 Merge "Add copious navigation bar info to SystemUI dumps." into ics-mr1 2011-12-01 12:09:51 -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
6f5f57a827 Merge "No clicking on volume icon in volume dialog." into ics-mr1 2011-12-01 11:35:30 -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
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
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
70e320c37d Merge "Fix state synchronization problem." into ics-mr1 2011-12-01 09:42:13 -08:00
Ben Murdoch
670acec923 Merge "Fix crash with HTML5 video." into ics-mr1 2011-12-01 09:03:22 -08:00
Daniel Sandler
859cdf2328 Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1 2011-12-01 06:29:53 -08:00
Bart Sears
5b74fe7ca1 Merge "fix position of WebTextView on scrolling layers" into ics-mr1 2011-11-30 22:29:16 -08:00
Adam Cohen
c3003b601d Merge "Working around issue where setting min height on RelativeLayout causes items to collapse. (Bug 5640357)" into ics-mr1 2011-11-30 21:10:27 -08:00
Dianne Hackborn
dfcc7b62f5 Merge "Fix issue #5433192 and maybe #5433192" into ics-mr1 2011-11-30 20:49:21 -08:00
satok
cc4f36dfc8 Merge "Fix ConcurrentModificationException in TextServicesManagerService" into ics-mr1 2011-11-30 17:37:52 -08:00
Svetoslav Ganov
efe11185b5 Merge "Fixing memory leaks in the accessiiblity layer." into ics-mr1 2011-11-30 16:56:41 -08:00
Dianne Hackborn
ea402a7e8c Merge "Fix issue #5679504: Device stuck and sudden reboot - Watchdog reset?" into ics-mr1 2011-11-30 14:12:44 -08:00
Dianne Hackborn
5703b2516a Merge "Turn off debug log." into ics-mr1 2011-11-30 14:11:17 -08:00
Romain Guy
0ff2c27b3e Merge "Cache drawable constant states instead of drawables Bug #5678369" into ics-mr1 2011-11-30 14:07:34 -08:00
Mathias Agopian
363c4a9fa0 Merge "add a way to access the version string of the h/w implementation of EGL" into ics-mr1 2011-11-30 13:52:21 -08:00
Daniel Sandler
2e9f9c7edc Merge "Expanding NotificationManager's event logging." into ics-mr1 2011-11-30 11:54:17 -08:00
Jeff Sharkey
4f1fbce904 Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1 2011-11-30 11:44:54 -08:00
Svetoslav Ganov
8cc888b840 Merge "NumberPicker incorrectly shown for the old theme." into ics-mr1 2011-11-30 10:25:42 -08:00
Dianne Hackborn
4ef3a35243 Merge "Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data" into ics-mr1 2011-11-30 10:20:29 -08:00
Mathias Agopian
bc2d79ed7a add a way to access the version string of the h/w implementation of EGL
we use a hidden egl extension. the version string is printed
in SF's dumpsys log.

Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
2011-11-29 18:00:35 -08:00
Mathias Agopian
0c740a46d2 Merge changes I7e973a35,Ib3386fcc into ics-mr1
* changes:
  SurfaceTexture: add EGL_KHR_fence_sync option
  SurfaceTexture: add a blit-to-FBO test
2011-11-29 17:46:35 -08:00
Jamie Gennis
e06a1748a4 Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 2011-11-29 17:25:09 -08:00