Dianne Hackborn
e530cd23b8
Merge "Just a little 'ol activity manager permission change." into honeycomb
2011-01-18 17:49:05 -08:00
Dianne Hackborn
f5205881d2
Merge "Okay, new plan for dialogs." into honeycomb
2011-01-18 17:48:22 -08:00
Elliott Hughes
66818d220f
Merge "Minor updates." into honeycomb
2011-01-18 17:25:05 -08:00
Adam Powell
c92f918ec1
Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
2011-01-18 16:57:59 -08:00
Mathias Agopian
2872eb075c
Merge "fix [3361121] hang in glClear() - device unresponsive, OTA fails" into honeycomb
2011-01-18 16:52:33 -08:00
Romain Guy
002951dd3a
Merge "Smoother pinch-zoom in Browser." into honeycomb
2011-01-18 15:55:31 -08:00
Jack Palevich
47fb182a87
Merge "Unhide GLSurfaceView.get/setPreserveEGLContextOnPause" into honeycomb
2011-01-18 15:54:29 -08:00
John Reck
30f9338795
Merge "Create db path if it doesn't exit" into honeycomb
2011-01-18 15:53:33 -08:00
Mathias Agopian
ed8a50c9c5
fix [3361121] hang in glClear() - device unresponsive, OTA fails
...
Generally we never want to lock a buffer for write access if it is at
the "head" on the surfaceflinger side. The only exception (1) is when
the buffer is not currently in use AND there is at least one queued
buffer -- in which case, SurfaceFlinger will never use said buffer
anymore, because on the next composition around, it will be able to
retire the first queued buffer.
The logic above relies on SurfaceFlinger always retiring
and locking a buffer before composition -- unfortunately this
didn't happen during a screenshot.
This could leave us in a situation where a buffer is locked by the
application for write, and used by SurfaceFlinger for texturing,
causing a hang.
Here, we fix this issue by never assuming the exception (1), it was
intended as an optimization allowing ANativeWindow::lockBuffer() to
return sooner and was justified when most of SF composition was
done in software. The actual buffer locking is now ensured by
gralloc. We could have handled screenshots in a similar way to
a regular composition, but it could have caused glitches on screen,
essentially, taking a screenshot could cause to skip a frame.
Change-Id: I1f226b1ebdf6918439b687c2723955d55b842c55
2011-01-18 15:51:30 -08:00
Andreas Huber
451ab8f058
Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb
2011-01-18 15:35:35 -08:00
Dianne Hackborn
f0859202fe
Merge "Fix issue #3362484 : Can't dismiss activity picker by tapping outside dialog" into honeycomb
2011-01-18 15:31:21 -08:00
Jeff Brown
3b014ca40a
Merge "Filter virtual keys after touches." into honeycomb
2011-01-18 15:26:15 -08:00
Eric Fischer
8ffd87cb70
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-01-18 15:13:06 -08:00
James Dong
66224398fe
Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb
2011-01-18 14:43:02 -08:00
Costin Manolache
3d1ceeed77
Merge "Add back NEW_TASK flag." into honeycomb
2011-01-18 14:37:24 -08:00
Stephen Hines
e19add574c
Merge "Validate that version pragma is correct." into honeycomb
2011-01-18 14:26:24 -08:00
Eric Laurent
24af24a0c6
Merge "Fix typo" into honeycomb
2011-01-18 14:25:17 -08:00
Kenny Root
28ffda6f14
Merge "Erase OBB files when removing packages" into honeycomb
2011-01-18 14:03:15 -08:00
Romain Guy
b3a3b56ef1
Merge "Fix 9patches, again... Bug #3365243 " into honeycomb
2011-01-18 14:00:28 -08:00
Mike Lockwood
5afd77c157
Merge "MTP: Set modification date for abstract playlists" into honeycomb
2011-01-18 13:29:55 -08:00
Brad Fitzpatrick
76c6ac904a
Merge "Fixing memory leak in PreferenceScreen." into honeycomb
2011-01-18 13:26:56 -08:00
James Dong
00a1bd859f
Merge "Fix the build break in git_master-without-vendor" into honeycomb
2011-01-18 13:26:14 -08:00
Mike Lockwood
c2c1babcc3
Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb
2011-01-18 13:14:58 -08:00
Kenny Root
44c9d6ea9b
Merge "Don't cache return of getService in Environment" into honeycomb
2011-01-18 13:12:55 -08:00
Brad Fitzpatrick
6c3da6279e
Merge "StrictMode class instance limit interface." into honeycomb
2011-01-18 13:11:33 -08:00
Romain Guy
88713c15b5
Merge "Add support for Paint::setTextSkewX in OpenGLRenderer. Bug #3360888 " into honeycomb
2011-01-18 13:00:41 -08:00
Jack Palevich
a3565a9138
Merge "Add support for preserving EGL contexts when pausing / resuming." into honeycomb
2011-01-18 13:00:27 -08:00
Andreas Huber
32ebeb5bbf
Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb
2011-01-18 11:52:02 -08:00
John Wang
4fd0805604
Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
2011-01-18 11:43:53 -08:00
Bryan Mawhinney
3a603ec633
Merge "Don't report 100% buffered when the stream ends prematurely." into honeycomb
2011-01-18 11:30:30 -08:00
Romain Guy
eaf2427602
Merge "Add support for skew()" into honeycomb
2011-01-18 11:17:20 -08:00
Dianne Hackborn
a2d6398f19
Merge "Fix issue #3362666 Activities launched from ongoing notifications don't animate" into honeycomb
2011-01-18 11:14:46 -08:00
Mike Lockwood
8e7c44bddc
Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb
2011-01-18 11:13:01 -08:00
John Reck
8fd98e42ac
Merge "WebStorage public API change" into honeycomb
2011-01-18 11:10:26 -08:00
David Turner
67a58bc55a
Merge "Prevent Dropbox from crashing system server pre-boot." into honeycomb
2011-01-18 11:09:03 -08:00
Dmitri Plotnikov
2e73a0cc52
Merge "Hiding the AsyncTaskLoader.waitForLoader method" into honeycomb
2011-01-18 11:01:35 -08:00
Derek Sollenberger
941fe85607
Merge "Fix smart zoom for plugins that use OpenGL." into honeycomb
2011-01-18 10:38:34 -08:00
Dirk Dougherty
a1f599d123
Merge "Doc change: fix busted link to DatePicker tutorial." into honeycomb
2011-01-18 10:16:31 -08:00
Ben Murdoch
3e5a8a91a2
Merge "Disable AutoFill in private browsing mode." into honeycomb
2011-01-18 10:07:01 -08:00
Gilles Debunne
30b1d663db
Merge "Added a touch up filter in text selection handles." into honeycomb
2011-01-18 08:33:42 -08:00
Kristian Monsen
1f210b19d9
Merge "Motorola request to fix proxy" into honeycomb
2011-01-18 06:05:46 -08:00
Owen Lin
4a41ca0f11
Merge "Change to stream decoding mode if the file descriptor cannot support seek." into honeycomb
2011-01-18 04:13:13 -08:00
Hung-ying Tyan
4ba63924bd
Merge "Merge "SipService: registers broadcast receivers on demand."" into honeycomb
2011-01-18 02:25:52 -08:00
Xavier Ducrohet
9127d542e7
Merge "Allow TabHosts to have no children in the tabcontent widget" into honeycomb
2011-01-17 22:10:20 -08:00
satok
ed92e5d818
Merge "Update package manager when panel is loaded." into honeycomb
2011-01-17 22:02:00 -08:00
satok
cf4564eff9
Merge "Fix the algorithm to get current input method subtype considering explicitly and implicitly enabled subtypes." into honeycomb
2011-01-17 21:14:46 -08:00
Adam Powell
2bbe3054e6
Merge "Fix bug 3357208 - List selector shows as dark black on first pressed state" into honeycomb
2011-01-17 18:54:13 -08:00
Stephen Hines
3b3d963a4b
Merge "Remove erroneous log message." into honeycomb
2011-01-17 18:52:02 -08:00
Scott Main
04a4b17f2d
Merge "set sdk version to "Android 3.0" and api level to "Honeycomb"" into honeycomb
2011-01-17 18:19:44 -08:00
Joe Onorato
5905278fad
Merge "Don't crash with non-standard bitmap types." into honeycomb
2011-01-17 17:25:02 -08:00
