database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner
Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
Merge commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp
* commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66':
Fix bug 3061544 and some clipping errors.
Merge commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp
* commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
Make it easier to figure out whether an app can go on sd card.
Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp
* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
Fixing some flakiness of some DL Manager tests.
Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp
* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
fix build. SurfaceView.setFrame needed to be hidden
Thumbnail measurement & drawing has been moved out into a delegate
class called View.DragThumbnailBuilder. This consolidates the
thumbnail-related code as well as ensuring that the drag initiator
does not have to know a priori where to place the thumbnail relative
to the touch point *before* the thumbnail measurement step, as was
previously the case.
startDrag() no longer needs to be told where the current touch point
is at the time the drag is launched.
Drag events are now dispatched only to VISIBLE views.
Dispatch shouldn't double-recycle events any more when the target
window is local to the system process.
Change-Id: I49419103765a0cad2e18ddfcdd6dacb94daf1ff1
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp
* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
New API stubs: NdefMessage and NdefRecord.
right now, all messages from sqlite are printed in the logfile.
if the error code = 0, then sqlite message is just an informational
message that usually has no meaning to the developers
and ends up confusing the developers.
discard such messages
Change-Id: I961f1b33a745d5e9b20c85ee8a0071c92c253d96
Merge commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp
* commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88':
Revert for 68833 and 68483 which introduced new assets instead of just updating.
The video has the same aspect ratio than the window, so the window size doesn't change.
In turn, onSizeChanged() is not called, which is where surfaceChanged() is eventually called from.
we now override setFrame() and always call updateWindow from there instead of from onSizeChanged()
Change-Id: I87064b577ff1d7b6ba50e563d7278813002d2b29
Merge commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp
* commit 'a29643a6455df7d3d615cdc45e11c437fe4b6cee':
DO NOT MERGE. Select word no longer selects spaces between words.
Bug 3000870
This feature was useful to paste between two words. To do this, all you
have to do now in to first position the cursor between the words, and then
long pressing anywhere to get the pop-up menu with paste.
Not merged into HC since the paste story in HC still has to be determined.
Change-Id: Iea8d87e09b7ad43658ec5526110e609b9735c27a
Also allow grabbing scrollviews for dragging outside of content
bounds, which makes a difference for overscroll effects.
Change-Id: I344db4490ad59f393bb6de338009e251a76e6282
Merge commit '458fc5f52e25d7a8b4e482010711aed66f0b4999' into gingerbread-plus-aosp
* commit '458fc5f52e25d7a8b4e482010711aed66f0b4999':
Fix issue #3041660: Camera image flips upside down when rotating device
