Mike Lockwood
ee41d90c63
Merge "MTP: Close and reopen driver file after an error." into honeycomb
2011-01-19 10:20:38 -08:00
James Dong
7ade824c55
Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb
2011-01-19 10:05:05 -08:00
Andreas Huber
f580bfb079
Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb
2011-01-19 09:49:32 -08:00
Eric Laurent
a8d642e1d5
Merge "Tentative fix for issue 3362362." into honeycomb
2011-01-19 09:40:34 -08:00
Jean-Michel Trivi
c7a16dc35b
Merge "Fix bug 2084122: enable application control over text synth volume" into honeycomb
2011-01-19 09:13:04 -08:00
Ben Murdoch
1bc9879488
Merge "Maintain the seek position in HTML5 video" into honeycomb
2011-01-19 07:34:49 -08:00
Shih-wei Liao
1725ecf40c
Merge "1. fp_mad.rs: Pass C99 check. 2. Include C99 header (Will be fixed later at build.git.)" into honeycomb
2011-01-19 02:23:01 -08:00
Winson Chung
28cdcb9c4c
Merge "Disabling queued unbinding of RemoteViewsServices until we fix flashing in widgets." into honeycomb
2011-01-19 00:58:38 -08:00
Winson Chung
2385b0880e
Merge "Refactoring app widgets to address security/performance issues." into honeycomb
2011-01-18 23:04:01 -08:00
Shih-wei Liao
f9b9e6b442
Merge "Fix the build." into honeycomb
2011-01-18 22:51:22 -08:00
Hung-ying Tyan
ec2b822673
Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb
2011-01-18 22:39:20 -08:00
Jim Miller
1eae866fc0
Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb
2011-01-18 21:14:38 -08:00
Adam Powell
c0d7a8bdcc
Merge "Fix bug 3362258 - Fastscroll is out of sync with the list" into honeycomb
2011-01-18 20:44:44 -08:00
Mike Lockwood
022329127c
Merge changes I7df1ff78,Ibc2e8adf into honeycomb
...
* changes:
MediaScanner: Make sure name field is set for file based playlists
MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:30:13 -08:00
Romain Guy
228efdce42
Merge "Don't pass a null View to OnListItemClickListener. Bug #3365153 " into honeycomb
2011-01-18 20:27:22 -08:00
Romain Guy
b62366caa5
Merge "Recreate the EGL surface when ViewRoot's surface changes. Bug #3306150 " into honeycomb
2011-01-18 18:26:22 -08:00
Jason Sams
f2a806b2bd
Merge "Correctly log debugging info as debug." into honeycomb
2011-01-18 18:22:56 -08:00
Jason Sams
3d4fe7e866
Merge "Fix race condition between GC thread and the teardown of RS. The RS context was going away while the objects were being deleted within the finializer." into honeycomb
2011-01-18 18:18:06 -08:00
Jason Sams
3bdd26cf6b
Merge "Cleanup logs." into honeycomb
2011-01-18 18:13:07 -08:00
Guang Zhu
2d500c1223
Merge "further remove calls to runFinalization" into honeycomb
2011-01-18 18:05:50 -08:00
Adam Powell
19ca260e55
Merge "Fix bug 3362979 - Holo light overflow button has stale focused state" into honeycomb
2011-01-18 18:03:23 -08:00
Stephen Hines
271937d6e7
Merge "Provide mechanism to switch between extern/static." into honeycomb
2011-01-18 17:50:19 -08:00
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
